Merge branch 'integrations:main' into repository-page-visibility

Author: BartolottiLuca

.github/workflows/release.yaml

@@ -41,7 +41,7 @@ jobs:
           cache: true
 
       - name: Install Syft
-        uses: anchore/sbom-action/download-syft@a930d0ac434e3182448fe678398ba5713717112a # v0.21.0
+        uses: anchore/sbom-action/download-syft@0b82b0b1a22399a1c542d4d656f70cd903571b5c # v0.21.1
 
       - name: Install Cosign
         uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0

CONTRIBUTING.md

@@ -78,11 +78,11 @@ If a full debugger is desired, VSCode may be used. In order to do so,
 
 ```json
 {
-	"name": "Attach to Process",
-	"type": "go",
-	"request": "attach",
-	"mode": "local",
-	"processId": 0,
+ "name": "Attach to Process",
+ "type": "go",
+ "request": "attach",
+ "mode": "local",
+ "processId": 0,
 }
 ```
 
@@ -165,7 +165,7 @@ export GITHUB_TOKEN=
 # Configure user level values
 export GH_TEST_USER_REPOSITORY=
 
-# Configure for the org under test
+# Configure values for the organization under test
 export GH_TEST_ORG_USER=
 export GH_TEST_ORG_SECRET_NAME=
 export GH_TEST_ORG_REPOSITORY=
@@ -177,6 +177,9 @@ export GH_TEST_EXTERNAL_USER=
 export GH_TEST_EXTERNAL_USER_TOKEN=
 export GH_TEST_EXTERNAL_USER2=
 
