@catladder/pipeline 3.12.2 → 3.12.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.
Files changed (15) hide show
  1. package/dist/constants.js +1 -1
  2. package/dist/deploy/cloudRun/createJobs/cloudRunJobs.js +1 -1
  3. package/dist/deploy/cloudRun/createJobs/execute/schedules.js +1 -1
  4. package/dist/tsconfig.tsbuildinfo +1 -1
  5. package/examples/__snapshots__/cloud-run-no-service.test.ts.snap +8 -8
  6. package/examples/__snapshots__/cloud-run-post-stop-job.test.ts.snap +1 -1
  7. package/examples/__snapshots__/cloud-run-service-custom-vpc-connector.test.ts.snap +4 -4
  8. package/examples/__snapshots__/cloud-run-service-custom-vpc.test.ts.snap +4 -4
  9. package/examples/__snapshots__/cloud-run-service-with-volumes.test.ts.snap +4 -4
  10. package/examples/__snapshots__/cloud-run-with-sql-legacy-jobs.test.ts.snap +12 -12
  11. package/examples/__snapshots__/cloud-run-with-sql-multiple-dbs.test.ts.snap +8 -8
  12. package/examples/__snapshots__/cloud-run-with-sql.test.ts.snap +22 -22
  13. package/package.json +1 -1
  14. package/src/deploy/cloudRun/createJobs/cloudRunJobs.ts +1 -1
  15. package/src/deploy/cloudRun/createJobs/execute/schedules.ts +1 -1
package/examples/__snapshots__/cloud-run-with-sql.test.ts.snap CHANGED
@@ -460,7 +460,7 @@ api 🧪 test:
460
460
  )"
461
461
  current_job_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"
462
462
  current_scheduler_name="pan-test-app-dev-api-send-reminders-admins"
463
- if grep "$current_scheduler_name" <<<"$exist_scheduler_names" >/dev/null; then
463
+ if echo "$exist_scheduler_names" | grep -Fx "$current_scheduler_name" >/dev/null; then
464
464
  gcloud scheduler jobs update http "$current_scheduler_name" --project=google-project-id --location=europe-west6 --uri="$current_job_uri" --message-body="{\\"overrides\\":{\\"containerOverrides\\":[{\\"args\\":[\\"--only-admins\\",\\"--verbose=true\\"]}]}}" --http-method=POST --oauth-service-account-email="$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com" --schedule="0 * * * *" --max-retry-attempts=0
465
465
  else
466
466
  gcloud scheduler jobs create http "$current_scheduler_name" --project=google-project-id --location=europe-west6 --uri="$current_job_uri" --message-body="{\\"overrides\\":{\\"containerOverrides\\":[{\\"args\\":[\\"--only-admins\\",\\"--verbose=true\\"]}]}}" --http-method=POST --oauth-service-account-email="$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com" --schedule="0 * * * *" --max-retry-attempts=0
@@ -468,7 +468,7 @@ api 🧪 test:
468
468
  - |-
469
469
  current_job_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"
470
470
  current_scheduler_name="pan-test-app-dev-api-send-reminders"
471
- if grep "$current_scheduler_name" <<<"$exist_scheduler_names" >/dev/null; then
471
+ if echo "$exist_scheduler_names" | grep -Fx "$current_scheduler_name" >/dev/null; then
472
472
  gcloud scheduler jobs update http "$current_scheduler_name" --project=google-project-id --location=europe-west6 --uri="$current_job_uri" --http-method=POST --oauth-service-account-email="$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com" --schedule="0 * * * *" --max-retry-attempts=0
473
473
  else
474
474
  gcloud scheduler jobs create http "$current_scheduler_name" --project=google-project-id --location=europe-west6 --uri="$current_job_uri" --http-method=POST --oauth-service-account-email="$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com" --schedule="0 * * * *" --max-retry-attempts=0
@@ -476,7 +476,7 @@ api 🧪 test:
476
476
  - |-
477
477
  current_job_uri="\${ROOT_URL}/myEndpoint"
478
478
  current_scheduler_name="pan-test-app-dev-api-call-http-endpoint"
