fix secret name

.secrets.baseline

@@ -1292,7 +1292,7 @@
       {
         "type": "Secret Keyword",
         "filename": "kube/services/gen3-workflow/gen3-workflow-deploy.yaml",
-        "hashed_secret": "df1b66083f7a8440f9d889513299318f9cd72a70",
+        "hashed_secret": "336cf0ebbef5880323c5068daf00e45bfc1c41af",
         "is_verified": false,
         "line_number": 62
       }
@@ -3707,5 +3707,5 @@
       }
     ]
   },
-  "generated_at": "2024-09-26T21:35:53Z"
+  "generated_at": "2024-09-30T19:59:05Z"
 }

gen3/bin/db.sh

@@ -769,13 +769,13 @@ gen3_db_service_setup() {
 
   for it in $(gen3_db_list "$server"); do
     if [[ "$it" == "$dbname" ]]; then
-      gen3_log_err "gen3_db_service_setup" "$dbname database already exists on server $it"
+      gen3_log_err "gen3_db_service_setup" "$dbname database already exists on server $server"
       return 1
     fi
   done
   for it in $(gen3_db_user_list "$server"); do
     if [[ "$it" == "$username" ]]; then
-      gen3_log_err "gen3_db_service_setup" "$username user already exists on server $it"
+      gen3_log_err "gen3_db_service_setup" "$username user already exists on server $server"
       return 1
     fi
   done

gen3/bin/kube-setup-gen3-workflow.sh

@@ -5,6 +5,8 @@ setup_gen3_workflow_infra() {
   gen3_log_info "setting up gen3-workflow"
 
   # create the gen3-workflow database and config file if they don't already exist
+  # Note: `gen3_db_service_setup` doesn't allow '-' in the database name, so the db and secret
+  # name are 'gen3workflow' and not 'gen3-workflow'
   if g3kubectl describe secret gen3workflow-g3auto > /dev/null 2>&1; then
     gen3_log_info "gen3workflow-g3auto secret already configured"
     return 0
@@ -38,7 +40,7 @@ DB_PASSWORD: $(jq -r .db_password < "$secretsFolder/dbcreds.json")
 DB_DATABASE: $(jq -r .db_database < "$secretsFolder/dbcreds.json")
 EOM
   fi
-  gen3 secrets sync 'setup gen3-workflow-g3auto secrets'
+  gen3 secrets sync 'setup gen3workflow-g3auto secrets'
 }
 
 setup_funnel_infra() {

kube/services/gen3-workflow/gen3-workflow-deploy.yaml

@@ -59,7 +59,7 @@ spec:
       volumes:
         - name: config-volume
           secret:
-            secretName: "gen3-workflow-g3auto"
+            secretName: "gen3workflow-g3auto"
       containers:
       - name: gen3-workflow
         GEN3_GEN3-WORKFLOW_IMAGE