feat: add cymbal shop + cymbal bank deployment (#260)

2-multitenant/terraform.tfvars

@@ -24,4 +24,13 @@ apps = {
     }
     "acronym" = "cb",
   }
+  "cymbal-shop" : {
+    "ip_address_names" : [
+      "cymbal-shop-frontend-ip",
+    ]
+    "certificates" : {
+      "cymbal-shop-frontend-example-com" : ["cymbal-shop.frontend.example.com"]
+    }
+    "acronym" = "cs",
+  }
 }

4-appfactory/envs/shared/README.md

@@ -3,7 +3,7 @@
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| applications | A map where the key is the application name, containing the configuration for each microservice under the application. Each microservice has the following properties:<br>- **admin\_project\_id** (Optional): Admin project associated with the microservice. This hosts microservice specific CI/CD pipelines. If set, `create_admin_project` must be `false`.<br>- **create\_infra\_project** (Required): Indicates whether an infrastructure project should be created for the microservice (one infra project will be created per environment defines in var.envs).<br>- **create\_admin\_project** (Required): Indicates whether a Admin project should be created for the microservice. | <pre>map(map(object({<br>    admin_project_id        = optional(string, null)<br>    create_infra_project    = bool<br>    create_admin_project_id = bool<br>  })))</pre> | n/a | yes |
+| applications | A map where the key is the application name, containing the configuration for each microservice under the application. Each microservice has the following properties:<br>- **admin\_project\_id** (Optional): Admin project associated with the microservice. This hosts microservice specific CI/CD pipelines. If set, `create_admin_project` must be `false`.<br>- **create\_infra\_project** (Required): Indicates whether an infrastructure project should be created for the microservice (one infra project will be created per environment defines in var.envs).<br>- **create\_admin\_project** (Required): Indicates whether a Admin project should be created for the microservice. | <pre>map(map(object({<br>    admin_project_id     = optional(string, null)<br>    create_infra_project = bool<br>    create_admin_project = bool<br>  })))</pre> | n/a | yes |
 | billing\_account | Billing Account ID for application admin project resources. | `string` | n/a | yes |
 | bucket\_force\_destroy | When deleting a bucket, this boolean option will delete all contained objects. If false, Terraform will fail to delete buckets which contain objects. | `bool` | `false` | no |
 | bucket\_prefix | Name prefix to use for buckets created. | `string` | `"bkt"` | no |

4-appfactory/envs/shared/variables.tf

@@ -90,9 +90,9 @@ variable "applications" {
   - **create_admin_project** (Required): Indicates whether a Admin project should be created for the microservice.
   EOF
   type = map(map(object({
-    admin_project_id        = optional(string, null)
-    create_infra_project    = bool
-    create_admin_project_id = bool
+    admin_project_id     = optional(string, null)
+    create_infra_project = bool
+    create_admin_project = bool
   })))
 
   validation {

build/int.cloudbuild.yaml

@@ -138,7 +138,7 @@ steps:
     waitFor:
       - appinfra-apply
 
-  - id: appsource-verify
+  - id: appsource-verify-cymbal-bank
     name: "gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS"
     args:
       [
@@ -148,12 +148,24 @@ steps:
       ]
     waitFor:
       - appinfra-apply
+
+  - id: appsource-verify-cymbal-shop
+    name: "gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS"
+    args:
+      [
+        "/bin/bash",
+        "-c",
+        "cft test run TestSourceCymbalShop --stage verify --verbose",
+      ]
+    waitFor:
+      - appinfra-apply
+
   - id: app-e2e
     name: "gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS"
     args:
       ["/bin/bash", "-c", "cft test run TestAppE2E --stage verify --verbose"]
     waitFor:
-      - appsource-verify
+      - appsource-verify-cymbal-bank
   - id: appinfra-teardown
     name: "gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS"
     args:
@@ -164,7 +176,8 @@ steps:
       ]
     waitFor:
       - app-e2e
-      - appsource-verify
+      - appsource-verify-cymbal-bank
+      - appsource-verify-cymbal-shop
       - appinfra-verify
       - appfactory-verify
       - fleetscope-verify