479
- if grep "$current_scheduler_name" <<<"$exist_scheduler_names" >/dev/null; then
479
+ if echo "$exist_scheduler_names" | grep -Fx "$current_scheduler_name" >/dev/null; then
480
480
  gcloud scheduler jobs update http "$current_scheduler_name" --project=google-project-id --location=europe-west6 --uri="$current_job_uri" --http-method=GET --oidc-service-account-email="$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com" --schedule="0 * * * *" --max-retry-attempts=0
481
481
  else
482
482
  gcloud scheduler jobs create http "$current_scheduler_name" --project=google-project-id --location=europe-west6 --uri="$current_job_uri" --http-method=GET --oidc-service-account-email="$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com" --schedule="0 * * * *" --max-retry-attempts=0
@@ -486,21 +486,21 @@ api 🧪 test:
486
486
  gcloud run jobs list --filter='metadata.name ~ dev.*api' --format='value(name)' --limit=999 --project='google-project-id' --region='europe-west6'
487
487
  )"
488
488
  current_job_name="pan-test-app-dev-api-migrate"
489
- if grep "$current_job_name" <<<"$exist_job_names" >/dev/null; then
489
+ if echo "$exist_job_names" | grep -Fx "$current_job_name" >/dev/null; then
490
490
  gcloud run jobs update "$current_job_name" --command="yarn,migrate" --labels="customer-name=pan,component-name=api,app-name=test-app,env-type=dev,env-name=dev,build-type=node,cloud-run-job-name=$current_job_name" --image="europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG" --project=google-project-id --region=europe-west6 --memory=512Mi --parallelism=1 --task-timeout=10m --env-vars-file=____envvars.yaml --max-retries=0 --set-cloudsql-instances=projectId:region:instancename
491
491
  else
492
492
  gcloud run jobs create "$current_job_name" --command="yarn,migrate" --labels="customer-name=pan,component-name=api,app-name=test-app,env-type=dev,env-name=dev,build-type=node,cloud-run-job-name=$current_job_name" --image="europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG" --project=google-project-id --region=europe-west6 --memory=512Mi --parallelism=1 --task-timeout=10m --env-vars-file=____envvars.yaml --max-retries=0 --set-cloudsql-instances=projectId:region:instancename
493
493
  fi
494
494
  - |-
495
495
  current_job_name="pan-test-app-dev-api-reset"
496
- if grep "$current_job_name" <<<"$exist_job_names" >/dev/null; then
496
+ if echo "$exist_job_names" | grep -Fx "$current_job_name" >/dev/null; then
497
497
  gcloud run jobs update "$current_job_name" --command="yarn,reset" --labels="customer-name=pan,component-name=api,app-name=test-app,env-type=dev,env-name=dev,build-type=node,cloud-run-job-name=$current_job_name" --image="europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG" --project=google-project-id --region=europe-west6 --memory=512Mi --parallelism=1 --task-timeout=10m --env-vars-file=____envvars.yaml --max-retries=0 --set-cloudsql-instances=projectId:region:instancename
498
498
  else
499
499
  gcloud run jobs create "$current_job_name" --command="yarn,reset" --labels="customer-name=pan,component-name=api,app-name=test-app,env-type=dev,env-name=dev,build-type=node,cloud-run-job-name=$current_job_name" --image="europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG" --project=google-project-id --region=europe-west6 --memory=512Mi --parallelism=1 --task-timeout=10m --env-vars-file=____envvars.yaml --max-retries=0 --set-cloudsql-instances=projectId:region:instancename
500
500
  fi
501
501
  - |-
502
502
  current_job_name="pan-test-app-dev-api-send-reminders"
503
- if grep "$current_job_name" <<<"$exist_job_names" >/dev/null; then
503
+ if echo "$exist_job_names" | grep -Fx "$current_job_name" >/dev/null; then
504
504
  gcloud run jobs update "$current_job_name" --command="yarn,job:send-reminders" --args="--verbose=false" --labels="customer-name=pan,component-name=api,app-name=test-app,env-type=dev,env-name=dev,build-type=node,cloud-run-job-name=$current_job_name" --image="europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG" --project=google-project-id --region=europe-west6 --memory=512Mi --parallelism=1 --task-timeout=10m --env-vars-file=____envvars.yaml --max-retries=0 --set-cloudsql-instances=projectId:region:instancename
