deploydags image

Author: ia-tests

Makefile

@@ -32,9 +32,9 @@ precommit: ## Test if all files are properly formatted
 
 .PHONY: push_ci_image
 push_ci_image:
-	@cd ci && gcloud builds submit --project=datapipelines-ci --tag gcr.io/datapipelines-ci/make .
+	@cd ci && gcloud builds submit --project=datapipelines-ci-282719 --tag gcr.io/datapipelines-ci-282719/make .
 
 .PHONY: push_deploydags_image
 push_deploydags_image:
-	@cd composer/cloudbuild/go/dagsdeployer && gcloud builds submit --project=datapipelines-ci --tag gcr.io/datapipelines-ci/deploydags .
+	@cd composer/cloudbuild/go/dagsdeployer && gcloud builds submit --project=datapipelines-ci-282719 --tag gcr.io/datapipelines-ci-282719/deploydags .
 

ci/Dockerfile

@@ -5,6 +5,8 @@ FROM python:buster
 # install core tools
 RUN apt-get update && apt-get install -y build-essential
 
+RUN curl -sSL https://sdk.cloud.google.com | bash
+
 # install shellcheck
 RUN apt-get install shellcheck
 

cloudbuild.yaml

@@ -187,7 +187,7 @@ steps:
   dir: './composer/cloudbuild/go/dagsdeployer'
   args: [
           'build', 
-          '-t', 'gcr.io/${_ARTIFACTS_PROJECT_ID}/deploydags:latest',
+          '-t', 'gcr.io/${PROJECT_ID}/deploydags:latest',
           '--cache-from', 'gcr.io/${_ARTIFACTS_PROJECT_ID}/deploydags:latest',
           '.'
         ]

terraform/artifacts/backend.tf

@@ -1,7 +1,7 @@
 # Generated by Terragrunt. Sig: nIlQXj57tbuaRZEa
 terraform {
   backend "gcs" {
-    prefix = "terraform_state/artifacts/terraform.tfstate"
     bucket = "datapipelines-terraform-state"
+    prefix = "terraform_state/artifacts/terraform.tfstate"
   }
 }

terraform/datapipelines-infra/outputs.tf

@@ -16,7 +16,7 @@ output "composer-env-name" {
 }
 
 output "composer-dags-bucket" {
-  value       = replace(google_composer_environment.orchestration.config[0].dag_gcs_prefix, "dags", "")
+  value       = trimsuffix(google_composer_environment.orchestration.config[0].dag_gcs_prefix, "dags")
   description = "The Cloud Composer Environment created by this module"
 }