Merge branch 'main' into feature/deployment-policy-tag-pattern

Author: nickfloyd

.github/release.yml

@@ -0,0 +1,34 @@
+# https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes#configuring-automatically-generated-release-notes
+
+changelog:
+  categories:
+    - title: 💥 Breaking Changes
+      labels:
+        - "Type: Breaking change"
+
+    - title: 🚀 New Features
+      labels:
+        - "Type: Feature"
+        - "New data source"
+        - "New resource"
+
+    - title: 🐛 Bugfixes
+      labels:
+        - "Type: Bug"
+
+    - title: 🪦 Deprecations
+      labels:
+        - "Deprecation"
+
+    - title: 🛠️ Maintenance
+      labels:
+        - "Type: Maintenance"
+        - "dependencies"
+
+    - title: 📝 Documentation
+      labels:
+        - "Type: Documentation"
+
+    - title: 🏷 Other Changes
+      labels:
+        - "*"

.github/workflows/add_to_octokit_project.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
-      - uses: actions/add-to-project@v0.5.0
+      - uses: actions/add-to-project@v0.6.0
         with:
           project-url: https://github.com/orgs/octokit/projects/10
           github-token: ${{ secrets.OCTOKITBOT_PROJECT_ACTION_TOKEN }}

github/data_source_github_enterprise.go