505
505
  else
506
506
  gcloud run jobs create "$current_job_name" --command="yarn,job:send-reminders" --args="--verbose=false" --labels="customer-name=pan,component-name=api,app-name=test-app,env-type=dev,env-name=dev,build-type=node,cloud-run-job-name=$current_job_name" --image="europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/dev/api:$DOCKER_IMAGE_TAG" --project=google-project-id --region=europe-west6 --memory=512Mi --parallelism=1 --task-timeout=10m --env-vars-file=____envvars.yaml --max-retries=0 --set-cloudsql-instances=projectId:region:instancename
@@ -869,7 +869,7 @@ api 🧪 test:
869
869
  )"
870
870
  current_job_uri="https://europe-west6-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/google-project-id/jobs/$(printf %s "pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-api" | awk '{print tolower($0)}')-send-reminders:run"
871
871
  current_scheduler_name="$(printf %s "pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-api" | awk '{print tolower($0)}')-send-reminders-admins"
872
- if grep "$current_scheduler_name" <<<"$exist_scheduler_names" >/dev/null; then
872
+ if echo "$exist_scheduler_names" | grep -Fx "$current_scheduler_name" >/dev/null; then
873
873
  gcloud scheduler jobs update http "$current_scheduler_name" --project=google-project-id --location=europe-west6 --uri="$current_job_uri" --message-body="{\\"overrides\\":{\\"containerOverrides\\":[{\\"args\\":[\\"--only-admins\\",\\"--verbose=true\\"]}]}}" --http-method=POST --oauth-service-account-email="$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com" --schedule="0 * * * *" --max-retry-attempts=0
874
874
  else
875
875
  gcloud scheduler jobs create http "$current_scheduler_name" --project=google-project-id --location=europe-west6 --uri="$current_job_uri" --message-body="{\\"overrides\\":{\\"containerOverrides\\":[{\\"args\\":[\\"--only-admins\\",\\"--verbose=true\\"]}]}}" --http-method=POST --oauth-service-account-email="$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com" --schedule="0 * * * *" --max-retry-attempts=0
@@ -877,7 +877,7 @@ api 🧪 test:
877
877
  - |-
878
878
  current_job_uri="\${ROOT_URL}/myEndpoint"
879
879
  current_scheduler_name="$(printf %s "pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-api" | awk '{print tolower($0)}')-call-http-endpoint"
880
- if grep "$current_scheduler_name" <<<"$exist_scheduler_names" >/dev/null; then
880
+ if echo "$exist_scheduler_names" | grep -Fx "$current_scheduler_name" >/dev/null; then
881
881
  gcloud scheduler jobs update http "$current_scheduler_name" --project=google-project-id --location=europe-west6 --uri="$current_job_uri" --http-method=GET --oidc-service-account-email="$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com" --schedule="0 * * * *" --max-retry-attempts=0
882
882
  else
883
883
  gcloud scheduler jobs create http "$current_scheduler_name" --project=google-project-id --location=europe-west6 --uri="$current_job_uri" --http-method=GET --oidc-service-account-email="$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com" --schedule="0 * * * *" --max-retry-attempts=0
@@ -887,21 +887,21 @@ api 🧪 test:
887
887
  gcloud run jobs list --filter='metadata.name ~ review.*api' --format='value(name)' --limit=999 --project='google-project-id' --region='europe-west6'
888
888
  )"
889
889
  current_job_name="$(printf %s "pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-api" | awk '{print tolower($0)}')-migrate"
