Merge branch 'master' into js-multiformats-codeowners

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

.github/actions/git-config-user/action.yml

@@ -4,7 +4,13 @@ description: Configure git user
 runs:
   using: composite
   steps:
-    - run: |
+    - if: github.event_name == 'workflow_dispatch'
+      run: |
         git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com>"
         git config --global user.name "${GITHUB_ACTOR}"
       shell: bash
+    - if: github.event_name != 'workflow_dispatch'
+      run: |
+        git config --global user.name "github-actions[bot]"
+        git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+      shell: bash

.github/workflows/apply.yml

@@ -70,6 +70,7 @@ jobs:
         uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3
         with:
           terraform_version: 1.2.9
+          terraform_wrapper: false
       - name: Initialize terraform
         run: terraform init
       - name: Terraform Plan Download
@@ -78,4 +79,6 @@ jobs:
           SHA: ${{ needs.prepare.outputs.sha }}
         run: gh run download -n "${TF_WORKSPACE}_${SHA}.tfplan" --repo "${GITHUB_REPOSITORY}"
       - name: Terraform Apply
-        run: terraform apply -lock-timeout=0s -no-color "${TF_WORKSPACE}.tfplan"
+        run: |
+          terraform show -json > $TF_WORKSPACE.tfstate.json
+          terraform apply -lock-timeout=0s -no-color "${TF_WORKSPACE}.tfplan"

.github/workflows/fix.yml

@@ -97,13 +97,15 @@ jobs:
         uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3
         with:
           terraform_version: 1.2.9
+          terraform_wrapper: false
       - name: Initialize terraform
         run: terraform init
         working-directory: terraform
       - name: Initialize scripts
         run: npm ci && npm run build
         working-directory: scripts
       - name: Fix
+        id: fix
         run: node lib/actions/fix-yaml-config.js
         working-directory: scripts
       - name: Upload YAML config
@@ -113,6 +115,15 @@ jobs:
           path: github/${{ env.TF_WORKSPACE }}.yml
           if-no-files-found: error
           retention-days: 1
+      # NOTE(galargh, 2024-02-15): This will only work if GitHub as Code is used for a single organization
+      - name: Comment on pull request
+        if: github.event_name == 'pull_request_target' && steps.fix.outputs.comment
+        uses: marocchino/sticky-pull-request-comment@fcf6fe9e4a0409cd9316a5011435be0f3327f1e1 # v2.3.1
+        with:
+          header: fix
+          number: ${{ github.event.pull_request.number }}
+          message: ${{ steps.fix.outputs.comment }}
+
   push:
     needs: [prepare, fix]
     permissions:

.github/workflows/plan.yml

@@ -83,11 +83,14 @@ jobs:
         uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3
         with:
           terraform_version: 1.2.9
+          terraform_wrapper: false
       - name: Initialize terraform
         run: terraform init
         working-directory: terraform
       - name: Plan terraform
-        run: terraform plan -refresh=false -lock=false -out="${TF_WORKSPACE}.tfplan" -no-color
+        run: |
+          terraform show -json > $TF_WORKSPACE.tfstate.json
+          terraform plan -refresh=false -lock=false -out="${TF_WORKSPACE}.tfplan" -no-color
         working-directory: terraform
       - name: Upload terraform plan
         uses: actions/upload-artifact@v3
@@ -156,6 +159,7 @@ jobs:
       - name: Comment on pull request
         uses: marocchino/sticky-pull-request-comment@fcf6fe9e4a0409cd9316a5011435be0f3327f1e1 # v2.3.1
         with:
+          header: plan
           number: ${{ github.event.pull_request.number }}
           message: |
             Before merge, verify that all the following plans are correct. They will be applied as-is after the merge.

.github/workflows/upgrade.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   upgrade:
-    uses: protocol/github-mgmt-template/.github/workflows/upgrade_reusable.yml@master
+    uses: pl-strflt/github-mgmt-template/.github/workflows/upgrade_reusable.yml@master
     with:
       ref: inputs.ref
     secrets:

docs/EXAMPLE.yml

@@ -74,7 +74,7 @@ repositories: # This group defines repositories (https://registry.terraform.io/p
     default_branch: master
     delete_branch_on_merge: false
     description: GitHub Management
-    homepage_url: https://github.com/protocol/github-mgmt-template
+    homepage_url: https://github.com/pl-strflt/github-mgmt-template
     is_template: false
     vulnerability_alerts: false
     archive_on_destroy: true
@@ -87,7 +87,7 @@ repositories: # This group defines repositories (https://registry.terraform.io/p
         branch: master
         path: /docs
     template:
-      owner: protocol
+      owner: pl-strflt
       repository: github-mgmt-template
     topics:
       - github

docs/HOWTOS.md

@@ -11,7 +11,7 @@
 
 *Example*
 
-I want to invite `galargh` as an admin to `protocol` organization through GitHub Management.
+I want to invite `galargh` as an admin to `pl-strflt` organization through GitHub Management.
 
 I ensure the YAML configuration file has the following entry:
 ```yaml
@@ -29,7 +29,7 @@ I push my changes to a new branch and create a PR. An admin reviews the PR and m
 
 *Example*
 
-I want to demote `galargh` from being an `admin` of `protocol` organization to a regular `member` through GitHub Management.
+I want to demote `galargh` from being an `admin` of `pl-strflt` organization to a regular `member` through GitHub Management.
 
 I change the entry for `galargh` in the YAML configuration file from:
 ```yaml
@@ -54,7 +54,7 @@ I push my changes to a new branch and create a PR. An admin reviews the PR and m
 
 *Example*
 
-I want to be able to configure who the member of the `protocol` organization is through GitHub Management.
+I want to be able to configure who the member of the `pl-strflt` organization is through GitHub Management.
 
 I add `github_membership` to `resource_types` array in [terraform/locals_override.tf](../terraform/locals_override.tf). I push my changes to a new branch and create a PR. An admin reviews the PR and merges the PR if everything looks OK. Then, they synchronize GitHub Management with GitHub configuration.
 
@@ -67,7 +67,7 @@ I add `github_membership` to `resource_types` array in [terraform/locals_overrid
 
 *Example*
 
-I do not want to configure the roles of `protocol` organization members through GitHub Management anymore.
+I do not want to configure the roles of `pl-strflt` organization members through GitHub Management anymore.
 
 I ensure that `terraform/resources_override.tf` contains the following entry:
 ```tf