@@ -12,6 +12,10 @@ func dataSourceGithubEnterprise() *schema.Resource {
 	return &schema.Resource{
 		Read: dataSourceGithubEnterpriseRead,
 		Schema: map[string]*schema.Schema{
+			"database_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
 			"slug": {
 				Type:     schema.TypeString,
 				Required: true,
@@ -40,6 +44,7 @@ func dataSourceGithubEnterpriseRead(data *schema.ResourceData, meta interface{})
 	var query struct {
 		Enterprise struct {
 			ID          githubv4.String
+			DatabaseId  githubv4.Int
 			Name        githubv4.String
 			Description githubv4.String
 			CreatedAt   githubv4.String
@@ -76,6 +81,10 @@ func dataSourceGithubEnterpriseRead(data *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
+	err = data.Set("database_id", query.Enterprise.DatabaseId)
+	if err != nil {
+		return err
+	}
 
 	return nil
 }

github/data_source_github_repositories.go

@@ -32,7 +32,7 @@ func dataSourceGithubRepositories() *schema.Resource {
 				Type:             schema.TypeInt,
 				Optional:         true,
 				Default:          100,
-				ValidateDiagFunc: toDiagFunc(validation.IntBetween(0, 100), "results_per_page"),
+				ValidateDiagFunc: toDiagFunc(validation.IntBetween(0, 1000), "results_per_page"),
 			},
 			"full_names": {
 				Type: schema.TypeList,

github/data_source_github_rest_api.go

@@ -3,6 +3,7 @@ package github
 import (
 	"context"
 	"encoding/json"
+	"io"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -43,21 +44,22 @@ func dataSourceGithubRestApiRead(d *schema.ResourceData, meta interface{}) error
 	client := meta.(*Owner).v3client
 	ctx := context.Background()
 
-	var body map[string]interface{}
-
 	req, err := client.NewRequest("GET", u, nil)
 	if err != nil {
 		return err
 	}
 
-	resp, _ := client.Do(ctx, req, &body)
+	resp, err := client.Do(ctx, req, nil)
+	if err != nil && resp.StatusCode != 404 {
+		return err
+	}
 
 	h, err := json.Marshal(resp.Header)
 	if err != nil {
 		return err
 	}
 
-	b, err := json.Marshal(body)
+	b, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return err
 	}

github/data_source_github_rest_api_test.go

@@ -3,6 +3,7 @@ package github
 import (
 	"fmt"
 	"regexp"
+	"strings"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
@@ -33,7 +34,7 @@ func TestAccGithubRestApiDataSource(t *testing.T) {
 			resource.TestMatchResourceAttr(
 				"data.github_rest_api.test", "status", regexp.MustCompile("200 OK"),
 			),
-			resource.TestCheckResourceAttrSet("data.github_rest_api.test", "body"),
+			resource.TestMatchResourceAttr("data.github_rest_api.test", "body", regexp.MustCompile(".*refs/heads/.*")),
 			resource.TestCheckResourceAttrSet("data.github_rest_api.test", "headers"),
 		)
 
@@ -64,6 +65,50 @@ func TestAccGithubRestApiDataSource(t *testing.T) {
 
 	})
 
+	t.Run("queries a collection without error", func(t *testing.T) {
+
+		config := fmt.Sprintf(`
+			resource "github_repository" "test" {
+			  name = "tf-acc-test-%[1]s"
+				auto_init = true
+			}
+
+			data "github_rest_api" "test" {
+				endpoint = "repos/${github_repository.test.full_name}/git/refs/heads/"
+			}
+		`, randomID)
+
+		check := resource.ComposeTestCheckFunc(
+			resource.TestMatchResourceAttr("data.github_rest_api.test", "body", regexp.MustCompile(`\[.*refs/heads/.*\]`)),
+		)
+
+		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("queries an invalid branch without error", func(t *testing.T) {
 
 		config := fmt.Sprintf(`
@@ -114,4 +159,41 @@ func TestAccGithubRestApiDataSource(t *testing.T) {
 		})
 
 	})
+
+	t.Run("fails for invalid endpoint", func(t *testing.T) {
+
+		// 4096 characters is the maximum length for a URL
+		var endpoint = strings.Repeat("x", 4096)
+		config := fmt.Sprintf(`
+			data "github_rest_api" "test" {
+				endpoint = "/%v"
+			}
+		`, endpoint)
+
+		testCase := func(t *testing.T, mode string) {
+			resource.Test(t, resource.TestCase{
+				PreCheck:  func() { skipUnlessMode(t, mode) },
+				Providers: testAccProviders,
+				Steps: []resource.TestStep{
+					{
+						Config:      config,
+						ExpectError: regexp.MustCompile("Error: GET https://api.github.com/xx.*: 414"),
+					},
+				},
+			})
+		}
+
+		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)
+		})
+
+	})
 }

github/provider.go

@@ -125,6 +125,7 @@ func Provider() *schema.Provider {
 		},
 
 		ResourcesMap: map[string]*schema.Resource{
+			"github_enterprise_actions_permissions":                                 resourceGithubActionsEnterprisePermissions(),
 			"github_actions_environment_secret":                                     resourceGithubActionsEnvironmentSecret(),
 			"github_actions_environment_variable":                                   resourceGithubActionsEnvironmentVariable(),
 			"github_actions_organization_oidc_subject_claim_customization_template": resourceGithubActionsOrganizationOIDCSubjectClaimCustomizationTemplate(),
@@ -193,6 +194,7 @@ func Provider() *schema.Provider {
 			"github_user_invitation_accepter":                                       resourceGithubUserInvitationAccepter(),
 			"github_user_ssh_key":                                                   resourceGithubUserSshKey(),
 			"github_enterprise_organization":                                        resourceGithubEnterpriseOrganization(),
+			"github_enterprise_actions_runner_group":                                resourceGithubActionsEnterpriseRunnerGroup(),
 		},
 
 		DataSourcesMap: map[string]*schema.Resource{

github/repository_utils.go

@@ -98,7 +98,7 @@ func getAutolinkByKeyPrefix(client *github.Client, owner, repo, keyPrefix string
 		}
 	}
 
-	return nil, nil
+	return nil, fmt.Errorf("cannot find autolink reference %s in repo %s/%s", keyPrefix, owner, repo)
 }
 
 // listAutolinks returns all autolink references for the given repository.

github/resource_github_actions_organization_permissions.go

@@ -209,9 +209,14 @@ func resourceGithubActionsOrganizationPermissionsRead(d *schema.ResourceData, me
 	// only load and fill allowed_actions_config if allowed_actions_config is also set
 	// in the TF code. (see #2105)
 	// on initial import there might not be any value in the state, then we have to import the data
+	// -> but we can only load an existing state if the current config is set to "selected" (see #2182)
 	allowedActions := d.Get("allowed_actions").(string)
 	allowedActionsConfig := d.Get("allowed_actions_config").([]interface{})
-	if (allowedActions == "selected" && len(allowedActionsConfig) > 0) || allowedActions == "" {
+
+	serverHasAllowedActionsConfig := actionsPermissions.GetAllowedActions() == "selected"
+	userWantsAllowedActionsConfig := (allowedActions == "selected" && len(allowedActionsConfig) > 0) || allowedActions == ""
+
+	if serverHasAllowedActionsConfig && userWantsAllowedActionsConfig {
 		actionsAllowed, _, err := client.Actions.GetActionsAllowed(ctx, d.Id())
 		if err != nil {
 			return err

github/resource_github_actions_repository_permissions.go

@@ -172,9 +172,14 @@ func resourceGithubActionsRepositoryPermissionsRead(d *schema.ResourceData, meta
 	// only load and fill allowed_actions_config if allowed_actions_config is also set
 	// in the TF code. (see #2105)
 	// on initial import there might not be any value in the state, then we have to import the data
+	// -> but we can only load an existing state if the current config is set to "selected" (see #2182)
 	allowedActions := d.Get("allowed_actions").(string)
 	allowedActionsConfig := d.Get("allowed_actions_config").([]interface{})
-	if (allowedActions == "selected" && len(allowedActionsConfig) > 0) || allowedActions == "" {
+
+	serverHasAllowedActionsConfig := actionsPermissions.GetAllowedActions() == "selected" && actionsPermissions.GetEnabled()
+	userWantsAllowedActionsConfig := (allowedActions == "selected" && len(allowedActionsConfig) > 0) || allowedActions == ""
+
+	if serverHasAllowedActionsConfig && userWantsAllowedActionsConfig {
 		actionsAllowed, _, err := client.Repositories.GetActionsAllowed(ctx, owner, repoName)
 		if err != nil {
 			return err