890
- if grep "$current_job_name" <<<"$exist_job_names" >/dev/null; then
890
+ if echo "$exist_job_names" | grep -Fx "$current_job_name" >/dev/null; then
891
891
  gcloud run jobs update "$current_job_name" --command="yarn,migrate" --labels="customer-name=pan,component-name=api,app-name=test-app,env-type=review,env-name=review,build-type=node,cloud-run-job-name=$current_job_name" --image="europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; }):$DOCKER_IMAGE_TAG" --project=google-project-id --region=europe-west6 --memory=512Mi --parallelism=1 --task-timeout=10m --env-vars-file=____envvars.yaml --max-retries=0 --set-cloudsql-instances=projectId:region:instancename
892
892
  else
893
893
  gcloud run jobs create "$current_job_name" --command="yarn,migrate" --labels="customer-name=pan,component-name=api,app-name=test-app,env-type=review,env-name=review,build-type=node,cloud-run-job-name=$current_job_name" --image="europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; }):$DOCKER_IMAGE_TAG" --project=google-project-id --region=europe-west6 --memory=512Mi --parallelism=1 --task-timeout=10m --env-vars-file=____envvars.yaml --max-retries=0 --set-cloudsql-instances=projectId:region:instancename
894
894
  fi
895
895
  - |-
896
896
  current_job_name="$(printf %s "pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-api" | awk '{print tolower($0)}')-reset"
897
- if grep "$current_job_name" <<<"$exist_job_names" >/dev/null; then
897
+ if echo "$exist_job_names" | grep -Fx "$current_job_name" >/dev/null; then
898
898
  gcloud run jobs update "$current_job_name" --command="yarn,reset" --labels="customer-name=pan,component-name=api,app-name=test-app,env-type=review,env-name=review,build-type=node,cloud-run-job-name=$current_job_name" --image="europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; }):$DOCKER_IMAGE_TAG" --project=google-project-id --region=europe-west6 --memory=512Mi --parallelism=1 --task-timeout=10m --env-vars-file=____envvars.yaml --max-retries=0 --set-cloudsql-instances=projectId:region:instancename
899
899
  else
900
900
  gcloud run jobs create "$current_job_name" --command="yarn,reset" --labels="customer-name=pan,component-name=api,app-name=test-app,env-type=review,env-name=review,build-type=node,cloud-run-job-name=$current_job_name" --image="europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; }):$DOCKER_IMAGE_TAG" --project=google-project-id --region=europe-west6 --memory=512Mi --parallelism=1 --task-timeout=10m --env-vars-file=____envvars.yaml --max-retries=0 --set-cloudsql-instances=projectId:region:instancename
901
901
  fi
902
902
  - |-
903
903
  current_job_name="$(printf %s "pan-test-app-review-$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; })-api" | awk '{print tolower($0)}')-send-reminders"
904
- if grep "$current_job_name" <<<"$exist_job_names" >/dev/null; then
904
+ if echo "$exist_job_names" | grep -Fx "$current_job_name" >/dev/null; then
905
905
  gcloud run jobs update "$current_job_name" --command="yarn,job:send-reminders" --args="--verbose=false" --labels="customer-name=pan,component-name=api,app-name=test-app,env-type=review,env-name=review,build-type=node,cloud-run-job-name=$current_job_name" --image="europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; }):$DOCKER_IMAGE_TAG" --project=google-project-id --region=europe-west6 --memory=512Mi --parallelism=1 --task-timeout=10m --env-vars-file=____envvars.yaml --max-retries=0 --set-cloudsql-instances=projectId:region:instancename
906
906
  else
907
907
  gcloud run jobs create "$current_job_name" --command="yarn,job:send-reminders" --args="--verbose=false" --labels="customer-name=pan,component-name=api,app-name=test-app,env-type=review,env-name=review,build-type=node,cloud-run-job-name=$current_job_name" --image="europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/review/api/$([ -n "$CI_MERGE_REQUEST_IID" ] && echo "mr$CI_MERGE_REQUEST_IID" || { [ -n "$CI_COMMIT_REF_SLUG" ] && echo "$CI_COMMIT_REF_SLUG" || echo "unknown"; }):$DOCKER_IMAGE_TAG" --project=google-project-id --region=europe-west6 --memory=512Mi --parallelism=1 --task-timeout=10m --env-vars-file=____envvars.yaml --max-retries=0 --set-cloudsql-instances=projectId:region:instancename
