From 79aee3bf68e8192d91e5f8c272c13c961bc8ec4d Mon Sep 17 00:00:00 2001 From: Ben Zarboni Date: Wed, 6 Mar 2024 13:56:46 -0500 Subject: [PATCH 1/4] Fixed resource name --- modules/foundations-github-organization/repo_readme.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/foundations-github-organization/repo_readme.tf b/modules/foundations-github-organization/repo_readme.tf index da1c28f..66b5b79 100644 --- a/modules/foundations-github-organization/repo_readme.tf +++ b/modules/foundations-github-organization/repo_readme.tf @@ -7,6 +7,6 @@ resource "github_repository_file" "main_readme" { count = var.readme_path != "" ? 1 : 0 repository = github_repository.organizations_repo.name file = "README.md" - content = data.file.main_readme.content + content = data.local_file.main_readme.content depends_on = [github_repository.organizations_repo] } \ No newline at end of file From bb5e95815de8e09462ed3038bb4672958fae0ce3 Mon Sep 17 00:00:00 2001 From: Ben Zarboni Date: Wed, 6 Mar 2024 14:12:18 -0500 Subject: [PATCH 2/4] Fixed GH Actions Secrets value --- modules/foundations-github-organization/action-variables.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/foundations-github-organization/action-variables.tf b/modules/foundations-github-organization/action-variables.tf index 40b2855..1910161 100644 --- a/modules/foundations-github-organization/action-variables.tf +++ b/modules/foundations-github-organization/action-variables.tf @@ -1,9 +1,9 @@ resource "github_actions_secret" "organization_workload_identity_sa" { provider = github.foundation_org_scoped - repository = github_repository.organizations_repo.name - secret_name = "GCP_SERVICE_ACCOUNT" - value = var.organization_workload_identity_sa + repository = github_repository.organizations_repo.name + secret_name = "GCP_SERVICE_ACCOUNT" + plaintext_value = var.organization_workload_identity_sa } resource "github_actions_variable" "gcp_secret_manager_project_id" { From 00c7e1b45ae6af79ed72d8d32ab0931a742e2f4a Mon Sep 17 00:00:00 2001 From: Ben Zarboni Date: Wed, 6 Mar 2024 14:34:36 -0500 Subject: [PATCH 3/4] Missed a variable fix --- modules/foundations-github-organization/action-variables.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/foundations-github-organization/action-variables.tf b/modules/foundations-github-organization/action-variables.tf index 1910161..b3a0cad 100644 --- a/modules/foundations-github-organization/action-variables.tf +++ b/modules/foundations-github-organization/action-variables.tf @@ -9,9 +9,9 @@ resource "github_actions_secret" "organization_workload_identity_sa" { resource "github_actions_variable" "gcp_secret_manager_project_id" { provider = github.foundation_org_scoped - repository = github_repository.organizations_repo.name - variable_name = "GCP_SECRET_MANAGER_PROJECT" - value = var.gcp_project_id + repository = github_repository.organizations_repo.name + variable_name = "GCP_SECRET_MANAGER_PROJECT" + plaintext_value = var.gcp_project_id } resource "github_actions_organization_secret" "workload_identity_provider" { From b48c5d6c12161375b1158161d100d44718b2a927 Mon Sep 17 00:00:00 2001 From: Ben Zarboni Date: Wed, 6 Mar 2024 14:35:36 -0500 Subject: [PATCH 4/4] Correct previous fix --- .../action-variables.tf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/foundations-github-organization/action-variables.tf b/modules/foundations-github-organization/action-variables.tf index b3a0cad..2bacaa2 100644 --- a/modules/foundations-github-organization/action-variables.tf +++ b/modules/foundations-github-organization/action-variables.tf @@ -9,17 +9,17 @@ resource "github_actions_secret" "organization_workload_identity_sa" { resource "github_actions_variable" "gcp_secret_manager_project_id" { provider = github.foundation_org_scoped - repository = github_repository.organizations_repo.name - variable_name = "GCP_SECRET_MANAGER_PROJECT" - plaintext_value = var.gcp_project_id + repository = github_repository.organizations_repo.name + variable_name = "GCP_SECRET_MANAGER_PROJECT" + value = var.gcp_project_id } resource "github_actions_organization_secret" "workload_identity_provider" { provider = github.foundation_org_scoped - secret_name = "WORKLOAD_IDENTITY_PROVIDER" - value = var.workload_identity_provider_name - visibility = "selected" + secret_name = "WORKLOAD_IDENTITY_PROVIDER" + plaintext_value = var.workload_identity_provider_name + visibility = "selected" selected_repository_ids = [ github_repository.bootstrap_repo.repo_id, github_repository.organizations_repo.repo_id