From eb77d9c58e132ea634e900ec3c55d931e5a1043d Mon Sep 17 00:00:00 2001 From: Connor O'Kane Date: Thu, 4 Jul 2024 10:32:03 +0100 Subject: [PATCH] adding config + pipeline --- .github/workflows/pipeline.yaml | 2 +- components/locals.tf | 5 ----- components/main.tf | 6 +++--- test-repos.json | 5 +++-- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pipeline.yaml b/.github/workflows/pipeline.yaml index 6ac260d87..3b6d9c848 100644 --- a/.github/workflows/pipeline.yaml +++ b/.github/workflows/pipeline.yaml @@ -12,7 +12,7 @@ permissions: id-token: write contents: read -jobs: +jobs: build-and-deploy: runs-on: ubuntu-latest steps: diff --git a/components/locals.tf b/components/locals.tf index 65b0ed0e4..117f54e60 100644 --- a/components/locals.tf +++ b/components/locals.tf @@ -39,11 +39,6 @@ locals { - - - - - locals { env_display_names = { sbox = "Sandbox" diff --git a/components/main.tf b/components/main.tf index c7c2e84ac..31b635c78 100644 --- a/components/main.tf +++ b/components/main.tf @@ -29,7 +29,7 @@ resource "azurerm_storage_container" "tfstate" { # Check if branches exist data "github_branch" "existing_branches" { - for_each = { for combo in local.repo_branch_combinations : "${combo.repo}:${combo.branch}" => combo } + for_each = { for combo in local.repo_branch_combinations : "${combo.repo}:${combo.branch}" => combo } repository = each.value.repo branch = each.value.branch } @@ -43,7 +43,7 @@ resource "github_branch_protection_v3" "branch_protection" { repository = each.value.repo branch = each.value.branch - enforce_admins = false # Excludes organization admins + enforce_admins = false # Excludes organisation admins required_status_checks { strict = true @@ -65,4 +65,4 @@ resource "github_branch_protection_v3" "branch_protection" { output "existing_branches" { value = data.github_branch.existing_branches -} +} \ No newline at end of file diff --git a/test-repos.json b/test-repos.json index 8c4b37e04..79ebd790c 100644 --- a/test-repos.json +++ b/test-repos.json @@ -3,5 +3,6 @@ "rule-set-test-repo1", "rule-set-test-repo2", "rule-set-test-repo3", - "rule-set-test-repo4" -] + "rule-set-test-repo4" + ] + \ No newline at end of file