@@ -1279,7 +1279,7 @@ api 🧪 test:
1279
1279
  )"
1280
1280
  current_job_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"
1281
1281
  current_scheduler_name="pan-test-app-stage-api-send-reminders-admins"
1282
- if grep "$current_scheduler_name" <<<"$exist_scheduler_names" >/dev/null; then
1282
+ if echo "$exist_scheduler_names" | grep -Fx "$current_scheduler_name" >/dev/null; then
1283
1283
  gcloud scheduler jobs update http "$current_scheduler_name" --project=google-project-id --location=europe-west6 --uri="$current_job_uri" --message-body="{\\"overrides\\":{\\"containerOverrides\\":[{\\"args\\":[\\"--only-admins\\",\\"--verbose=true\\"]}]}}" --http-method=POST --oauth-service-account-email="$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com" --schedule="0 * * * *" --max-retry-attempts=0
1284
1284
  else
1285
1285
  gcloud scheduler jobs create http "$current_scheduler_name" --project=google-project-id --location=europe-west6 --uri="$current_job_uri" --message-body="{\\"overrides\\":{\\"containerOverrides\\":[{\\"args\\":[\\"--only-admins\\",\\"--verbose=true\\"]}]}}" --http-method=POST --oauth-service-account-email="$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com" --schedule="0 * * * *" --max-retry-attempts=0
@@ -1287,7 +1287,7 @@ api 🧪 test:
1287
1287
  - |-
1288
1288
  current_job_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"
1289
1289
  current_scheduler_name="pan-test-app-stage-api-send-reminders"
1290
- if grep "$current_scheduler_name" <<<"$exist_scheduler_names" >/dev/null; then
1290
+ if echo "$exist_scheduler_names" | grep -Fx "$current_scheduler_name" >/dev/null; then
1291
1291
  gcloud scheduler jobs update http "$current_scheduler_name" --project=google-project-id --location=europe-west6 --uri="$current_job_uri" --http-method=POST --oauth-service-account-email="$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com" --schedule="0 * * * *" --max-retry-attempts=0
1292
1292
  else
1293
1293
  gcloud scheduler jobs create http "$current_scheduler_name" --project=google-project-id --location=europe-west6 --uri="$current_job_uri" --http-method=POST --oauth-service-account-email="$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com" --schedule="0 * * * *" --max-retry-attempts=0
@@ -1295,7 +1295,7 @@ api 🧪 test:
1295
1295
  - |-
1296
1296
  current_job_uri="\${ROOT_URL}/myEndpoint"
1297
1297
  current_scheduler_name="pan-test-app-stage-api-call-http-endpoint"
1298
- if grep "$current_scheduler_name" <<<"$exist_scheduler_names" >/dev/null; then
1298
+ if echo "$exist_scheduler_names" | grep -Fx "$current_scheduler_name" >/dev/null; then
1299
1299
  gcloud scheduler jobs update http "$current_scheduler_name" --project=google-project-id --location=europe-west6 --uri="$current_job_uri" --http-method=GET --oidc-service-account-email="$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com" --schedule="0 * * * *" --max-retry-attempts=0
1300
1300
  else
1301
1301
  gcloud scheduler jobs create http "$current_scheduler_name" --project=google-project-id --location=europe-west6 --uri="$current_job_uri" --http-method=GET --oidc-service-account-email="$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com" --schedule="0 * * * *" --max-retry-attempts=0
@@ -1305,21 +1305,21 @@ api 🧪 test:
1305
1305
  gcloud run jobs list --filter='metadata.name ~ stage.*api' --format='value(name)' --limit=999 --project='google-project-id' --region='europe-west6'
1306
1306
  )"
1307
1307
  current_job_name="pan-test-app-stage-api-migrate"
