Skip to content

fix: handle sha_pinning_required=false #3224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sheeeng wants to merge 1 commit into
base: main
Choose a base branch
from
+164 −4
Open

fix: handle sha_pinning_required=false #3224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions github/resource_github_actions_organization_permissions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ func resourceGithubActionsOrganizationPermissionsCreateOrUpdate(d *schema.Resour
EnabledRepositories: &enabledRepositories,
}

if v, ok := d.GetOk("sha_pinning_required"); ok {
actionsPermissions.SHAPinningRequired = github.Ptr(v.(bool))
if d.HasChange("sha_pinning_required") || d.IsNewResource() {
actionsPermissions.SHAPinningRequired = github.Ptr(d.Get("sha_pinning_required").(bool))
}

_, _, err = client.Actions.UpdateActionsPermissions(ctx,
Expand Down
70 changes: 70 additions & 0 deletions github/resource_github_actions_organization_permissions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,76 @@ func TestAccGithubActionsOrganizationPermissions(t *testing.T) {
})
})

t.Run("test setting sha_pinning_required to true", func(t *testing.T) {
enabledRepositories := "all"

config := fmt.Sprintf(`
resource "github_actions_organization_permissions" "test" {
allowed_actions = "all"
enabled_repositories = "%s"
sha_pinning_required = true
}
`, enabledRepositories)

resource.Test(t, resource.TestCase{
PreCheck: func() { skipUnlessHasOrgs(t) },
ProviderFactories: providerFactories,
Steps: []resource.TestStep{
{
Config: config,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(
"github_actions_organization_permissions.test", "sha_pinning_required", "true",
),
),
},
},
})
})

t.Run("test setting sha_pinning_required to false", func(t *testing.T) {
enabledRepositories := "all"

configTrue := fmt.Sprintf(`
resource "github_actions_organization_permissions" "test" {
allowed_actions = "all"
enabled_repositories = "%s"
sha_pinning_required = true
}
`, enabledRepositories)

configFalse := fmt.Sprintf(`
resource "github_actions_organization_permissions" "test" {
allowed_actions = "all"
enabled_repositories = "%s"
sha_pinning_required = false
}
`, enabledRepositories)

resource.Test(t, resource.TestCase{
PreCheck: func() { skipUnlessHasOrgs(t) },
ProviderFactories: providerFactories,
Steps: []resource.TestStep{
{
Config: configTrue,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(
"github_actions_organization_permissions.test", "sha_pinning_required", "true",
),
),
},
{
Config: configFalse,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(
"github_actions_organization_permissions.test", "sha_pinning_required", "false",
),
),
},
},
})
})

t.Run("test setting of organization allowed actions", func(t *testing.T) {
allowedActions := "selected"
enabledRepositories := "all"
Expand Down
4 changes: 2 additions & 2 deletions github/resource_github_actions_repository_permissions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ func resourceGithubActionsRepositoryPermissionsCreateOrUpdate(d *schema.Resource
repoActionPermissions.AllowedActions = &allowedActions
}

if v, ok := d.GetOk("sha_pinning_required"); ok {
repoActionPermissions.SHAPinningRequired = github.Ptr(v.(bool))
if d.HasChange("sha_pinning_required") || d.IsNewResource() {
repoActionPermissions.SHAPinningRequired = github.Ptr(d.Get("sha_pinning_required").(bool))
}

_, _, err := client.Repositories.UpdateActionsPermissions(ctx,
Expand Down
90 changes: 90 additions & 0 deletions github/resource_github_actions_repository_permissions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,96 @@ func TestAccGithubActionsRepositoryPermissions(t *testing.T) {
})
})

t.Run("test setting sha_pinning_required to true", func(t *testing.T) {
randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
repoName := fmt.Sprintf("%srepo-act-perms-%s", testResourcePrefix, randomID)

config := fmt.Sprintf(`
resource "github_repository" "test" {
name = "%[1]s"
description = "Terraform acceptance tests %[1]s"
topics = ["terraform", "testing"]
}

resource "github_actions_repository_permissions" "test" {
allowed_actions = "all"
repository = github_repository.test.name
sha_pinning_required = true
}
`, repoName)

resource.Test(t, resource.TestCase{
PreCheck: func() { skipUnauthenticated(t) },
ProviderFactories: providerFactories,
Steps: []resource.TestStep{
{
Config: config,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(
"github_actions_repository_permissions.test", "sha_pinning_required", "true",
),
),
},
},
})
})

t.Run("test setting sha_pinning_required to false", func(t *testing.T) {
randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
repoName := fmt.Sprintf("%srepo-act-perms-%s", testResourcePrefix, randomID)

configTrue := fmt.Sprintf(`
resource "github_repository" "test" {
name = "%[1]s"
description = "Terraform acceptance tests %[1]s"
topics = ["terraform", "testing"]
}

resource "github_actions_repository_permissions" "test" {
allowed_actions = "all"
repository = github_repository.test.name
sha_pinning_required = true
}
`, repoName)

configFalse := fmt.Sprintf(`
resource "github_repository" "test" {
name = "%[1]s"
description = "Terraform acceptance tests %[1]s"
topics = ["terraform", "testing"]
}

resource "github_actions_repository_permissions" "test" {
allowed_actions = "all"
repository = github_repository.test.name
sha_pinning_required = false
}
`, repoName)

resource.Test(t, resource.TestCase{
PreCheck: func() { skipUnauthenticated(t) },
ProviderFactories: providerFactories,
Steps: []resource.TestStep{
{
Config: configTrue,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(
"github_actions_repository_permissions.test", "sha_pinning_required", "true",
),
),
},
{
Config: configFalse,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(
"github_actions_repository_permissions.test", "sha_pinning_required", "false",
),
),
},
},
})
})

t.Run("test setting of repository allowed actions", func(t *testing.T) {
allowedActions := "selected"
githubOwnedAllowed := true
Expand Down