+# Configure values for the enterprise under test
+export GH_TEST_ENTERPRISE_EMU_GROUP_ID=
+
 # Configure test options
 export GH_TEST_ADVANCED_SECURITY=
 ```

github/acc_test.go

@@ -68,6 +68,9 @@ type testAccConfig struct {
 	testExternalUserToken string
 	testExternalUser2     string
 
+	// Enterprise test configuration
+	testEnterpriseEMUGroupId int
+
 	// Test options
 	testAdvancedSecurity bool
 }
@@ -149,6 +152,11 @@ func TestMain(m *testing.M) {
 			fmt.Println("GITHUB_ENTERPRISE_SLUG environment variable not set")
 			os.Exit(1)
 		}
+
+		i, err := strconv.Atoi(os.Getenv("GH_TEST_ENTERPRISE_EMU_GROUP_ID"))
+		if err == nil {
+			config.testEnterpriseEMUGroupId = i
+		}
 	}
 
 	i, err := strconv.Atoi(os.Getenv("GH_TEST_ORG_APP_INSTALLATION_ID"))

github/data_source_github_actions_environment_public_key.go

@@ -4,12 +4,13 @@ import (
 	"context"
 	"net/url"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func dataSourceGithubActionsEnvironmentPublicKey() *schema.Resource {
 	return &schema.Resource{
-		Read: dataSourceGithubActionsEnvironmentPublicKeyRead,
+		ReadContext: dataSourceGithubActionsEnvironmentPublicKeyRead,
 
 		Schema: map[string]*schema.Schema{
 			"repository": {
@@ -32,33 +33,29 @@ func dataSourceGithubActionsEnvironmentPublicKey() *schema.Resource {
 	}
 }
 
-func dataSourceGithubActionsEnvironmentPublicKeyRead(d *schema.ResourceData, meta any) error {
-	ctx := context.Background()
+func dataSourceGithubActionsEnvironmentPublicKeyRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	client := meta.(*Owner).v3client
 	owner := meta.(*Owner).name
 	repository := d.Get("repository").(string)
 
 	envName := d.Get("environment").(string)
-	escapedEnvName := url.PathEscape(envName)
 
 	repo, _, err := client.Repositories.Get(ctx, owner, repository)
 	if err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 
-	publicKey, _, err := client.Actions.GetEnvPublicKey(ctx, int(repo.GetID()), escapedEnvName)
+	publicKey, _, err := client.Actions.GetEnvPublicKey(ctx, int(repo.GetID()), url.PathEscape(envName))
 	if err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 
 	d.SetId(publicKey.GetKeyID())
-	err = d.Set("key_id", publicKey.GetKeyID())
-	if err != nil {
-		return err
+	if err := d.Set("key_id", publicKey.GetKeyID()); err != nil {
+		return diag.FromErr(err)
 	}
-	err = d.Set("key", publicKey.GetKey())
-	if err != nil {
-		return err
+	if err := d.Set("key", publicKey.GetKey()); err != nil {
+		return diag.FromErr(err)
 	}
 
 	return nil

github/data_source_github_actions_environment_secrets.go

@@ -2,17 +2,17 @@ package github
 
 import (
 	"context"
-	"fmt"
 	"net/url"
 
 	"github.com/google/go-github/v81/github"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func dataSourceGithubActionsEnvironmentSecrets() *schema.Resource {
 	return &schema.Resource{
-		Read: dataSourceGithubActionsEnvironmentSecretsRead,
+		ReadContext: dataSourceGithubActionsEnvironmentSecretsRead,
 
 		Schema: map[string]*schema.Schema{
 			"full_name": {
@@ -55,20 +55,18 @@ func dataSourceGithubActionsEnvironmentSecrets() *schema.Resource {
 	}
 }
 
-func dataSourceGithubActionsEnvironmentSecretsRead(d *schema.ResourceData, meta any) error {
-	ctx := context.Background()
+func dataSourceGithubActionsEnvironmentSecretsRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	client := meta.(*Owner).v3client
 	owner := meta.(*Owner).name
 	var repoName string
 
 	envName := d.Get("environment").(string)
-	escapedEnvName := url.PathEscape(envName)
 
 	if fullName, ok := d.GetOk("full_name"); ok {
 		var err error
 		owner, repoName, err = splitRepoFullName(fullName.(string))
 		if err != nil {
-			return err
+			return diag.FromErr(err)
 		}
 	}
 
@@ -77,23 +75,23 @@ func dataSourceGithubActionsEnvironmentSecretsRead(d *schema.ResourceData, meta
 	}
 
 	if repoName == "" {
-		return fmt.Errorf("one of %q or %q has to be provided", "full_name", "name")
+		return diag.Errorf("one of %q or %q has to be provided", "full_name", "name")
 	}
 
 	repo, _, err := client.Repositories.Get(ctx, owner, repoName)
 	if err != nil {
-		return err
+		return diag.FromErr(err)
 	}
 
 	options := github.ListOptions{
-		PerPage: 100,
+		PerPage: maxPerPage,
 	}
 
 	var all_secrets []map[string]string
 	for {
-		secrets, resp, err := client.Actions.ListEnvSecrets(ctx, int(repo.GetID()), escapedEnvName, &options)
+		secrets, resp, err := client.Actions.ListEnvSecrets(ctx, int(repo.GetID()), url.PathEscape(envName), &options)
 		if err != nil {
-			return err
+			return diag.FromErr(err)
 		}
 		for _, secret := range secrets.Secrets {
 			new_secret := map[string]string{
@@ -109,8 +107,15 @@ func dataSourceGithubActionsEnvironmentSecretsRead(d *schema.ResourceData, meta
 		options.Page = resp.NextPage
 	}
 
-	d.SetId(buildTwoPartID(repoName, envName))
-	_ = d.Set("secrets", all_secrets)
+	if id, err := buildID(repoName, escapeIDPart(envName)); err != nil {
+		return diag.FromErr(err)
+	} else {
+		d.SetId(id)
+	}
+
+	if err := d.Set("secrets", all_secrets); err != nil {
+		return diag.FromErr(err)
+	}
 
 	return nil
 }

github/data_source_github_actions_environment_secrets_test.go

@@ -15,19 +15,18 @@ func TestAccGithubActionsEnvironmentSecretsDataSource(t *testing.T) {
 
 		config := fmt.Sprintf(`
 			resource "github_repository" "test" {
-				name      = "%s"
-				auto_init = true
+				name = "%s"
 			}
 
 			resource "github_repository_environment" "test" {
-				repository       = github_repository.test.name
-				environment      = "environment / test"
+				repository  = github_repository.test.name
+				environment = "environment / test"
 			  }
 
 			resource "github_actions_environment_secret" "test" {
-				secret_name 		= "secret_1"
-				environment      	= github_repository_environment.test.environment
-				repository  		= github_repository.test.name
+				repository      = github_repository.test.name
+				environment     = github_repository_environment.test.environment
+				secret_name     = "secret_1"
 				plaintext_value = "foo"
 			}
 		`, repoName)

github/data_source_github_actions_environment_variables.go

@@ -2,17 +2,17 @@ package github
 
 import (
 	"context"
-	"fmt"
 	"net/url"
 
 	"github.com/google/go-github/v81/github"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func dataSourceGithubActionsEnvironmentVariables() *schema.Resource {
 	return &schema.Resource{
-		Read: dataSourceGithubActionsEnvironmentVariablesRead,
+		ReadContext: dataSourceGithubActionsEnvironmentVariablesRead,
 
 		Schema: map[string]*schema.Schema{
 			"full_name": {
@@ -59,20 +59,18 @@ func dataSourceGithubActionsEnvironmentVariables() *schema.Resource {
 	}
 }
 
-func dataSourceGithubActionsEnvironmentVariablesRead(d *schema.ResourceData, meta any) error {
-	ctx := context.Background()
+func dataSourceGithubActionsEnvironmentVariablesRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	client := meta.(*Owner).v3client
 	owner := meta.(*Owner).name
 	var repoName string
 
 	envName := d.Get("environment").(string)
-	escapedEnvName := url.PathEscape(envName)
 
 	if fullName, ok := d.GetOk("full_name"); ok {
 		var err error
 		owner, repoName, err = splitRepoFullName(fullName.(string))
 		if err != nil {
-			return err
+			return diag.FromErr(err)
 		}
 	}
 
@@ -81,18 +79,18 @@ func dataSourceGithubActionsEnvironmentVariablesRead(d *schema.ResourceData, met
 	}
 
 	if repoName == "" {
-		return fmt.Errorf("one of %q or %q has to be provided", "full_name", "name")
+		return diag.Errorf("one of %q or %q has to be provided", "full_name", "name")
 	}
 
 	options := github.ListOptions{
-		PerPage: 100,
+		PerPage: maxPerPage,
 	}
 
 	var all_variables []map[string]string
 	for {
-		variables, resp, err := client.Actions.ListEnvVariables(ctx, owner, repoName, escapedEnvName, &options)
+		variables, resp, err := client.Actions.ListEnvVariables(ctx, owner, repoName, url.PathEscape(envName), &options)
 		if err != nil {
-			return err
+			return diag.FromErr(err)
 		}
 		for _, variable := range variables.Variables {
 			new_variable := map[string]string{
@@ -109,8 +107,15 @@ func dataSourceGithubActionsEnvironmentVariablesRead(d *schema.ResourceData, met
 		options.Page = resp.NextPage
 	}
 
-	d.SetId(buildTwoPartID(repoName, envName))
-	_ = d.Set("variables", all_variables)
+	if id, err := buildID(repoName, escapeIDPart(envName)); err != nil {
+		return diag.FromErr(err)
+	} else {
+		d.SetId(id)
+	}
+
+	if err := d.Set("variables", all_variables); err != nil {
+		return diag.FromErr(err)
+	}
 
 	return nil
 }