1308
- if grep "$current_job_name" <<<"$exist_job_names" >/dev/null; then
1308
+ if echo "$exist_job_names" | grep -Fx "$current_job_name" >/dev/null; then
1309
1309
  gcloud run jobs update "$current_job_name" --command="yarn,migrate" --labels="customer-name=pan,component-name=api,app-name=test-app,env-type=stage,env-name=stage,build-type=node,cloud-run-job-name=$current_job_name" --image="europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG" --project=google-project-id --region=europe-west6 --memory=512Mi --parallelism=1 --task-timeout=10m --env-vars-file=____envvars.yaml --max-retries=0 --set-cloudsql-instances=projectId:region:instancename
1310
1310
  else
1311
1311
  gcloud run jobs create "$current_job_name" --command="yarn,migrate" --labels="customer-name=pan,component-name=api,app-name=test-app,env-type=stage,env-name=stage,build-type=node,cloud-run-job-name=$current_job_name" --image="europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG" --project=google-project-id --region=europe-west6 --memory=512Mi --parallelism=1 --task-timeout=10m --env-vars-file=____envvars.yaml --max-retries=0 --set-cloudsql-instances=projectId:region:instancename
1312
1312
  fi
1313
1313
  - |-
1314
1314
  current_job_name="pan-test-app-stage-api-reset"
1315
- if grep "$current_job_name" <<<"$exist_job_names" >/dev/null; then
1315
+ if echo "$exist_job_names" | grep -Fx "$current_job_name" >/dev/null; then
1316
1316
  gcloud run jobs update "$current_job_name" --command="yarn,reset" --labels="customer-name=pan,component-name=api,app-name=test-app,env-type=stage,env-name=stage,build-type=node,cloud-run-job-name=$current_job_name" --image="europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG" --project=google-project-id --region=europe-west6 --memory=512Mi --parallelism=1 --task-timeout=10m --env-vars-file=____envvars.yaml --max-retries=0 --set-cloudsql-instances=projectId:region:instancename
1317
1317
  else
1318
1318
  gcloud run jobs create "$current_job_name" --command="yarn,reset" --labels="customer-name=pan,component-name=api,app-name=test-app,env-type=stage,env-name=stage,build-type=node,cloud-run-job-name=$current_job_name" --image="europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG" --project=google-project-id --region=europe-west6 --memory=512Mi --parallelism=1 --task-timeout=10m --env-vars-file=____envvars.yaml --max-retries=0 --set-cloudsql-instances=projectId:region:instancename
1319
1319
  fi
1320
1320
  - |-
1321
1321
  current_job_name="pan-test-app-stage-api-send-reminders"
1322
- if grep "$current_job_name" <<<"$exist_job_names" >/dev/null; then
1322
+ if echo "$exist_job_names" | grep -Fx "$current_job_name" >/dev/null; then
1323
1323
  gcloud run jobs update "$current_job_name" --command="yarn,job:send-reminders" --args="--verbose=false" --labels="customer-name=pan,component-name=api,app-name=test-app,env-type=stage,env-name=stage,build-type=node,cloud-run-job-name=$current_job_name" --image="europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG" --project=google-project-id --region=europe-west6 --memory=512Mi --parallelism=1 --task-timeout=10m --env-vars-file=____envvars.yaml --max-retries=0 --set-cloudsql-instances=projectId:region:instancename
1324
1324
  else
1325
1325
  gcloud run jobs create "$current_job_name" --command="yarn,job:send-reminders" --args="--verbose=false" --labels="customer-name=pan,component-name=api,app-name=test-app,env-type=stage,env-name=stage,build-type=node,cloud-run-job-name=$current_job_name" --image="europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/stage/api:$DOCKER_IMAGE_TAG" --project=google-project-id --region=europe-west6 --memory=512Mi --parallelism=1 --task-timeout=10m --env-vars-file=____envvars.yaml --max-retries=0 --set-cloudsql-instances=projectId:region:instancename
@@ -1676,7 +1676,7 @@ api 🧪 test:
1676
1676
  )"
1677
1677
  current_job_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"
1678
1678
  current_scheduler_name="pan-test-app-prod-api-send-reminders-admins"
