Merge branch 'main' into terrabitz/fix-github-hosted-runner-image-import

Author: terrabitz

.github/ISSUE_TEMPLATE/bug.yml

@@ -7,7 +7,8 @@ body:
     attributes:
       value: |
         Hi there,
-        Thank you for opening an issue. Please note that we try to keep the Terraform issue tracker reserved for bug reports and feature requests. For general usage questions, please see: https://www.terraform.io/community.html.
+        Thank you for opening an issue. Please note that we try to keep the Terraform issue tracker reserved for bug reports and feature requests. 
+        For general usage questions, please see: https://github.com/integrations/terraform-provider-github/discussions.
 
   - type: textarea
     id: expected-behavior
@@ -31,9 +32,24 @@ body:
       label: Terraform Version
       description: Run `terraform -v` to show the version. If you are not running the latest version of Terraform, please upgrade because your issue may have already been fixed.
       placeholder: |
-        Terraform v1.2.3
+        Terraform vX.Y.Z
         on linux_amd64
-        + provider registry.terraform.io/integrations/github v5.32.0
+        + provider registry.terraform.io/integrations/github vX.Y.Z
+    validations:
+      required: true
+
+  - type: checkboxes
+    id: github-installation
+    attributes:
+      label: GitHub Installation Type
+      description: What type of GitHub installation are you using?
+      options:
+        - label: GitHub.com (Free, Pro, or Team)
+        - label: GitHub Enterprise Server (on-premises)
+        - label: GitHub Enterprise Cloud with Personal Accounts (github.com)
+        - label: GitHub Enterprise Cloud with Managed Users/EMU (github.com)
+        - label: GitHub Enterprise Cloud with Data Residency (*.ghe.com)
+        - label: I don't know
     validations:
       required: true
 
@@ -55,7 +71,7 @@ body:
       label: Terraform Configuration Files
       render: hcl
       description: |
-        Please copy and paste any relevant configration files. This will be automatically formatted into code, so no need for backticks.
+        Please copy and paste any relevant configuration files. This will be automatically formatted into code, so no need for backticks. If this configuration is inside a Module, please mention that.
         Please check your configuration before submission to ensure sensitive information is redacted.
     validations:
       required: false
@@ -64,7 +80,7 @@ body:
     id: steps-to-reproduce
     attributes:
       label: Steps to Reproduce
