fixing findreleasedbuild functionalities
Adding new secrets to app.yaml and creating a new secret.
BUG=b/239224440
Change-Id: I81c5b80680c54dcf5effc0c7166d32c29967f793
Reviewed-on: https://cos-review.googlesource.com/c/cos/tools/+/35549
Tested-by: Arnav Kansal <rnv@google.com>
Cloud-Build: Arnav Kansal <rnv@google.com>
Reviewed-by: Arnav Kansal <rnv@google.com>
diff --git a/src/cmd/changelog-webapp/app.yaml b/src/cmd/changelog-webapp/app.yaml
index 74c7692..c292cfc 100644
--- a/src/cmd/changelog-webapp/app.yaml
+++ b/src/cmd/changelog-webapp/app.yaml
@@ -27,3 +27,9 @@
COS_INTERNAL_GOB_INSTANCE_NAME: "cos-internal-gob-instance"
COS_INTERNAL_MANIFEST_REPO_NAME: "cos-internal-manifest-repo"
CROSLAND_NAME: "crosland-url"
+
+ # Findbuild variables
+ COS_FINDBUILD_DB_NAME: "cos-findbuild-db-name"
+ COS_FINDBUILD_TABLE_NAME: "cos-findbuild-table-name"
+ COS_FINDBUILD_PASSWORD_NAME: "cos-findbuild-password-name"
+ COS_FINDBUILD_INSTANCE_NAME: "cos-findbuild-instance-name"
diff --git a/src/pkg/findbuild/findbuild.go b/src/pkg/findbuild/findbuild.go
index ba4dd88..b243a5a 100644
--- a/src/pkg/findbuild/findbuild.go
+++ b/src/pkg/findbuild/findbuild.go
@@ -634,19 +634,21 @@
findBuildDbName = os.Getenv("COS_FINDBUILD_DB_NAME")
findBuildTableName = os.Getenv("COS_FINDBUILD_TABLE_NAME")
dbPasswordSecretName = os.Getenv("COS_FINDBUILD_PASSWORD_NAME")
+ instanceSecretName = os.Getenv("COS_FINDBUILD_INSTANCE_NAME")
user = "readonly"
zone = "us-west2"
)
- var dbName, tableName, password string
+ var dbName, tableName, password, instanceName string
if err := retrieveSecrets(client, projectID, []secretBundle{
{findBuildDbName, &dbName},
{findBuildTableName, &tableName},
{dbPasswordSecretName, &password},
+ {instanceSecretName, &instanceName},
}); err != nil {
log.Error("failed to retrieve secrets from secretmanager: %v", err)
return nil, utils.InternalServerError
}
- connectionName := projectID + ":" + zone + ":" + dbName
+ connectionName := projectID + ":" + zone + ":" + instanceName
// connect to database
db, err := sql.Open("mysql", fmt.Sprintf("%s:%s@cloudsql(%s)/%s", user, password, connectionName, dbName))
if err != nil {
