Merge branch 'main' into feat/github-app-for-users

Author: nickfloyd

.github/labeler.yml

@@ -0,0 +1,56 @@
+# Configuration for labeler - https://github.com/actions/labeler
+"Type: Breaking change":
+  - head-branch: 
+    - '^breaking/'
+    - '^breaking-'
+
+"Type: Feature":
+  - head-branch: 
+    - '^feat/'
+    - '^feat-'
+    - '^feature/'
+    - '^feature-'
+
+"Type: Bug":
+  - head-branch: 
+    - '^fix/'
+    - '^fix-'
+    - '^bugfix/'
+    - '^bugfix-'
+    - '^bug/'
+    - '^bug-'
+
+"Deprecation":
+  - head-branch:
+    - '^deprecate/'
+    - '^deprecate-'
+    - '^deprecation/'
+    - '^deprecation-'
+
+"Type: Maintenance":
+  - head-branch: 
+    - '^chore/'
+    - '^chore-'
+    - '^maintenance/'
+    - '^maintenance-'
+    - '^maint/'
+    - '^maint-'
+    - '^deps/'
+    - '^deps-'
+    - '^dependencies/'
+    - '^dependencies-'
+  - changed-files:
+    - any-glob-to-any-file: 
+      - .github/workflows/**
+      - .github/labeler.yml
+      - .github/dependabot.yml
+      - .github/release.yml
+
+"Type: Documentation":
+  - head-branch:
+    - '^docs/'
+    - '^docs-'
+    - '^doc/'
+    - '^doc-'
+  - changed-files:
+    - any-glob-to-any-file: 'website/**'

.github/workflows/codeql.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   analyze:
-    name: Analyze
+    name: Analyze (${{ matrix.language }})
     runs-on: ubuntu-latest
     permissions:
       actions: read
@@ -21,27 +21,36 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'go' ]
+        include:
+        - language: actions
+          build-mode: none
+          queries: security-extended # can be 'default' (use empty for 'default'), 'security-and-quality', 'security-extended'
+        - language: go
+          build-mode: autobuild
+          queries: '' # will be used 'default' queries
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
+        if: matrix.language == 'go'
         with:
           go-version-file: 'go.mod'
           cache: true
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
+        uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
         with:
           languages: ${{ matrix.language }}
+          build-mode: ${{ matrix['build-mode'] }}
+          queries: ${{ matrix.queries }}
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
+        uses: github/codeql-action/autobuild@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
+        uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/immediate-response.yml

@@ -11,7 +11,9 @@ on:
       - opened
 jobs:
   respond-to-issue:
-    if: ${{ github.actor != 'dependabot[bot]' && github.actor != 'renovate[bot]' && github.actor != 'githubactions[bot]' && github.actor != 'octokitbot' }}
+    if: ${{ github.actor != 'dependabot[bot]' && github.actor != 'renovate[bot]' && 
+      github.actor != 'githubactions[bot]' && github.actor != 'octokitbot' && 
+      github.repository == 'integrations/terraform-provider-github' }}
     runs-on: ubuntu-latest
     steps:
       - name: Determine issue or PR number

.github/workflows/labeler.yml

@@ -0,0 +1,18 @@
+name: Pull Request Labeler
+
+on:
+  pull_request_target:
+    types: [opened, synchronize, reopened]
+
+permissions:
+  contents: read
+  pull-requests: write # Use this if all labels already exist in the repository (i.e., pre-defined in .github/labeler.yml).
+
+jobs:
+  labeler:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run Labeler
+        uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b # v6.0.1
+        with:
+          sync-labels: true # Whether or not to remove labels when matching files are reverted or no longer changed by the PR

github/resource_github_branch_default.go

@@ -50,8 +50,7 @@ func resourceGithubBranchDefault() *schema.Resource {
 	}
 }
 
-func resourceGithubBranchDefaultCreate(d *schema.ResourceData, meta interface{}) error {
-
+func resourceGithubBranchDefaultCreate(d *schema.ResourceData, meta any) error {
 	client := meta.(*Owner).v3client
 	owner := meta.(*Owner).name
 	repoName := d.Get("repository").(string)
@@ -60,21 +59,24 @@ func resourceGithubBranchDefaultCreate(d *schema.ResourceData, meta interface{})
 
 	ctx := context.Background()
 
-	if rename {
-		repository, _, err := client.Repositories.Get(ctx, owner, repoName)
-		if err != nil {
-			return err
-		}
-		if _, _, err := client.Repositories.RenameBranch(ctx, owner, repoName, *repository.DefaultBranch, defaultBranch); err != nil {
-			return err
-		}
-	} else {
-		repository := &github.Repository{
-			DefaultBranch: &defaultBranch,
-		}
+	repository, _, err := client.Repositories.Get(ctx, owner, repoName)
+	if err != nil {
+		return err
+	}
 
-		if _, _, err := client.Repositories.Edit(ctx, owner, repoName, repository); err != nil {
-			return err
+	if *repository.DefaultBranch != defaultBranch {
+		if rename {
+			if _, _, err := client.Repositories.RenameBranch(ctx, owner, repoName, *repository.DefaultBranch, defaultBranch); err != nil {
+				return err
+			}
+		} else {
+			repository := &github.Repository{
+				DefaultBranch: &defaultBranch,
+			}
+
+			if _, _, err := client.Repositories.Edit(ctx, owner, repoName, repository); err != nil {
+				return err
+			}
 		}
 	}
 
@@ -83,8 +85,7 @@ func resourceGithubBranchDefaultCreate(d *schema.ResourceData, meta interface{})
 	return resourceGithubBranchDefaultRead(d, meta)
 }
 
-func resourceGithubBranchDefaultRead(d *schema.ResourceData, meta interface{}) error {
-
+func resourceGithubBranchDefaultRead(d *schema.ResourceData, meta any) error {
 	client := meta.(*Owner).v3client
 	owner := meta.(*Owner).name
 	repoName := d.Id()
@@ -121,8 +122,7 @@ func resourceGithubBranchDefaultRead(d *schema.ResourceData, meta interface{}) e
 	return nil
 }
 
-func resourceGithubBranchDefaultDelete(d *schema.ResourceData, meta interface{}) error {
-
+func resourceGithubBranchDefaultDelete(d *schema.ResourceData, meta any) error {
 	client := meta.(*Owner).v3client
 	owner := meta.(*Owner).name
 	repoName := d.Id()
@@ -137,8 +137,7 @@ func resourceGithubBranchDefaultDelete(d *schema.ResourceData, meta interface{})
 	return err
 }
 
-func resourceGithubBranchDefaultUpdate(d *schema.ResourceData, meta interface{}) error {
-
+func resourceGithubBranchDefaultUpdate(d *schema.ResourceData, meta any) error {
 	client := meta.(*Owner).v3client
 	owner := meta.(*Owner).name
 	repoName := d.Id()

github/resource_github_branch_default_test.go

@@ -9,11 +9,9 @@ import (
 )
 
 func TestAccGithubBranchDefault(t *testing.T) {
-
 	randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
 
 	t.Run("creates and manages branch defaults", func(t *testing.T) {
-
 		config := fmt.Sprintf(`
 
 			resource "github_repository" "test" {
@@ -62,22 +60,20 @@ func TestAccGithubBranchDefault(t *testing.T) {
 		t.Run("with an organization account", func(t *testing.T) {
 			testCase(t, organization)
 		})
-
 	})
 
 	t.Run("replaces the default_branch of a repository", func(t *testing.T) {
-
 		config := fmt.Sprintf(`
 			resource "github_repository" "test" {
 				name      = "tf-acc-test-%s"
 				auto_init = true
 			}
-			
+
 			resource "github_branch" "test" {
 				repository = github_repository.test.name
 				branch     = "test"
 			}
-			  
+
 			resource "github_branch_default" "test"{
 				repository = github_repository.test.name
 				branch     = github_branch.test.branch
@@ -116,17 +112,67 @@ func TestAccGithubBranchDefault(t *testing.T) {
 		t.Run("with an organization account", func(t *testing.T) {
 			testCase(t, organization)
 		})
+	})
+
+	t.Run("creates and manages branch defaults even if rename is set", func(t *testing.T) {
+		config := fmt.Sprintf(`
+
+			resource "github_repository" "test" {
+				name      = "tf-acc-test-%s"
+				auto_init = true
+			}
+
+			resource "github_branch_default" "test" {
+				repository     = github_repository.test.name
+				branch         = "main"
+				rename         = true
+			}
+		`, randomID)
+
+		check := resource.ComposeTestCheckFunc(
+			resource.TestCheckResourceAttr(
+				"github_branch_default.test", "branch",
+				"main",
+			),
+			resource.TestCheckResourceAttr(
+				"github_branch_default.test", "repository",
+				fmt.Sprintf("tf-acc-test-%s", randomID),
+			),
+		)
+
+		testCase := func(t *testing.T, mode string) {
+			resource.Test(t, resource.TestCase{
+				PreCheck:  func() { skipUnlessMode(t, mode) },
+				Providers: testAccProviders,
+				Steps: []resource.TestStep{
+					{
+						Config: config,
+						Check:  check,
+					},
+				},
+			})
+		}
+
+		t.Run("with an anonymous account", func(t *testing.T) {
+			t.Skip("anonymous account not supported for this operation")
+		})
+
+		t.Run("with an individual account", func(t *testing.T) {
+			testCase(t, individual)
+		})
 
+		t.Run("with an organization account", func(t *testing.T) {
+			testCase(t, organization)
+		})
 	})
 
 	t.Run("replaces the default_branch of a repository without creating a branch resource prior to", func(t *testing.T) {
-
 		config := fmt.Sprintf(`
 			resource "github_repository" "test" {
 				name      = "tf-acc-test-%s"
 				auto_init = true
 			}
-			
+
 			resource "github_branch_default" "test"{
 				repository = github_repository.test.name
 				branch     = "development"
@@ -166,6 +212,5 @@ func TestAccGithubBranchDefault(t *testing.T) {
 		t.Run("with an organization account", func(t *testing.T) {
 			testCase(t, organization)
 		})
-
 	})
 }

github/resource_github_repository_collaborator.go

@@ -196,14 +196,14 @@ func resourceGithubRepositoryCollaboratorDelete(d *schema.ResourceData, meta int
 	// Delete any pending invitations
 	invitation, err := findRepoInvitation(client, ctx, owner, repoNameWithoutOwner, username)
 	if err != nil {
-		return err
+		return handleArchivedRepoDelete(err, "repository collaborator invitation", username, owner, repoNameWithoutOwner)
 	} else if invitation != nil {
 		_, err = client.Repositories.DeleteInvitation(ctx, owner, repoNameWithoutOwner, invitation.GetID())
-		return err
+		return handleArchivedRepoDelete(err, "repository collaborator invitation", username, owner, repoNameWithoutOwner)
 	}
 
 	_, err = client.Repositories.RemoveCollaborator(ctx, owner, repoNameWithoutOwner, username)
-	return err
+	return handleArchivedRepoDelete(err, "repository collaborator", username, owner, repoNameWithoutOwner)
 }
 
 func findRepoInvitation(client *github.Client, ctx context.Context, owner, repo, collaborator string) (*github.RepositoryInvitation, error) {