-      description: Please list the steps required to reproduce the issue.
+      description: Please list the steps required to reproduce the issue. Remember to mention any configuration outside of Terraform that could be relevant to the issue.
       placeholder: |
         ```
         $ terraform apply
@@ -78,17 +94,7 @@ body:
       label: Debug Output
       description: |
         Please copy and paste any relevant debug output. This will be automatically formatted into code, so no need for backticks.
-        Please check your logs before submission to ensure sensitive information is redacted.
-      render: shell
-    validations:
-      required: false
-
-  - type: textarea
-    id: panic-output
-    attributes:
-      label: Panic Output
-      description: |
-        Please copy and paste any relevant panic output. This will be automatically formatted into code, so no need for backticks.
+        Please run your `terraform` command with `TF_LOG=DEBUG` set, then copy and paste the output. This will be automatically formatted into code, so no need for backticks.
         Please check your logs before submission to ensure sensitive information is redacted.
       render: shell
     validations:

.github/ISSUE_TEMPLATE/documentation.yml

@@ -7,6 +7,7 @@ body:
     attributes:
       value: |
         Thanks for taking the time to fill this out!
+
   - type: textarea
     id: describe-need
     attributes:
@@ -15,22 +16,7 @@ body:
       placeholder: Describe the need for documentation updates here.
     validations:
       required: true
-  - type: input
-    id: sdk_version
-    attributes:
-      label: SDK Version
-      description: Do these docs apply to a specific SDK version?
-      placeholder: Octokit.NET v4.0.1
-    validations:
-      required: false
-  - type: input
-    id: api_version
-    attributes:
-      label: API Version
-      description: Do these docs apply to a specific version of the GitHub REST API or GraphQL API?
-      placeholder: ex. v1.1.1
-    validations:
-      required: false
+
   - type: textarea
     id: logs
     attributes:
@@ -39,6 +25,7 @@ body:
         Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
         Please check your logs before submission to ensure sensitive information is redacted.
       render: shell
+
   - type: checkboxes
     id: terms
     attributes:

.github/ISSUE_TEMPLATE/feature.yml

@@ -7,6 +7,7 @@ body:
     attributes:
       value: |
         Thanks for taking the time to fill this out!
+
   - type: textarea
     id: describe-need
     attributes:
@@ -15,22 +16,22 @@ body:
       placeholder: Describe the need for the feature.
     validations:
       required: true
-  - type: input
-    id: sdk_version
-    attributes:
-      label: SDK Version
-      description: Does this feature suggestion apply to a specific SDK version?
-      placeholder: Octokit.rb v6.0.0
-    validations:
-      required: false
-  - type: input
-    id: api_version
+
+  - type: checkboxes
+    id: github-installation
     attributes:
-      label: API Version
-      description: Does this feature suggestion apply to a specific version of the GitHub REST API or GraphQL API?
-      placeholder: ex. v1.1.1
+      label: GitHub Installation Type
+      description: What type of GitHub installation are you using?
+      options:
+        - label: GitHub.com (Free, Pro, or Team)
+        - label: GitHub Enterprise Server (on-premises)
+        - label: GitHub Enterprise Cloud with Personal Accounts (github.com)
+        - label: GitHub Enterprise Cloud with Managed Users/EMU (github.com)
+        - label: GitHub Enterprise Cloud with Data Residency (*.ghe.com)
+        - label: I don't know
     validations:
-      required: false
+      required: true
+
   - type: textarea
     id: logs
     attributes:
@@ -39,6 +40,7 @@ body:
         Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
         Please check your logs before submission to ensure sensitive information is redacted.
       render: shell
+
   - type: checkboxes
     id: terms
     attributes:

.github/ISSUE_TEMPLATE/maintenance.yml

@@ -7,6 +7,7 @@ body:
     attributes:
       value: |
         Thanks for taking the time to fill this out!
+ 
   - type: textarea
     id: describe-need
     attributes:
@@ -15,22 +16,7 @@ body:
       placeholder: Describe the maintenance need here.
     validations:
       required: true
-  - type: input
-    id: sdk_version
-    attributes:
-      label: SDK Version
-      description: Does this maintenance apply to a specific SDK version?
-      placeholder: terraform-provider-github v5.7.0
-    validations:
-      required: false
-  - type: input
-    id: api_version
-    attributes:
-      label: API Version
-      description: Does this maintenance apply to a specific version of the GitHub REST API or GraphQL API?
-      placeholder: ex. v1.1.1
-    validations:
-      required: false
+ 
   - type: textarea
     id: logs
     attributes:
@@ -39,6 +25,7 @@ body:
         Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
         Please check your logs before submission to ensure sensitive information is redacted.
       render: shell
+ 
   - type: checkboxes
     id: terms
     attributes:

.github/workflows/ci.yaml

@@ -33,10 +33,37 @@ jobs:
         with:
           go-version-file: go.mod
           cache: true
-      - run: make tools
-      - run: make build
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
+        with:
+          version: latest
+      - run: make build -o lintcheck # Stop running `make lintcheck` before build. Linting is handled separately
       - run: make test
 
+  lint-new:
+    name: Strict linting of new code
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request' || github.event_name == 'pull_request_target'
+    permissions:
+      contents: read
+      pull-requests: read
+    steps:
+      - name: Checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - name: Set-up Go
+        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        with:
+          go-version-file: go.mod
+          cache: true
+      - run: make .golangci.new.yml
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
+        with:
+          version: latest
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          only-new-issues: true
+          args: --config=.golangci.new.yml
+
   docs:
     name: Documentation
     runs-on: ubuntu-latest
@@ -54,13 +81,13 @@ jobs:
           go-version-file: go.mod
           cache: true
       - name: Set-up Terraform
-        uses: hashicorp/setup-terraform@5e8dbf3c6d9deaf4193ca7a8fb23f2ac83bb6c85 # v4.0.0
+        uses: hashicorp/setup-terraform@dfe3c3f87815947d99a8997f908cb6525fc44e9e # v4.0.1
         with:
           terraform_version: latest
           terraform_wrapper: false
       - run: make checkdocs
       - run: make validatedocs
-      - uses: rvben/rumdl@9a78b143c00cc273fa0636410b91ec9acde1004a # v0.1.90
+      - uses: rvben/rumdl@3cf0ff7193ebd32f6f158d1b668592390ceaa696 # v0.1.91
         with:
           path: ./docs
           report-type: annotations
@@ -70,6 +97,7 @@ jobs:
     needs:
       - ci
       - docs
+      - lint-new
     if: always()
     runs-on: ubuntu-latest
     defaults:

.github/workflows/codeql.yaml

@@ -49,7 +49,7 @@ jobs:
           cache: true
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
+        uses: github/codeql-action/init@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
         with:
           languages: ${{ matrix.language }}
           build-mode: ${{ matrix.build-mode }}
@@ -60,6 +60,6 @@ jobs:
         run: go build ./...
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
+        uses: github/codeql-action/analyze@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/dotcom-acceptance-tests.yaml

@@ -82,7 +82,7 @@ jobs:
           cache: true
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@5e8dbf3c6d9deaf4193ca7a8fb23f2ac83bb6c85 # v4.0.0
+        uses: hashicorp/setup-terraform@dfe3c3f87815947d99a8997f908cb6525fc44e9e # v4.0.1
         with:
           terraform_version: latest
           terraform_wrapper: false

.github/workflows/ghes-acceptance-tests.yaml

@@ -93,7 +93,7 @@ jobs:
           cache: true
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@5e8dbf3c6d9deaf4193ca7a8fb23f2ac83bb6c85 # v4.0.0
+        uses: hashicorp/setup-terraform@dfe3c3f87815947d99a8997f908cb6525fc44e9e # v4.0.1
         with:
           terraform_version: latest
           terraform_wrapper: false

.gitignore

@@ -30,6 +30,9 @@ testdata/
 website/vendor
 terraform-provider-github
 
+# Generated temporary files
+.golangci.new.yml
+
 # Test exclusions
 !command/test-fixtures/**/*.tfstate
 !command/test-fixtures/**/.terraform/

.golangci.strict.yml

@@ -0,0 +1,9 @@
+# These rules are enabled for any new code, but not for the whole codebase yet.
+# This file is for linting rules we want to start enforcing, but can't enable for the whole codebase yet.
+# Always add new rules to .golangci.yml first. If they cause too many issues to fix reasonably, add them here instead.
+# Once a rule in here has been fixed across the codebase, remove it from here and add it to .golangci.yml.
+version: "2"
+
+linters:
+  enable:
+    - forcetypeassert