diff --git a/.github/workflows/cloud_build.yml b/.github/workflows/cloud_build.yml index 2ae79398..7f10f0e4 100644 --- a/.github/workflows/cloud_build.yml +++ b/.github/workflows/cloud_build.yml @@ -26,5 +26,5 @@ jobs: - name: Build and Deploy run: | - gcloud builds submit --tag gcr.io/113009620257/burn-backend - gcloud beta run deploy burn-backend --image gcr.io/113009620257/burn-backend --platform managed + gcloud builds submit --tag us-central1-docker.pkg.dev/dse-nps/burn-severity-mapping-poc/burn-backend + gcloud beta run deploy burn-backend --image us-central1-docker.pkg.dev/dse-nps/burn-severity-mapping-poc/burn-backend --platform managed diff --git a/main.tf b/main.tf index 86f1b354..92858d34 100644 --- a/main.tf +++ b/main.tf @@ -125,4 +125,11 @@ resource "google_service_account_iam_binding" "workload_identity_user" { members = [ "principalSet://iam.googleapis.com/projects/${data.google_project.project.number}/locations/global/workloadIdentityPools/${google_iam_workload_identity_pool.pool.workload_identity_pool_id}/attribute.repository/SchmidtDSE/burn-severity-mapping-poc" ] +} + +# Create an Artifact Registry repo for the container image +resource "google_artifact_registry_repository" "burn-backend" { + repository_id = "burn-backend" + format = "DOCKER" + location = "us-central1" } \ No newline at end of file diff --git a/terraform.tfstate b/terraform.tfstate index 2b5c185a..c8bad3fd 100644 --- a/terraform.tfstate +++ b/terraform.tfstate @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "1.6.0", - "serial": 69, + "serial": 71, "lineage": "44075ebe-b91a-1e72-3b17-affdfb63c0f1", "outputs": {}, "resources": [ @@ -85,6 +85,40 @@ } ] }, + { + "mode": "managed", + "type": "google_artifact_registry_repository", + "name": "burn-backend", + "provider": "provider[\"registry.opentofu.org/hashicorp/google\"]", + "instances": [ + { + "schema_version": 0, + "attributes": { + "create_time": "2023-12-31T03:14:03.513874Z", + "description": "", + "docker_config": [], + "effective_labels": {}, + "format": "DOCKER", + "id": "projects/dse-nps/locations/us-central1/repositories/burn-backend", + "kms_key_name": "", + "labels": null, + "location": "us-central1", + "maven_config": [], + "mode": "STANDARD_REPOSITORY", + "name": "burn-backend", + "project": "dse-nps", + "remote_repository_config": [], + "repository_id": "burn-backend", + "terraform_labels": {}, + "timeouts": null, + "update_time": "2023-12-31T03:14:03.513874Z", + "virtual_repository_config": [] + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxMjAwMDAwMDAwMDAwLCJkZWxldGUiOjEyMDAwMDAwMDAwMDAsInVwZGF0ZSI6MTIwMDAwMDAwMDAwMH19" + } + ] + }, { "mode": "managed", "type": "google_cloud_run_service", diff --git a/terraform.tfstate.backup b/terraform.tfstate.backup index 7362907c..2b5c185a 100644 --- a/terraform.tfstate.backup +++ b/terraform.tfstate.backup @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "1.6.0", - "serial": 67, + "serial": 69, "lineage": "44075ebe-b91a-1e72-3b17-affdfb63c0f1", "outputs": {}, "resources": [ @@ -347,7 +347,7 @@ "schema_version": 0, "attributes": { "condition": [], - "etag": "BwYNxR9UGJw=", + "etag": "BwYNxTEeIYM=", "id": "dse-nps/roles/cloudbuild.builds.builder/serviceAccount:github-actions-service-account@dse-nps.iam.gserviceaccount.com", "member": "serviceAccount:github-actions-service-account@dse-nps.iam.gserviceaccount.com", "project": "dse-nps", @@ -371,7 +371,7 @@ "schema_version": 0, "attributes": { "condition": [], - "etag": "BwYNxR9UGJw=", + "etag": "BwYNxTEeIYM=", "id": "dse-nps/roles/run.admin/serviceAccount:github-actions-service-account@dse-nps.iam.gserviceaccount.com", "member": "serviceAccount:github-actions-service-account@dse-nps.iam.gserviceaccount.com", "project": "dse-nps", @@ -421,10 +421,10 @@ "schema_version": 0, "attributes": { "condition": [], - "etag": "BwYNxENC/ts=", + "etag": "BwYNxVI1KPI=", "id": "projects/dse-nps/serviceAccounts/github-actions-service-account@dse-nps.iam.gserviceaccount.com/roles/iam.workloadIdentityUser", "members": [ - "principalSet://iam.googleapis.com/projects/113009620257/locations/global/workloadIdentityPools/github/attribute.repository/burn-severity-mapping-poc" + "principalSet://iam.googleapis.com/projects/113009620257/locations/global/workloadIdentityPools/github/attribute.repository/SchmidtDSE/burn-severity-mapping-poc" ], "role": "roles/iam.workloadIdentityUser", "service_account_id": "projects/dse-nps/serviceAccounts/github-actions-service-account@dse-nps.iam.gserviceaccount.com"