@catladder/pipeline 1.80.3 → 1.80.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bundles/catladder-gitlab/index.js +1 -1
- package/dist/constants.js +1 -1
- package/dist/deploy/cloudRun/deployJob.js +53 -25
- package/dist/deploy/cloudRun/utils/createArgsString.d.ts +11 -0
- package/dist/deploy/cloudRun/utils/createArgsString.js +50 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/examples/__snapshots__/cloud-run-with-sql.ts.snap +56 -56
- package/examples/__snapshots__/custom-build-job.ts.snap +8 -8
- package/package.json +1 -1
- package/src/deploy/cloudRun/deployJob.ts +53 -35
- package/src/deploy/cloudRun/utils/createArgsString.ts +19 -0
|
@@ -256,19 +256,19 @@ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
|
|
|
256
256
|
"gcloud sql databases create pan-test-app-dev-api --instance=instancename --project projectId",
|
|
257
257
|
"set -e",
|
|
258
258
|
"set +e",
|
|
259
|
-
"gcloud scheduler jobs create http pan-test-app-dev-api-send-reminders-scheduler --project=google-project-id --location
|
|
259
|
+
"gcloud scheduler jobs create http pan-test-app-dev-api-send-reminders-scheduler --project=google-project-id --location=europe-west6 --schedule="0 * * * *" --uri="https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-dev-api-send-reminders:run" --http-method=POST --oauth-service-account-email=$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com",
|
|
260
260
|
"set -e",
|
|
261
|
-
"gcloud scheduler jobs update http pan-test-app-dev-api-send-reminders-scheduler --project=google-project-id --location
|
|
261
|
+
"gcloud scheduler jobs update http pan-test-app-dev-api-send-reminders-scheduler --project=google-project-id --location=europe-west6 --schedule="0 * * * *" --uri="https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-dev-api-send-reminders:run" --http-method=POST --oauth-service-account-email=$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com",
|
|
262
262
|
"set +e",
|
|
263
|
-
"gcloud beta run jobs create pan-test-app-dev-api-migration --command="yarn,migrate" --image
|
|
263
|
+
"gcloud beta run jobs create pan-test-app-dev-api-migration --command="yarn,migrate" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,app-name=test-app,env-type=dev,env-name=dev,build-type=node --memory=512Mi",
|
|
264
264
|
"set -e",
|
|
265
|
-
"gcloud beta run jobs update pan-test-app-dev-api-migration --command="yarn,migrate" --image
|
|
265
|
+
"gcloud beta run jobs update pan-test-app-dev-api-migration --command="yarn,migrate" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,app-name=test-app,env-type=dev,env-name=dev,build-type=node --memory=512Mi --env-vars-file=____envvars.yaml",
|
|
266
266
|
"set +e",
|
|
267
|
-
"gcloud beta run jobs create pan-test-app-dev-api-send-reminders --command="yarn,job:send-reminders" --image
|
|
267
|
+
"gcloud beta run jobs create pan-test-app-dev-api-send-reminders --command="yarn,job:send-reminders" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,app-name=test-app,env-type=dev,env-name=dev,build-type=node --memory=512Mi",
|
|
268
268
|
"set -e",
|
|
269
|
-
"gcloud beta run jobs update pan-test-app-dev-api-send-reminders --command="yarn,job:send-reminders" --image
|
|
270
|
-
"gcloud run deploy pan-test-app-dev-api --command="yarn,start" --image
|
|
271
|
-
"gcloud beta run jobs execute pan-test-app-dev-api-migration --project
|
|
269
|
+
"gcloud beta run jobs update pan-test-app-dev-api-send-reminders --command="yarn,job:send-reminders" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,app-name=test-app,env-type=dev,env-name=dev,build-type=node --memory=512Mi --env-vars-file=____envvars.yaml",
|
|
270
|
+
"gcloud run deploy pan-test-app-dev-api --command="yarn,start" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,app-name=test-app,env-type=dev,env-name=dev,build-type=node --env-vars-file=____envvars.yaml --allow-unauthenticated --min-instances=0 --max-instances=5",
|
|
271
|
+
"gcloud beta run jobs execute pan-test-app-dev-api-migration --project=google-project-id --region=europe-west6",
|
|
272
272
|
"docker image rm europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
273
273
|
],
|
|
274
274
|
"services": [
|
|
@@ -364,12 +364,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
364
364
|
"echo $CL_dev_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
|
|
365
365
|
",
|
|
366
366
|
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
367
|
-
"gcloud run services delete pan-test-app-dev-api --project
|
|
367
|
+
"gcloud run services delete pan-test-app-dev-api --project=google-project-id --region=europe-west6",
|
|
368
368
|
"set +e",
|
|
369
|
-
"gcloud scheduler jobs delete pan-test-app-dev-api-send-reminders-scheduler --project=google-project-id --location
|
|
369
|
+
"gcloud scheduler jobs delete pan-test-app-dev-api-send-reminders-scheduler --project=google-project-id --location=europe-west6",
|
|
370
370
|
"set -e",
|
|
371
|
-
"gcloud beta run jobs delete pan-test-app-dev-api-migration --project
|
|
372
|
-
"gcloud beta run jobs delete pan-test-app-dev-api-send-reminders --project
|
|
371
|
+
"gcloud beta run jobs delete pan-test-app-dev-api-migration --project=google-project-id --region=europe-west6",
|
|
372
|
+
"gcloud beta run jobs delete pan-test-app-dev-api-send-reminders --project=google-project-id --region=europe-west6",
|
|
373
373
|
],
|
|
374
374
|
"stage": "stop dev",
|
|
375
375
|
"variables": {
|
|
@@ -689,7 +689,7 @@ COPY --chown=node:node www/yarn.lock /app/www/yarn.lock",
|
|
|
689
689
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
690
690
|
"docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
691
691
|
"echo "$ENV_VARS" > ____envvars.yaml",
|
|
692
|
-
"gcloud run deploy pan-test-app-dev-www --command="yarn,start" --image
|
|
692
|
+
"gcloud run deploy pan-test-app-dev-www --command="yarn,start" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --labels=customer-name=pan,app-name=test-app,env-type=dev,env-name=dev,build-type=node --env-vars-file=____envvars.yaml --allow-unauthenticated",
|
|
693
693
|
"docker image rm europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
694
694
|
],
|
|
695
695
|
"services": [
|
|
@@ -771,7 +771,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
771
771
|
"echo $CL_dev_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
|
|
772
772
|
",
|
|
773
773
|
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
774
|
-
"gcloud run services delete pan-test-app-dev-www --project
|
|
774
|
+
"gcloud run services delete pan-test-app-dev-www --project=google-project-id --region=europe-west6",
|
|
775
775
|
],
|
|
776
776
|
"stage": "stop dev",
|
|
777
777
|
"variables": {
|
|
@@ -1175,19 +1175,19 @@ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
|
|
|
1175
1175
|
"gcloud sql databases create pan-test-app-review-mr1234-api --instance=instancename --project projectId",
|
|
1176
1176
|
"set -e",
|
|
1177
1177
|
"set +e",
|
|
1178
|
-
"gcloud scheduler jobs create http pan-test-app-review-mr1234-api-send-reminders-scheduler --project=google-project-id --location
|
|
1178
|
+
"gcloud scheduler jobs create http pan-test-app-review-mr1234-api-send-reminders-scheduler --project=google-project-id --location=europe-west6 --schedule="0 * * * *" --uri="https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-review-mr1234-api-send-reminders:run" --http-method=POST --oauth-service-account-email=$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com",
|
|
1179
1179
|
"set -e",
|
|
1180
|
-
"gcloud scheduler jobs update http pan-test-app-review-mr1234-api-send-reminders-scheduler --project=google-project-id --location
|
|
1180
|
+
"gcloud scheduler jobs update http pan-test-app-review-mr1234-api-send-reminders-scheduler --project=google-project-id --location=europe-west6 --schedule="0 * * * *" --uri="https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-review-mr1234-api-send-reminders:run" --http-method=POST --oauth-service-account-email=$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com",
|
|
1181
1181
|
"set +e",
|
|
1182
|
-
"gcloud beta run jobs create pan-test-app-review-mr1234-api-migration --command="yarn,migrate" --image
|
|
1182
|
+
"gcloud beta run jobs create pan-test-app-review-mr1234-api-migration --command="yarn,migrate" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,app-name=test-app,env-type=review,env-name=review,build-type=node --memory=512Mi",
|
|
1183
1183
|
"set -e",
|
|
1184
|
-
"gcloud beta run jobs update pan-test-app-review-mr1234-api-migration --command="yarn,migrate" --image
|
|
1184
|
+
"gcloud beta run jobs update pan-test-app-review-mr1234-api-migration --command="yarn,migrate" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,app-name=test-app,env-type=review,env-name=review,build-type=node --memory=512Mi --env-vars-file=____envvars.yaml",
|
|
1185
1185
|
"set +e",
|
|
1186
|
-
"gcloud beta run jobs create pan-test-app-review-mr1234-api-send-reminders --command="yarn,job:send-reminders" --image
|
|
1186
|
+
"gcloud beta run jobs create pan-test-app-review-mr1234-api-send-reminders --command="yarn,job:send-reminders" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,app-name=test-app,env-type=review,env-name=review,build-type=node --memory=512Mi",
|
|
1187
1187
|
"set -e",
|
|
1188
|
-
"gcloud beta run jobs update pan-test-app-review-mr1234-api-send-reminders --command="yarn,job:send-reminders" --image
|
|
1189
|
-
"gcloud run deploy pan-test-app-review-mr1234-api --command="yarn,start" --image
|
|
1190
|
-
"gcloud beta run jobs execute pan-test-app-review-mr1234-api-migration --project
|
|
1188
|
+
"gcloud beta run jobs update pan-test-app-review-mr1234-api-send-reminders --command="yarn,job:send-reminders" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,app-name=test-app,env-type=review,env-name=review,build-type=node --memory=512Mi --env-vars-file=____envvars.yaml",
|
|
1189
|
+
"gcloud run deploy pan-test-app-review-mr1234-api --command="yarn,start" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,app-name=test-app,env-type=review,env-name=review,build-type=node --env-vars-file=____envvars.yaml --allow-unauthenticated --min-instances=0 --max-instances=5",
|
|
1190
|
+
"gcloud beta run jobs execute pan-test-app-review-mr1234-api-migration --project=google-project-id --region=europe-west6",
|
|
1191
1191
|
"docker image rm europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
1192
1192
|
],
|
|
1193
1193
|
"services": [
|
|
@@ -1283,12 +1283,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
1283
1283
|
"echo $CL_review_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
|
|
1284
1284
|
",
|
|
1285
1285
|
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
1286
|
-
"gcloud run services delete pan-test-app-review-mr1234-api --project
|
|
1286
|
+
"gcloud run services delete pan-test-app-review-mr1234-api --project=google-project-id --region=europe-west6",
|
|
1287
1287
|
"set +e",
|
|
1288
|
-
"gcloud scheduler jobs delete pan-test-app-review-mr1234-api-send-reminders-scheduler --project=google-project-id --location
|
|
1288
|
+
"gcloud scheduler jobs delete pan-test-app-review-mr1234-api-send-reminders-scheduler --project=google-project-id --location=europe-west6",
|
|
1289
1289
|
"set -e",
|
|
1290
|
-
"gcloud beta run jobs delete pan-test-app-review-mr1234-api-migration --project
|
|
1291
|
-
"gcloud beta run jobs delete pan-test-app-review-mr1234-api-send-reminders --project
|
|
1290
|
+
"gcloud beta run jobs delete pan-test-app-review-mr1234-api-migration --project=google-project-id --region=europe-west6",
|
|
1291
|
+
"gcloud beta run jobs delete pan-test-app-review-mr1234-api-send-reminders --project=google-project-id --region=europe-west6",
|
|
1292
1292
|
"echo "deleting database pan-test-app-review-mr1234-api..."",
|
|
1293
1293
|
"echo "👆 this can take multiple attemps (3-5min), because google cloud run may still have a connection to the database after the cloud run service is shut down"",
|
|
1294
1294
|
"
|
|
@@ -1617,7 +1617,7 @@ COPY --chown=node:node www/yarn.lock /app/www/yarn.lock",
|
|
|
1617
1617
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
1618
1618
|
"docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
1619
1619
|
"echo "$ENV_VARS" > ____envvars.yaml",
|
|
1620
|
-
"gcloud run deploy pan-test-app-review-mr1234-www --command="yarn,start" --image
|
|
1620
|
+
"gcloud run deploy pan-test-app-review-mr1234-www --command="yarn,start" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --labels=customer-name=pan,app-name=test-app,env-type=review,env-name=review,build-type=node --env-vars-file=____envvars.yaml --allow-unauthenticated",
|
|
1621
1621
|
"docker image rm europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
1622
1622
|
],
|
|
1623
1623
|
"services": [
|
|
@@ -1699,7 +1699,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
1699
1699
|
"echo $CL_review_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
|
|
1700
1700
|
",
|
|
1701
1701
|
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
1702
|
-
"gcloud run services delete pan-test-app-review-mr1234-www --project
|
|
1702
|
+
"gcloud run services delete pan-test-app-review-mr1234-www --project=google-project-id --region=europe-west6",
|
|
1703
1703
|
],
|
|
1704
1704
|
"stage": "stop review",
|
|
1705
1705
|
"variables": {
|
|
@@ -2192,19 +2192,19 @@ COPY --chown=node:node api/yarn.lock /app/api/yarn.lock",
|
|
|
2192
2192
|
"gcloud sql databases create pan-test-app-prod-api --instance=instancename --project projectId",
|
|
2193
2193
|
"set -e",
|
|
2194
2194
|
"set +e",
|
|
2195
|
-
"gcloud scheduler jobs create http pan-test-app-prod-api-send-reminders-scheduler --project=google-project-id --location
|
|
2195
|
+
"gcloud scheduler jobs create http pan-test-app-prod-api-send-reminders-scheduler --project=google-project-id --location=europe-west6 --schedule="0 * * * *" --uri="https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-prod-api-send-reminders:run" --http-method=POST --oauth-service-account-email=$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com",
|
|
2196
2196
|
"set -e",
|
|
2197
|
-
"gcloud scheduler jobs update http pan-test-app-prod-api-send-reminders-scheduler --project=google-project-id --location
|
|
2197
|
+
"gcloud scheduler jobs update http pan-test-app-prod-api-send-reminders-scheduler --project=google-project-id --location=europe-west6 --schedule="0 * * * *" --uri="https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-prod-api-send-reminders:run" --http-method=POST --oauth-service-account-email=$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com",
|
|
2198
2198
|
"set +e",
|
|
2199
|
-
"gcloud beta run jobs create pan-test-app-prod-api-migration --command="yarn,migrate" --image
|
|
2199
|
+
"gcloud beta run jobs create pan-test-app-prod-api-migration --command="yarn,migrate" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,app-name=test-app,env-type=prod,env-name=prod,build-type=node --memory=512Mi",
|
|
2200
2200
|
"set -e",
|
|
2201
|
-
"gcloud beta run jobs update pan-test-app-prod-api-migration --command="yarn,migrate" --image
|
|
2201
|
+
"gcloud beta run jobs update pan-test-app-prod-api-migration --command="yarn,migrate" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,app-name=test-app,env-type=prod,env-name=prod,build-type=node --memory=512Mi --env-vars-file=____envvars.yaml",
|
|
2202
2202
|
"set +e",
|
|
2203
|
-
"gcloud beta run jobs create pan-test-app-prod-api-send-reminders --command="yarn,job:send-reminders" --image
|
|
2203
|
+
"gcloud beta run jobs create pan-test-app-prod-api-send-reminders --command="yarn,job:send-reminders" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,app-name=test-app,env-type=prod,env-name=prod,build-type=node --memory=512Mi",
|
|
2204
2204
|
"set -e",
|
|
2205
|
-
"gcloud beta run jobs update pan-test-app-prod-api-send-reminders --command="yarn,job:send-reminders" --image
|
|
2206
|
-
"gcloud run deploy pan-test-app-prod-api --command="yarn,start" --image
|
|
2207
|
-
"gcloud beta run jobs execute pan-test-app-prod-api-migration --project
|
|
2205
|
+
"gcloud beta run jobs update pan-test-app-prod-api-send-reminders --command="yarn,job:send-reminders" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,app-name=test-app,env-type=prod,env-name=prod,build-type=node --memory=512Mi --env-vars-file=____envvars.yaml",
|
|
2206
|
+
"gcloud run deploy pan-test-app-prod-api --command="yarn,start" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,app-name=test-app,env-type=prod,env-name=prod,build-type=node --env-vars-file=____envvars.yaml --allow-unauthenticated --min-instances=0 --max-instances=5",
|
|
2207
|
+
"gcloud beta run jobs execute pan-test-app-prod-api-migration --project=google-project-id --region=europe-west6",
|
|
2208
2208
|
"docker image rm europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
2209
2209
|
],
|
|
2210
2210
|
"services": [
|
|
@@ -2323,19 +2323,19 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
2323
2323
|
"gcloud sql databases create pan-test-app-stage-api --instance=instancename --project projectId",
|
|
2324
2324
|
"set -e",
|
|
2325
2325
|
"set +e",
|
|
2326
|
-
"gcloud scheduler jobs create http pan-test-app-stage-api-send-reminders-scheduler --project=google-project-id --location
|
|
2326
|
+
"gcloud scheduler jobs create http pan-test-app-stage-api-send-reminders-scheduler --project=google-project-id --location=europe-west6 --schedule="0 * * * *" --uri="https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-stage-api-send-reminders:run" --http-method=POST --oauth-service-account-email=$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com",
|
|
2327
2327
|
"set -e",
|
|
2328
|
-
"gcloud scheduler jobs update http pan-test-app-stage-api-send-reminders-scheduler --project=google-project-id --location
|
|
2328
|
+
"gcloud scheduler jobs update http pan-test-app-stage-api-send-reminders-scheduler --project=google-project-id --location=europe-west6 --schedule="0 * * * *" --uri="https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/pan-test-app-stage-api-send-reminders:run" --http-method=POST --oauth-service-account-email=$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com",
|
|
2329
2329
|
"set +e",
|
|
2330
|
-
"gcloud beta run jobs create pan-test-app-stage-api-migration --command="yarn,migrate" --image
|
|
2330
|
+
"gcloud beta run jobs create pan-test-app-stage-api-migration --command="yarn,migrate" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,app-name=test-app,env-type=stage,env-name=stage,build-type=node --memory=512Mi",
|
|
2331
2331
|
"set -e",
|
|
2332
|
-
"gcloud beta run jobs update pan-test-app-stage-api-migration --command="yarn,migrate" --image
|
|
2332
|
+
"gcloud beta run jobs update pan-test-app-stage-api-migration --command="yarn,migrate" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,app-name=test-app,env-type=stage,env-name=stage,build-type=node --memory=512Mi --env-vars-file=____envvars.yaml",
|
|
2333
2333
|
"set +e",
|
|
2334
|
-
"gcloud beta run jobs create pan-test-app-stage-api-send-reminders --command="yarn,job:send-reminders" --image
|
|
2334
|
+
"gcloud beta run jobs create pan-test-app-stage-api-send-reminders --command="yarn,job:send-reminders" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,app-name=test-app,env-type=stage,env-name=stage,build-type=node --memory=512Mi",
|
|
2335
2335
|
"set -e",
|
|
2336
|
-
"gcloud beta run jobs update pan-test-app-stage-api-send-reminders --command="yarn,job:send-reminders" --image
|
|
2337
|
-
"gcloud run deploy pan-test-app-stage-api --command="yarn,start" --image
|
|
2338
|
-
"gcloud beta run jobs execute pan-test-app-stage-api-migration --project
|
|
2336
|
+
"gcloud beta run jobs update pan-test-app-stage-api-send-reminders --command="yarn,job:send-reminders" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,app-name=test-app,env-type=stage,env-name=stage,build-type=node --memory=512Mi --env-vars-file=____envvars.yaml",
|
|
2337
|
+
"gcloud run deploy pan-test-app-stage-api --command="yarn,start" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --set-cloudsql-instances=projectId:region:instancename --labels=customer-name=pan,app-name=test-app,env-type=stage,env-name=stage,build-type=node --env-vars-file=____envvars.yaml --allow-unauthenticated --min-instances=0 --max-instances=5",
|
|
2338
|
+
"gcloud beta run jobs execute pan-test-app-stage-api-migration --project=google-project-id --region=europe-west6",
|
|
2339
2339
|
"docker image rm europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
2340
2340
|
],
|
|
2341
2341
|
"services": [
|
|
@@ -2431,12 +2431,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
2431
2431
|
"echo $CL_prod_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
|
|
2432
2432
|
",
|
|
2433
2433
|
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
2434
|
-
"gcloud run services delete pan-test-app-prod-api --project
|
|
2434
|
+
"gcloud run services delete pan-test-app-prod-api --project=google-project-id --region=europe-west6",
|
|
2435
2435
|
"set +e",
|
|
2436
|
-
"gcloud scheduler jobs delete pan-test-app-prod-api-send-reminders-scheduler --project=google-project-id --location
|
|
2436
|
+
"gcloud scheduler jobs delete pan-test-app-prod-api-send-reminders-scheduler --project=google-project-id --location=europe-west6",
|
|
2437
2437
|
"set -e",
|
|
2438
|
-
"gcloud beta run jobs delete pan-test-app-prod-api-migration --project
|
|
2439
|
-
"gcloud beta run jobs delete pan-test-app-prod-api-send-reminders --project
|
|
2438
|
+
"gcloud beta run jobs delete pan-test-app-prod-api-migration --project=google-project-id --region=europe-west6",
|
|
2439
|
+
"gcloud beta run jobs delete pan-test-app-prod-api-send-reminders --project=google-project-id --region=europe-west6",
|
|
2440
2440
|
],
|
|
2441
2441
|
"stage": "stop prod",
|
|
2442
2442
|
"variables": {
|
|
@@ -2479,12 +2479,12 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
2479
2479
|
"echo $CL_stage_api_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
|
|
2480
2480
|
",
|
|
2481
2481
|
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
2482
|
-
"gcloud run services delete pan-test-app-stage-api --project
|
|
2482
|
+
"gcloud run services delete pan-test-app-stage-api --project=google-project-id --region=europe-west6",
|
|
2483
2483
|
"set +e",
|
|
2484
|
-
"gcloud scheduler jobs delete pan-test-app-stage-api-send-reminders-scheduler --project=google-project-id --location
|
|
2484
|
+
"gcloud scheduler jobs delete pan-test-app-stage-api-send-reminders-scheduler --project=google-project-id --location=europe-west6",
|
|
2485
2485
|
"set -e",
|
|
2486
|
-
"gcloud beta run jobs delete pan-test-app-stage-api-migration --project
|
|
2487
|
-
"gcloud beta run jobs delete pan-test-app-stage-api-send-reminders --project
|
|
2486
|
+
"gcloud beta run jobs delete pan-test-app-stage-api-migration --project=google-project-id --region=europe-west6",
|
|
2487
|
+
"gcloud beta run jobs delete pan-test-app-stage-api-send-reminders --project=google-project-id --region=europe-west6",
|
|
2488
2488
|
],
|
|
2489
2489
|
"stage": "stop stage",
|
|
2490
2490
|
"variables": {
|
|
@@ -2817,7 +2817,7 @@ COPY --chown=node:node www/yarn.lock /app/www/yarn.lock",
|
|
|
2817
2817
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
2818
2818
|
"docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
2819
2819
|
"echo "$ENV_VARS" > ____envvars.yaml",
|
|
2820
|
-
"gcloud run deploy pan-test-app-prod-www --command="yarn,start" --image
|
|
2820
|
+
"gcloud run deploy pan-test-app-prod-www --command="yarn,start" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --labels=customer-name=pan,app-name=test-app,env-type=prod,env-name=prod,build-type=node --env-vars-file=____envvars.yaml --allow-unauthenticated",
|
|
2821
2821
|
"docker image rm europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
2822
2822
|
],
|
|
2823
2823
|
"services": [
|
|
@@ -2917,7 +2917,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
2917
2917
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
2918
2918
|
"docker push europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
2919
2919
|
"echo "$ENV_VARS" > ____envvars.yaml",
|
|
2920
|
-
"gcloud run deploy pan-test-app-stage-www --command="yarn,start" --image
|
|
2920
|
+
"gcloud run deploy pan-test-app-stage-www --command="yarn,start" --image=europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=google-project-id --region=europe-west6 --labels=customer-name=pan,app-name=test-app,env-type=stage,env-name=stage,build-type=node --env-vars-file=____envvars.yaml --allow-unauthenticated",
|
|
2921
2921
|
"docker image rm europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
2922
2922
|
],
|
|
2923
2923
|
"services": [
|
|
@@ -2999,7 +2999,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
2999
2999
|
"echo $CL_prod_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
|
|
3000
3000
|
",
|
|
3001
3001
|
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
3002
|
-
"gcloud run services delete pan-test-app-prod-www --project
|
|
3002
|
+
"gcloud run services delete pan-test-app-prod-www --project=google-project-id --region=europe-west6",
|
|
3003
3003
|
],
|
|
3004
3004
|
"stage": "stop prod",
|
|
3005
3005
|
"variables": {
|
|
@@ -3042,7 +3042,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
3042
3042
|
"echo $CL_stage_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
|
|
3043
3043
|
",
|
|
3044
3044
|
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
3045
|
-
"gcloud run services delete pan-test-app-stage-www --project
|
|
3045
|
+
"gcloud run services delete pan-test-app-stage-www --project=google-project-id --region=europe-west6",
|
|
3046
3046
|
],
|
|
3047
3047
|
"stage": "stop stage",
|
|
3048
3048
|
"variables": {
|
|
@@ -151,7 +151,7 @@ exports[`matches snapshot 1`] = `
|
|
|
151
151
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
152
152
|
"docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
153
153
|
"echo "$ENV_VARS" > ____envvars.yaml",
|
|
154
|
-
"gcloud run deploy pan-test-app-dev-www
|
|
154
|
+
"gcloud run deploy pan-test-app-dev-www --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,app-name=test-app,env-type=dev,env-name=dev,build-type=custom --env-vars-file=____envvars.yaml --allow-unauthenticated",
|
|
155
155
|
"docker image rm asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
156
156
|
],
|
|
157
157
|
"services": [
|
|
@@ -231,7 +231,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
231
231
|
"echo $CL_dev_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
|
|
232
232
|
",
|
|
233
233
|
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
234
|
-
"gcloud run services delete pan-test-app-dev-www --project
|
|
234
|
+
"gcloud run services delete pan-test-app-dev-www --project=asdf --region=asia-east1",
|
|
235
235
|
],
|
|
236
236
|
"stage": "stop dev",
|
|
237
237
|
"variables": {
|
|
@@ -461,7 +461,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
461
461
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
462
462
|
"docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
463
463
|
"echo "$ENV_VARS" > ____envvars.yaml",
|
|
464
|
-
"gcloud run deploy pan-test-app-review-mr1234-www
|
|
464
|
+
"gcloud run deploy pan-test-app-review-mr1234-www --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,app-name=test-app,env-type=review,env-name=review,build-type=custom --env-vars-file=____envvars.yaml --allow-unauthenticated",
|
|
465
465
|
"docker image rm asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
466
466
|
],
|
|
467
467
|
"services": [
|
|
@@ -541,7 +541,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
541
541
|
"echo $CL_review_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
|
|
542
542
|
",
|
|
543
543
|
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
544
|
-
"gcloud run services delete pan-test-app-review-mr1234-www --project
|
|
544
|
+
"gcloud run services delete pan-test-app-review-mr1234-www --project=asdf --region=asia-east1",
|
|
545
545
|
],
|
|
546
546
|
"stage": "stop review",
|
|
547
547
|
"variables": {
|
|
@@ -868,7 +868,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
868
868
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
869
869
|
"docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
870
870
|
"echo "$ENV_VARS" > ____envvars.yaml",
|
|
871
|
-
"gcloud run deploy pan-test-app-prod-www
|
|
871
|
+
"gcloud run deploy pan-test-app-prod-www --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,app-name=test-app,env-type=prod,env-name=prod,build-type=custom --env-vars-file=____envvars.yaml --allow-unauthenticated",
|
|
872
872
|
"docker image rm asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
873
873
|
],
|
|
874
874
|
"services": [
|
|
@@ -966,7 +966,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
966
966
|
"docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
967
967
|
"docker push asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
968
968
|
"echo "$ENV_VARS" > ____envvars.yaml",
|
|
969
|
-
"gcloud run deploy pan-test-app-stage-www
|
|
969
|
+
"gcloud run deploy pan-test-app-stage-www --image=asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG --project=asdf --region=asia-east1 --labels=customer-name=pan,app-name=test-app,env-type=stage,env-name=stage,build-type=custom --env-vars-file=____envvars.yaml --allow-unauthenticated",
|
|
970
970
|
"docker image rm asia-east1-docker.pkg.dev/asdf/catladder-deploy/pan-test-app/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG",
|
|
971
971
|
],
|
|
972
972
|
"services": [
|
|
@@ -1046,7 +1046,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
1046
1046
|
"echo $CL_prod_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
|
|
1047
1047
|
",
|
|
1048
1048
|
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
1049
|
-
"gcloud run services delete pan-test-app-prod-www --project
|
|
1049
|
+
"gcloud run services delete pan-test-app-prod-www --project=asdf --region=asia-east1",
|
|
1050
1050
|
],
|
|
1051
1051
|
"stage": "stop prod",
|
|
1052
1052
|
"variables": {
|
|
@@ -1089,7 +1089,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
|
|
|
1089
1089
|
"echo $CL_stage_www_GCLOUD_DEPLOY_credentialsKey > ./____keyfile.json
|
|
1090
1090
|
",
|
|
1091
1091
|
"gcloud auth activate-service-account --key-file="./____keyfile.json"",
|
|
1092
|
-
"gcloud run services delete pan-test-app-stage-www --project
|
|
1092
|
+
"gcloud run services delete pan-test-app-stage-www --project=asdf --region=asia-east1",
|
|
1093
1093
|
],
|
|
1094
1094
|
"stage": "stop stage",
|
|
1095
1095
|
"variables": {
|
package/package.json
CHANGED
|
@@ -21,11 +21,13 @@ import {
|
|
|
21
21
|
} from "./utils/database";
|
|
22
22
|
import { allowFailureInScripts } from "../../utils/gitlab";
|
|
23
23
|
import { getCloudRunJobName } from "./utils/jobName";
|
|
24
|
+
import { createArgsString } from "./utils/createArgsString";
|
|
24
25
|
|
|
25
26
|
const setExtraVarsScripts = (deployConfig: DeployConfigCloudRun) => [
|
|
26
27
|
`export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe ${deployConfig.projectId} --format="value(projectNumber)")`,
|
|
27
28
|
`echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"`,
|
|
28
29
|
];
|
|
30
|
+
|
|
29
31
|
export const createGoogleCloudRunDeployJobs = (
|
|
30
32
|
context: Context
|
|
31
33
|
): CatladderJob[] => {
|
|
@@ -60,11 +62,20 @@ export const createGoogleCloudRunDeployJobs = (
|
|
|
60
62
|
.map(([key, value]) => `${key}=${value}`)
|
|
61
63
|
.join(",");
|
|
62
64
|
|
|
63
|
-
const commonArgs =
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
65
|
+
const commonArgs = {
|
|
66
|
+
project: deployConfig.projectId,
|
|
67
|
+
region: deployConfig.region,
|
|
68
|
+
};
|
|
69
|
+
|
|
70
|
+
const commonDeployArgs = {
|
|
71
|
+
image: gcloudImageName,
|
|
72
|
+
...commonArgs,
|
|
73
|
+
"set-cloudsql-instances": deployConfig.cloudSql
|
|
74
|
+
? deployConfig.cloudSql.instanceConnectionName
|
|
75
|
+
: undefined,
|
|
76
|
+
labels: labelsString,
|
|
77
|
+
};
|
|
78
|
+
|
|
68
79
|
const serviceName = context.environment.fullName.toLowerCase();
|
|
69
80
|
|
|
70
81
|
const getFullJobName = (name: string) =>
|
|
@@ -104,25 +115,16 @@ export const createGoogleCloudRunDeployJobs = (
|
|
|
104
115
|
? service?.command ?? context.componentConfig.build.startCommand
|
|
105
116
|
: undefined;
|
|
106
117
|
|
|
107
|
-
const
|
|
108
|
-
?
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
const args = {
|
|
118
|
+
const argsString = createArgsString({
|
|
119
|
+
command: command ? '"' + command.split(" ").join(",") + '"' : undefined, // not sure if quotes are needed
|
|
120
|
+
...commonDeployArgs,
|
|
121
|
+
"env-vars-file": "____envvars.yaml",
|
|
112
122
|
"allow-unauthenticated": true,
|
|
113
123
|
"min-instances": customConfig?.minInstances,
|
|
114
124
|
"max-instances": customConfig?.maxInstances,
|
|
115
125
|
"no-cpu-throttling": customConfig?.noCpuThrottling,
|
|
116
|
-
}
|
|
117
|
-
|
|
118
|
-
const argsString = Object.entries(args)
|
|
119
|
-
.filter(([, value]) => !isNil(value))
|
|
120
|
-
.map(([key, value]) => `--${key}${value !== true ? `=${value}` : ""}`)
|
|
121
|
-
.join(" ");
|
|
122
|
-
|
|
123
|
-
return `gcloud run deploy ${serviceName}${
|
|
124
|
-
nameSuffix ?? ""
|
|
125
|
-
} ${commandArg} ${commonDeployArgs} --env-vars-file=____envvars.yaml ${argsString}`;
|
|
126
|
+
});
|
|
127
|
+
return `gcloud run deploy ${serviceName}${nameSuffix ?? ""} ${argsString}`;
|
|
126
128
|
};
|
|
127
129
|
|
|
128
130
|
const getJobCreateScriptsForJob = (
|
|
@@ -133,22 +135,28 @@ export const createGoogleCloudRunDeployJobs = (
|
|
|
133
135
|
// lucky, update on the other hand accepts it... so let's just imediatly update it
|
|
134
136
|
|
|
135
137
|
// also we cannot upsert a job, so we have to create it and catch the error and then update
|
|
136
|
-
const
|
|
137
|
-
.split(" ")
|
|
138
|
-
|
|
138
|
+
const commonDeployArgsString = createArgsString({
|
|
139
|
+
command: '"' + job.command.split(" ").join(",") + '"',
|
|
140
|
+
...commonDeployArgs,
|
|
141
|
+
memory: job.memory || "512Mi",
|
|
142
|
+
});
|
|
143
|
+
|
|
144
|
+
const argsString = `${jobName} ${commonDeployArgsString}`;
|
|
139
145
|
return [
|
|
140
|
-
...allowFailureInScripts([`gcloud beta run jobs create ${
|
|
141
|
-
`gcloud beta run jobs update ${
|
|
146
|
+
...allowFailureInScripts([`gcloud beta run jobs create ${argsString}`]),
|
|
147
|
+
`gcloud beta run jobs update ${argsString} --env-vars-file=____envvars.yaml`,
|
|
142
148
|
];
|
|
143
149
|
};
|
|
144
150
|
|
|
151
|
+
const commonArgsString = createArgsString(commonArgs);
|
|
152
|
+
|
|
145
153
|
const getJobCreateScripts = () =>
|
|
146
154
|
jobsWithNames
|
|
147
155
|
.map(({ job, jobName }) => getJobCreateScriptsForJob(jobName, job))
|
|
148
156
|
.flat();
|
|
149
157
|
|
|
150
158
|
const getJobRunScriptForJob = (jobName: string) => {
|
|
151
|
-
return `gcloud beta run jobs execute ${jobName} ${
|
|
159
|
+
return `gcloud beta run jobs execute ${jobName} ${commonArgsString}`;
|
|
152
160
|
};
|
|
153
161
|
|
|
154
162
|
const getJobRunScripts = (when: DeployConfigCloudRunJob["when"]) =>
|
|
@@ -159,11 +167,16 @@ export const createGoogleCloudRunDeployJobs = (
|
|
|
159
167
|
const getCreateScheduleScripts = () => {
|
|
160
168
|
return jobsWithSchedule
|
|
161
169
|
.map(({ job, jobName, schedulerName }) => {
|
|
162
|
-
const
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
170
|
+
const argsString = createArgsString({
|
|
171
|
+
project: deployConfig.projectId,
|
|
172
|
+
location: deployConfig.region,
|
|
173
|
+
schedule: `"${job.schedule}"`,
|
|
174
|
+
uri: `"https://${deployConfig.region}-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/${deployConfig.projectId}/jobs/${jobName}:run"`,
|
|
175
|
+
"http-method": "POST",
|
|
176
|
+
"oauth-service-account-email":
|
|
177
|
+
"$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com",
|
|
178
|
+
});
|
|
179
|
+
const commonArgs = `http ${schedulerName} ${argsString}`;
|
|
167
180
|
return [
|
|
168
181
|
...allowFailureInScripts([
|
|
169
182
|
`gcloud scheduler jobs create ${commonArgs}`,
|
|
@@ -175,11 +188,15 @@ export const createGoogleCloudRunDeployJobs = (
|
|
|
175
188
|
};
|
|
176
189
|
|
|
177
190
|
const getDeleteSchedulesScripts = () => {
|
|
191
|
+
const argsString = createArgsString({
|
|
192
|
+
project: deployConfig.projectId,
|
|
193
|
+
location: deployConfig.region,
|
|
194
|
+
});
|
|
178
195
|
return jobsWithSchedule
|
|
179
196
|
.map(({ schedulerName }) => {
|
|
180
197
|
return [
|
|
181
198
|
...allowFailureInScripts([
|
|
182
|
-
`gcloud scheduler jobs delete ${schedulerName}
|
|
199
|
+
`gcloud scheduler jobs delete ${schedulerName} ${argsString}`,
|
|
183
200
|
]),
|
|
184
201
|
];
|
|
185
202
|
})
|
|
@@ -188,7 +205,8 @@ export const createGoogleCloudRunDeployJobs = (
|
|
|
188
205
|
|
|
189
206
|
const getDeleteJobsScripts = () =>
|
|
190
207
|
jobsWithNames.map(
|
|
191
|
-
({ jobName }) =>
|
|
208
|
+
({ jobName }) =>
|
|
209
|
+
`gcloud beta run jobs delete ${jobName} ${commonArgsString}`
|
|
192
210
|
);
|
|
193
211
|
|
|
194
212
|
const deployScripts = [
|
|
@@ -217,11 +235,11 @@ export const createGoogleCloudRunDeployJobs = (
|
|
|
217
235
|
const stopScripts = [
|
|
218
236
|
...gcloudServiceAccountLoginCommands(context),
|
|
219
237
|
...(deployConfig.service !== false
|
|
220
|
-
? [`gcloud run services delete ${serviceName} ${
|
|
238
|
+
? [`gcloud run services delete ${serviceName} ${commonArgsString}`]
|
|
221
239
|
: []),
|
|
222
240
|
...Object.entries(deployConfig.additionalServices ?? {}).map(
|
|
223
241
|
([name]) =>
|
|
224
|
-
`gcloud run services delete ${serviceName}-${name} ${
|
|
242
|
+
`gcloud run services delete ${serviceName}-${name} ${commonArgsString}`
|
|
225
243
|
),
|
|
226
244
|
...getDeleteSchedulesScripts(),
|
|
227
245
|
...getDeleteJobsScripts(),
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { isNil } from "lodash";
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* creates arguments string:
|
|
5
|
+
*
|
|
6
|
+
* --key=value
|
|
7
|
+
*
|
|
8
|
+
* - undefined or null values will get removed completly
|
|
9
|
+
* - true will just be "--key"
|
|
10
|
+
* @param args args record
|
|
11
|
+
* @returns
|
|
12
|
+
*/
|
|
13
|
+
export const createArgsString = (
|
|
14
|
+
args: Record<string, string | number | true | undefined>
|
|
15
|
+
) =>
|
|
16
|
+
Object.entries(args)
|
|
17
|
+
.filter(([, value]) => !isNil(value))
|
|
18
|
+
.map(([key, value]) => `--${key}${value !== true ? `=${value}` : ""}`)
|
|
19
|
+
.join(" ");
|