From 34e9eb252a749812aeeafb3d9998efcc0b1720ba Mon Sep 17 00:00:00 2001 From: XiyueYu <52932582+capri-xiyue@users.noreply.github.com> Date: Thu, 5 Oct 2023 11:55:13 -0700 Subject: [PATCH 1/6] added abc cli template --- README.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/README.md b/README.md index c362c593..979e0e3e 100644 --- a/README.md +++ b/README.md @@ -70,6 +70,7 @@ JVS consists of the following components: ## Installation +### Via Terraform Module You can use the provided Terraform module to setup the basic infrastructure needed for this service. Otherwise you can refer to the provided module to see how to build your own Terraform from scratch. @@ -100,6 +101,26 @@ module "jvs" { prober_audience = "https://example-api-jvs-cloud-run.run.app" } ``` +### Via [abc CLI](https://github.com/abcxyz/abc#abc) +You can also leverage [abc CLI](https://github.com/abcxyz/abc#abc) to set up the basic infrastructure +needed for this service. +You will need to install [abc CLI](https://github.com/abcxyz/abc#abc) +by following docs [here]https://github.com/abcxyz/abc#installation. + +```sh +abc templates render \ + -input="" \ + -input="jvs_release_version=" \ + -input="jvs_api_domain=" \ + -input="jvs_ui_domain=" \ + -input="iap_support_email=" \ + -input="notification_channel_email=" \ + -input="jvs_invoker_members=" \ + -input="prober_audience=" \ + -input="terraform_state_bucket=" \ + -input="terraform_state_prefix=" \ + github.com/abcxyz/jvs.git//templates/jvs-e2e +``` ## External Verifier From f9529f42388a55e5807a607f5674e9b54c2bd768 Mon Sep 17 00:00:00 2001 From: XiyueYu <52932582+capri-xiyue@users.noreply.github.com> Date: Thu, 5 Oct 2023 12:49:26 -0700 Subject: [PATCH 2/6] fixed terraform lint --- terraform/modules/jvs-services/jvs-api.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/modules/jvs-services/jvs-api.tf b/terraform/modules/jvs-services/jvs-api.tf index 612b2657..f53c547e 100644 --- a/terraform/modules/jvs-services/jvs-api.tf +++ b/terraform/modules/jvs-services/jvs-api.tf @@ -13,7 +13,7 @@ # limitations under the License. module "api_cloud_run" { - source = "git::https://github.com/abcxyz/terraform-modules.git//modules/cloud_run?ref=46d3ffd82d7c3080bc5ec2cc788fe3e21176a8be" + source = "git::https://github.com/abcxyz/terraform-modules.git//modules/cloud_run?ref=580de3cc99dce5f37f7698b14e04fdd1c86ab15a" project_id = var.project_id From 3175a5c3221328e61b35167d206408f3fc2c41ea Mon Sep 17 00:00:00 2001 From: XiyueYu <52932582+capri-xiyue@users.noreply.github.com> Date: Thu, 5 Oct 2023 12:51:46 -0700 Subject: [PATCH 3/6] revert cloud run update --- terraform/modules/jvs-services/jvs-api.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/modules/jvs-services/jvs-api.tf b/terraform/modules/jvs-services/jvs-api.tf index f53c547e..612b2657 100644 --- a/terraform/modules/jvs-services/jvs-api.tf +++ b/terraform/modules/jvs-services/jvs-api.tf @@ -13,7 +13,7 @@ # limitations under the License. module "api_cloud_run" { - source = "git::https://github.com/abcxyz/terraform-modules.git//modules/cloud_run?ref=580de3cc99dce5f37f7698b14e04fdd1c86ab15a" + source = "git::https://github.com/abcxyz/terraform-modules.git//modules/cloud_run?ref=46d3ffd82d7c3080bc5ec2cc788fe3e21176a8be" project_id = var.project_id From d8fa8a12da3b1c9b11c34166780b8f3ac1a72039 Mon Sep 17 00:00:00 2001 From: XiyueYu <52932582+capri-xiyue@users.noreply.github.com> Date: Thu, 5 Oct 2023 12:57:50 -0700 Subject: [PATCH 4/6] updated version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 566cfc11..df30d94a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: uses: 'abcxyz/pkg/.github/workflows/terraform-lint.yml@main' # ratchet:exclude with: directory: 'terraform' - terraform_version: '1.2' + terraform_version: '1.3.6' yaml_lint: uses: 'abcxyz/pkg/.github/workflows/yaml-lint.yml@main' # ratchet:exclude From 8d07aac9c4c2da70096a2b04fc66edb0735f654c Mon Sep 17 00:00:00 2001 From: XiyueYu <52932582+capri-xiyue@users.noreply.github.com> Date: Thu, 5 Oct 2023 13:02:58 -0700 Subject: [PATCH 5/6] updated version --- terraform/modules/jvs-services/jvs-api.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/modules/jvs-services/jvs-api.tf b/terraform/modules/jvs-services/jvs-api.tf index 612b2657..f53c547e 100644 --- a/terraform/modules/jvs-services/jvs-api.tf +++ b/terraform/modules/jvs-services/jvs-api.tf @@ -13,7 +13,7 @@ # limitations under the License. module "api_cloud_run" { - source = "git::https://github.com/abcxyz/terraform-modules.git//modules/cloud_run?ref=46d3ffd82d7c3080bc5ec2cc788fe3e21176a8be" + source = "git::https://github.com/abcxyz/terraform-modules.git//modules/cloud_run?ref=580de3cc99dce5f37f7698b14e04fdd1c86ab15a" project_id = var.project_id From ccdb0b0b27e336837b628ccc1b22686a3e174c52 Mon Sep 17 00:00:00 2001 From: XiyueYu <52932582+capri-xiyue@users.noreply.github.com> Date: Thu, 5 Oct 2023 13:05:42 -0700 Subject: [PATCH 6/6] updated all cloud run module --- terraform/modules/jvs-services/cert-rotator.tf | 2 +- terraform/modules/jvs-services/jvs-ui.tf | 2 +- terraform/modules/jvs-services/public-key.tf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/terraform/modules/jvs-services/cert-rotator.tf b/terraform/modules/jvs-services/cert-rotator.tf index b44a48ee..0ad4b23d 100644 --- a/terraform/modules/jvs-services/cert-rotator.tf +++ b/terraform/modules/jvs-services/cert-rotator.tf @@ -24,7 +24,7 @@ resource "google_project_service" "services" { } module "cert_rotator_cloud_run" { - source = "git::https://github.com/abcxyz/terraform-modules.git//modules/cloud_run?ref=46d3ffd82d7c3080bc5ec2cc788fe3e21176a8be" + source = "git::https://github.com/abcxyz/terraform-modules.git//modules/cloud_run?ref=580de3cc99dce5f37f7698b14e04fdd1c86ab15a" project_id = var.project_id diff --git a/terraform/modules/jvs-services/jvs-ui.tf b/terraform/modules/jvs-services/jvs-ui.tf index 80fd522e..793e6b79 100644 --- a/terraform/modules/jvs-services/jvs-ui.tf +++ b/terraform/modules/jvs-services/jvs-ui.tf @@ -13,7 +13,7 @@ # limitations under the License. module "ui_cloud_run" { - source = "git::https://github.com/abcxyz/terraform-modules.git//modules/cloud_run?ref=46d3ffd82d7c3080bc5ec2cc788fe3e21176a8be" + source = "git::https://github.com/abcxyz/terraform-modules.git//modules/cloud_run?ref=580de3cc99dce5f37f7698b14e04fdd1c86ab15a" project_id = var.project_id diff --git a/terraform/modules/jvs-services/public-key.tf b/terraform/modules/jvs-services/public-key.tf index 20890c7d..3b49090b 100644 --- a/terraform/modules/jvs-services/public-key.tf +++ b/terraform/modules/jvs-services/public-key.tf @@ -13,7 +13,7 @@ # limitations under the License. module "public_key_cloud_run" { - source = "git::https://github.com/abcxyz/terraform-modules.git//modules/cloud_run?ref=46d3ffd82d7c3080bc5ec2cc788fe3e21176a8be" + source = "git::https://github.com/abcxyz/terraform-modules.git//modules/cloud_run?ref=580de3cc99dce5f37f7698b14e04fdd1c86ab15a" project_id = var.project_id