upgrade@4127073556 (#116)

Co-authored-by: galargh <[email protected]>

Author: ipfs-mgmt-read-write[bot]

.github/workflows/apply.yml

@@ -87,7 +87,7 @@ jobs:
       - name: Setup terraform
         uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3
         with:
-          terraform_version: 1.1.4
+          terraform_version: 1.3.7
       - name: Initialize terraform
         run: terraform init
       - name: Terraform Plan Download

.github/workflows/clean.yml

@@ -73,7 +73,7 @@ jobs:
       - name: Setup terraform
         uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3
         with:
-          terraform_version: 1.1.4
+          terraform_version: 1.3.7
           terraform_wrapper: false
       - name: Initialize terraform
         run: terraform init -upgrade

.github/workflows/fix.yml

@@ -96,7 +96,7 @@ jobs:
       - name: Setup terraform
         uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3
         with:
-          terraform_version: 1.1.4
+          terraform_version: 1.3.7
       - name: Initialize terraform
         run: terraform init
         working-directory: terraform
@@ -125,7 +125,7 @@ jobs:
     steps:
       - name: Generate app token
         id: token
-        uses: tibdex/github-app-token@021a2405c7f990db57f5eae5397423dcc554159c # v1.7.0
+        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92 # v1.8.0
         with:
           app_id: ${{ secrets.RW_GITHUB_APP_ID }}
           installation_id: ${{ secrets[format('RW_GITHUB_APP_INSTALLATION_ID_{0}', github.repository_owner)] || secrets.RW_GITHUB_APP_INSTALLATION_ID }}

.github/workflows/plan.yml

@@ -82,7 +82,7 @@ jobs:
       - name: Setup terraform
         uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3
         with:
-          terraform_version: 1.1.4
+          terraform_version: 1.3.7
       - name: Initialize terraform
         run: terraform init
         working-directory: terraform
@@ -121,7 +121,7 @@ jobs:
       - name: Setup terraform
         uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3
         with:
-          terraform_version: 1.1.4
+          terraform_version: 1.3.7
           terraform_wrapper: false
       - name: Initialize terraform
         run: terraform init
@@ -154,7 +154,7 @@ jobs:
           echo 'EOF' >> $GITHUB_ENV
         working-directory: terraform
       - name: Comment on pull request
-        uses: marocchino/sticky-pull-request-comment@adca94abcaf73c10466a71cc83ae561fd66d1a56 # v2.3.0
+        uses: marocchino/sticky-pull-request-comment@fcf6fe9e4a0409cd9316a5011435be0f3327f1e1 # v2.3.1
         with:
           number: ${{ github.event.pull_request.number }}
           message: |

.github/workflows/sync.yml

@@ -67,7 +67,7 @@ jobs:
       - name: Setup terraform
         uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3
         with:
-          terraform_version: 1.1.4
+          terraform_version: 1.3.7
           terraform_wrapper: false
       - name: Initialize terraform
         run: terraform init -upgrade
@@ -103,7 +103,7 @@ jobs:
     steps:
       - name: Generate app token
         id: token
-        uses: tibdex/github-app-token@021a2405c7f990db57f5eae5397423dcc554159c # v1.7.0
+        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92 # v1.8.0
         with:
           app_id: ${{ secrets.RW_GITHUB_APP_ID }}
           installation_id: ${{ secrets[format('RW_GITHUB_APP_INSTALLATION_ID_{0}', github.repository_owner)] || secrets.RW_GITHUB_APP_INSTALLATION_ID }}

CHANGELOG.md

@@ -56,3 +56,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - how sync handles ignored types
 - how indices are represented in the state (always lowercase)
 - how sync handles pending invitations (now it does not ignore them)
+- removed references to other resources from for_each expressions

scripts/src/actions/shared/add-file-to-all-repos.ts

@@ -18,7 +18,6 @@ export async function addFileToAllRepos(
   for (const repository of repositories) {
     const file = new RepositoryFile(repository.name, name)
     file.content = content
-    file.overwrite_on_create = true
     if (!config.someResource(file)) {
       core.info(`Adding ${file.file} file to ${file.repository} repository`)
       config.addResource(file)

terraform/resources.tf

@@ -105,14 +105,14 @@ resource "github_branch_protection" "this" {
     for repository, repository_config in lookup(local.config, "repositories", {}) :
     {
       for pattern, config in lookup(repository_config, "branch_protection", {}) : lower("${repository}:${pattern}") => merge(config, {
-        pattern       = pattern
-        repository_id = github_repository.this[lower(repository)].node_id
+        pattern        = pattern
+        repository_key = lower(repository)
       })
     }
   ]...)
 
   pattern                         = each.value.pattern
-  repository_id                   = each.value.repository_id
+  repository_id                   = github_repository.this[each.value.repository_key].node_id
   allows_deletions                = try(each.value.allows_deletions, null)
   allows_force_pushes             = try(each.value.allows_force_pushes, null)
   enforce_admins                  = try(each.value.enforce_admins, null)
@@ -139,10 +139,6 @@ resource "github_branch_protection" "this" {
       strict   = try(required_status_checks.value["strict"], null)
     }
   }
-
-  lifecycle {
-    ignore_changes = []
-  }
 }
 
 resource "github_team" "this" {
@@ -170,7 +166,7 @@ resource "github_team_repository" "this" {
       for permission, teams in lookup(repository_config, "teams", {}) : {
         for team in teams : lower("${team}:${repository}") => {
           repository = repository
-          team_id    = github_team.this[lower(team)].id
+          team_key   = lower(team)
           permission = permission
         }
       }
@@ -182,7 +178,7 @@ resource "github_team_repository" "this" {
   ]
 
   repository = each.value.repository
-  team_id    = each.value.team_id
+  team_id    = github_team.this[each.value.team_key].id
 
   permission = try(each.value.permission, null)
 
@@ -197,15 +193,15 @@ resource "github_team_membership" "this" {
     [
       for role, members in lookup(team_config, "members", {}) : {
         for member in members : lower("${team}:${member}") => {
-          team_id  = github_team.this[lower(team)].id
+          team_key = lower(team)
           username = member
           role     = role
         }
       }
     ]
   ])...)
 
-  team_id  = each.value.team_id
+  team_id  = github_team.this[each.value.team_key].id
   username = each.value.username
   role     = each.value.role
 
@@ -221,9 +217,9 @@ resource "github_repository_file" "this" {
       for config in [
         for file, config in lookup(repository_config, "files", {}) : merge(config, {
           repository = repository
-          file       = file
-          branch     = github_repository.this[lower(repository)].default_branch
-          content    = try(file("${path.module}/../files/${config.content}"), config.content)
+          file           = file
+          repository_key = lower(repository)
+          content        = try(file("${path.module}/../files/${config.content}"), config.content)
         }) if contains(keys(config), "content")
       ] : lower("${config.repository}/${config.file}") => config
     }
@@ -232,7 +228,7 @@ resource "github_repository_file" "this" {
   repository          = each.value.repository
   file                = each.value.file
   content             = each.value.content
-  branch              = each.value.branch
+  branch              = github_repository.this[each.value.repository_key].default_branch
   overwrite_on_create = try(each.value.overwrite_on_create, null)
   commit_message      = "chore: Update ${each.value.file} [skip ci]"
 

terraform/terraform.tf

@@ -6,5 +6,5 @@ terraform {
     }
   }
 
-  required_version = "~> 1.1.4"
+  required_version = "~> 1.3.7"
 }