1679
- if grep "$current_scheduler_name" <<<"$exist_scheduler_names" >/dev/null; then
1679
+ if echo "$exist_scheduler_names" | grep -Fx "$current_scheduler_name" >/dev/null; then
1680
1680
  gcloud scheduler jobs update http "$current_scheduler_name" --project=google-project-id --location=europe-west6 --uri="$current_job_uri" --message-body="{\\"overrides\\":{\\"containerOverrides\\":[{\\"args\\":[\\"--only-admins\\",\\"--verbose=true\\"]}]}}" --http-method=POST --oauth-service-account-email="$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com" --schedule="0 * * * *" --max-retry-attempts=0
1681
1681
  else
1682
1682
  gcloud scheduler jobs create http "$current_scheduler_name" --project=google-project-id --location=europe-west6 --uri="$current_job_uri" --message-body="{\\"overrides\\":{\\"containerOverrides\\":[{\\"args\\":[\\"--only-admins\\",\\"--verbose=true\\"]}]}}" --http-method=POST --oauth-service-account-email="$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com" --schedule="0 * * * *" --max-retry-attempts=0
@@ -1684,7 +1684,7 @@ api 🧪 test:
1684
1684
  - |-
1685
1685
  current_job_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"
1686
1686
  current_scheduler_name="pan-test-app-prod-api-send-reminders"
1687
- if grep "$current_scheduler_name" <<<"$exist_scheduler_names" >/dev/null; then
1687
+ if echo "$exist_scheduler_names" | grep -Fx "$current_scheduler_name" >/dev/null; then
1688
1688
  gcloud scheduler jobs update http "$current_scheduler_name" --project=google-project-id --location=europe-west6 --uri="$current_job_uri" --http-method=POST --oauth-service-account-email="$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com" --schedule="0 * * * *" --max-retry-attempts=0
1689
1689
  else
1690
1690
  gcloud scheduler jobs create http "$current_scheduler_name" --project=google-project-id --location=europe-west6 --uri="$current_job_uri" --http-method=POST --oauth-service-account-email="$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com" --schedule="0 * * * *" --max-retry-attempts=0
@@ -1692,7 +1692,7 @@ api 🧪 test:
1692
1692
  - |-
1693
1693
  current_job_uri="\${ROOT_URL}/myEndpoint"
1694
1694
  current_scheduler_name="pan-test-app-prod-api-call-http-endpoint"
1695
- if grep "$current_scheduler_name" <<<"$exist_scheduler_names" >/dev/null; then
1695
+ if echo "$exist_scheduler_names" | grep -Fx "$current_scheduler_name" >/dev/null; then
1696
1696
  gcloud scheduler jobs update http "$current_scheduler_name" --project=google-project-id --location=europe-west6 --uri="$current_job_uri" --http-method=GET --oidc-service-account-email="$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com" --schedule="0 * * * *" --max-retry-attempts=0
1697
1697
  else
1698
1698
  gcloud scheduler jobs create http "$current_scheduler_name" --project=google-project-id --location=europe-west6 --uri="$current_job_uri" --http-method=GET --oidc-service-account-email="$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com" --schedule="0 * * * *" --max-retry-attempts=0
@@ -1702,14 +1702,14 @@ api 🧪 test:
1702
1702
  gcloud run jobs list --filter='metadata.name ~ prod.*api' --format='value(name)' --limit=999 --project='google-project-id' --region='europe-west6'
1703
1703
  )"
1704
1704
  current_job_name="pan-test-app-prod-api-migrate"
1705
- if grep "$current_job_name" <<<"$exist_job_names" >/dev/null; then
1705
+ if echo "$exist_job_names" | grep -Fx "$current_job_name" >/dev/null; then
1706
1706
  gcloud run jobs update "$current_job_name" --command="yarn,migrate" --labels="customer-name=pan,component-name=api,app-name=test-app,env-type=prod,env-name=prod,build-type=node,cloud-run-job-name=$current_job_name" --image="europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG" --project=google-project-id --region=europe-west6 --memory=512Mi --parallelism=1 --task-timeout=10m --env-vars-file=____envvars.yaml --max-retries=0 --set-cloudsql-instances=projectId:region:instancename
1707
1707
  else
