-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: add hello-world as the default application (#247)
Co-authored-by: Andrew Peabody <andrewpeabody@google.com>
- Loading branch information
1 parent
e4a547b
commit da26d9b
Showing
43 changed files
with
718 additions
and
40 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK --> | ||
| ## Inputs | ||
|
|
||
| | Name | Description | Type | Default | Required | | ||
| |------|-------------|------|---------|:--------:| | ||
| | 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 | | ||
| | common\_folder\_id | Folder ID in which to create all application admin projects, must be prefixed with 'folders/' | `string` | n/a | yes | | ||
| | envs | Environments | <pre>map(object({<br> billing_account = string<br> folder_id = string<br> network_project_id = string<br> network_self_link = string<br> org_id = string<br> subnets_self_links = list(string)<br> }))</pre> | n/a | yes | | ||
| | location | Location for build buckets. | `string` | `"us-central1"` | no | | ||
| | org\_id | Google Cloud Organization ID. | `string` | n/a | yes | | ||
| | remote\_state\_bucket | Backend bucket to load Terraform Remote State Data from previous steps. | `string` | n/a | yes | | ||
| | tf\_apply\_branches | List of git branches configured to run terraform apply Cloud Build trigger. All other branches will run plan by default. | `list(string)` | <pre>[<br> "development",<br> "nonproduction",<br> "production"<br>]</pre> | no | | ||
| | trigger\_location | Location of for Cloud Build triggers created in the workspace. If using private pools should be the same location as the pool. | `string` | `"global"` | no | | ||
|
|
||
| ## Outputs | ||
|
|
||
| | Name | Description | | ||
| |------|-------------| | ||
| | app-folders-ids | Pair of app-name and folder\_id | | ||
| | app-group | Description on the app-group components | | ||
|
|
||
| <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| /** | ||
| * Copyright 2024 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| terraform { | ||
| backend "gcs" { | ||
| bucket = "UPDATE_ME" | ||
| prefix = "terraform/appfactory/shared" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /** | ||
| * Copyright 2024 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| locals { | ||
| all_environments_cluster_service_accounts_iam_members = [for sa in local.cluster_service_accounts : "serviceAccount:${sa}"] | ||
|
|
||
| expanded_cluster_service_accounts = flatten([ | ||
| for key in keys(local.app_services) : [ | ||
| for sa in local.all_environments_cluster_service_accounts_iam_members : { | ||
| app_name = key | ||
| cluster_sa_member = sa | ||
| } | ||
| ] | ||
| ]) | ||
| } | ||
|
|
||
| // Assign artifactregistry reader to cluster service accounts | ||
| // This allows docker images on application projects to be downloaded on the cluster | ||
| resource "google_folder_iam_member" "admin" { | ||
| // for each app folder, create permissions for dev/non prod and prod cluster service accounts | ||
| for_each = tomap({ | ||
| for app_name_sa in local.expanded_cluster_service_accounts : "${app_name_sa.app_name}.${app_name_sa.cluster_sa_member}" => app_name_sa | ||
| }) | ||
|
|
||
| folder = google_folder.app_folder[each.value.app_name].name | ||
| role = "roles/artifactregistry.reader" | ||
| member = each.value.cluster_sa_member | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /** | ||
| * Copyright 2024 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| locals { | ||
| # Services in this list will receive dedicated projects for application-specific infrastructure, such as an app-specific database. | ||
| services_with_infra = [] | ||
| app_services = { | ||
| // app name | ||
| "default-example" = [ | ||
| // microservices names | ||
| "hello-world", | ||
| ] | ||
| } | ||
|
|
||
| expanded_app_services = flatten([ | ||
| for key, services in local.app_services : [ | ||
| for service in services : { | ||
| app_name = key | ||
| # app acronym is defined in 2-multitenant variables | ||
| acronym = local.acronym[key] | ||
| service_name = service | ||
| create_env_projects = contains(local.services_with_infra, service) | ||
| } | ||
| ] | ||
| ]) | ||
| } | ||
|
|
||
| // One folder per application, will group admin/service projects under it | ||
| resource "google_folder" "app_folder" { | ||
| for_each = local.app_services | ||
|
|
||
| display_name = each.key | ||
| parent = var.common_folder_id | ||
| } | ||
|
|
||
| module "components" { | ||
| source = "../../modules/app-group-baseline" | ||
|
|
||
| for_each = tomap({ | ||
| for app_service in local.expanded_app_services : "${app_service.app_name}.${app_service.service_name}" => app_service | ||
| }) | ||
|
|
||
| service_name = each.value.service_name | ||
| acronym = each.value.acronym | ||
| create_env_projects = each.value.create_env_projects | ||
|
|
||
| org_id = var.org_id | ||
| billing_account = var.billing_account | ||
| folder_id = google_folder.app_folder[each.value.app_name].folder_id | ||
| envs = var.envs | ||
| bucket_prefix = var.bucket_prefix | ||
| location = var.location | ||
| trigger_location = var.trigger_location | ||
| bucket_force_destroy = var.bucket_force_destroy | ||
| tf_apply_branches = var.tf_apply_branches | ||
|
|
||
| cloudbuild_sa_roles = { | ||
| development = { | ||
| roles = ["roles/owner"] | ||
| } | ||
| nonproduction = { | ||
| roles = ["roles/owner"] | ||
| } | ||
| production = { | ||
| roles = ["roles/owner"] | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /** | ||
| * Copyright 2024 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| output "app-group" { | ||
| description = "Description on the app-group components" | ||
| value = { | ||
| for k, value in module.components : k => { | ||
| app_env_project_ids : value.app_env_project_ids, | ||
| app_admin_project_id : value.app_admin_project_id, | ||
| app_infra_repository_name : value.app_infra_repository_name, | ||
| app_infra_repository_url : value.app_infra_repository_url, | ||
| app_cloudbuild_workspace_apply_trigger_id : value.app_cloudbuild_workspace_apply_trigger_id, | ||
| app_cloudbuild_workspace_plan_trigger_id : value.app_cloudbuild_workspace_plan_trigger_id, | ||
| app_cloudbuild_workspace_artifacts_bucket_name : value.app_cloudbuild_workspace_artifacts_bucket_name, | ||
| app_cloudbuild_workspace_logs_bucket_name : value.app_cloudbuild_workspace_logs_bucket_name, | ||
| app_cloudbuild_workspace_state_bucket_name : value.app_cloudbuild_workspace_state_bucket_name, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| output "app-folders-ids" { | ||
| description = "Pair of app-name and folder_id" | ||
| value = { | ||
| for k, v in google_folder.app_folder : k => v.folder_id | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /** | ||
| * Copyright 2024 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| // These values are retrieved from the saved terraform state of the execution | ||
| // of previous step using the terraform_remote_state data source. | ||
| locals { | ||
| cluster_service_accounts = flatten([for state in data.terraform_remote_state.multitenant : state.outputs.cluster_service_accounts]) | ||
| acronym = flatten([for state in data.terraform_remote_state.multitenant : state.outputs.acronyms])[0] | ||
| } | ||
|
|
||
| data "terraform_remote_state" "multitenant" { | ||
| for_each = var.envs | ||
|
|
||
| backend = "gcs" | ||
|
|
||
| config = { | ||
| bucket = var.remote_state_bucket | ||
| prefix = "terraform/multi_tenant/${each.key}" | ||
| } | ||
| } |
Oops, something went wrong.