1708
1708
  gcloud run jobs create "$current_job_name" --command="yarn,migrate" --labels="customer-name=pan,component-name=api,app-name=test-app,env-type=prod,env-name=prod,build-type=node,cloud-run-job-name=$current_job_name" --image="europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG" --project=google-project-id --region=europe-west6 --memory=512Mi --parallelism=1 --task-timeout=10m --env-vars-file=____envvars.yaml --max-retries=0 --set-cloudsql-instances=projectId:region:instancename
1709
1709
  fi
1710
1710
  - |-
1711
1711
  current_job_name="pan-test-app-prod-api-send-reminders"
1712
- if grep "$current_job_name" <<<"$exist_job_names" >/dev/null; then
1712
+ if echo "$exist_job_names" | grep -Fx "$current_job_name" >/dev/null; then
1713
1713
  gcloud run jobs update "$current_job_name" --command="yarn,job:send-reminders" --args="--verbose=false" --labels="customer-name=pan,component-name=api,app-name=test-app,env-type=prod,env-name=prod,build-type=node,cloud-run-job-name=$current_job_name" --image="europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG" --project=google-project-id --region=europe-west6 --memory=512Mi --parallelism=1 --task-timeout=10m --env-vars-file=____envvars.yaml --max-retries=0 --set-cloudsql-instances=projectId:region:instancename
1714
1714
  else
1715
1715
  gcloud run jobs create "$current_job_name" --command="yarn,job:send-reminders" --args="--verbose=false" --labels="customer-name=pan,component-name=api,app-name=test-app,env-type=prod,env-name=prod,build-type=node,cloud-run-job-name=$current_job_name" --image="europe-west6-docker.pkg.dev/google-project-id/catladder-deploy/pan-test-app/prod/api:$DOCKER_IMAGE_TAG" --project=google-project-id --region=europe-west6 --memory=512Mi --parallelism=1 --task-timeout=10m --env-vars-file=____envvars.yaml --max-retries=0 --set-cloudsql-instances=projectId:region:instancename
package/package.json CHANGED
@@ -53,7 +53,7 @@
53
53
  }
54
54
  ],
55
55
  "license": "MIT",
56
- "version": "3.12.2",
56
+ "version": "3.12.4",
57
57
  "scripts": {
58
58
  "build:tsc": "yarn tsc",
59
59
  "build": "yarn build:compile && yarn build:inline-variables",
package/src/deploy/cloudRun/createJobs/cloudRunJobs.ts CHANGED
@@ -73,7 +73,7 @@ export const getJobCreateScripts = (context: ComponentContext): string[] =>
73
73
  ? `exist_job_names="$(\n ${gcloudRunCmd()} jobs list --filter='metadata.name ~ ${context.env}.*${context.name}' --format='value(name)' --limit=999 --project='${project}' --region='${region}'\n)"`
74
74
  : null,
75
75
  `current_job_name="${fullJobName}"`,
76
- 'if grep "$current_job_name" <<<"$exist_job_names" >/dev/null; then',
76
+ 'if echo "$exist_job_names" | grep -Fx "$current_job_name" >/dev/null; then',
77
77
  ` ${gcloudRunCmd()} jobs update "$current_job_name" ${commonDeployArgsString}`,
78
78
  "else",
79
79
  ` ${gcloudRunCmd()} jobs create "$current_job_name" ${commonDeployArgsString}`,
package/src/deploy/cloudRun/createJobs/execute/schedules.ts CHANGED
@@ -55,7 +55,7 @@ export const getCreateScheduleScript = (
55
55
  : null,
56
56
  `current_job_uri="${uri}"`,
57
57
  `current_scheduler_name="${fullName}"`,
58
- `if grep "$current_scheduler_name" <<<"$exist_scheduler_names" >/dev/null; then`,
58
+ `if echo "$exist_scheduler_names" | grep -Fx "$current_scheduler_name" >/dev/null; then`,
59
59
  ` ${gcloudSchedulerCmd()} jobs update http "$current_scheduler_name" ${argsString}`,
60
60
  `else`,
61
61
  ` ${gcloudSchedulerCmd()} jobs create http "$current_scheduler_name" ${argsString}`,