Skip to content
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.

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

(fix): add the handlers for empty values #2404

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 19 additions & 8 deletions github/resource_github_actions_organization_permissions.go
Original file line number Diff line number Diff line change
Expand Up @@ -147,14 +147,25 @@ func resourceGithubActionsOrganizationPermissionsCreateOrUpdate(d *schema.Resour
allowedActions := d.Get("allowed_actions").(string)
enabledRepositories := d.Get("enabled_repositories").(string)

_, _, err = client.Actions.EditActionsPermissions(ctx,
orgName,
github.ActionsPermissions{
AllowedActions: &allowedActions,
EnabledRepositories: &enabledRepositories,
})
if err != nil {
return err
if allowedActions != "" {
_, _, err = client.Actions.EditActionsPermissions(ctx,
orgName,
github.ActionsPermissions{
AllowedActions: &allowedActions,
EnabledRepositories: &enabledRepositories,
})
if err != nil {
return err
}
} else {
_, _, err = client.Actions.EditActionsPermissions(ctx,
orgName,
github.ActionsPermissions{
EnabledRepositories: &enabledRepositories,
})
if err != nil {
return err
}
}

if allowedActions == "selected" {
Expand Down
34 changes: 34 additions & 0 deletions github/resource_github_actions_organization_permissions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -270,4 +270,38 @@ func TestAccGithubActionsOrganizationPermissions(t *testing.T) {
})
})

t.Run("test disabling of actions at organization level", func(t *testing.T) {

enabledRepositories := "none"

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

check := resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(
"github_actions_organization_permissions.test", "enabled_repositories", enabledRepositories,
),
)

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 organization account", func(t *testing.T) {
testCase(t, organization)
})
})

}
31 changes: 23 additions & 8 deletions github/resource_github_enterprise_actions_permissions.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package github
import (
"context"
"errors"
"log"

"github.com/google/go-github/v63/github"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
Expand Down Expand Up @@ -149,14 +150,28 @@ func resourceGithubActionsEnterprisePermissionsCreateOrUpdate(d *schema.Resource
allowedActions := d.Get("allowed_actions").(string)
enabledOrganizations := d.Get("enabled_organizations").(string)

_, _, err := client.Actions.EditActionsPermissionsInEnterprise(ctx,
enterpriseId,
github.ActionsPermissionsEnterprise{
AllowedActions: &allowedActions,
EnabledOrganizations: &enabledOrganizations,
})
if err != nil {
return err
if allowedActions == "" {
log.Printf("[DEBUG] The allowed_actions is not set")
_, _, err := client.Actions.EditActionsPermissionsInEnterprise(ctx,
enterpriseId,
github.ActionsPermissionsEnterprise{
EnabledOrganizations: &enabledOrganizations,
})
if err != nil {
return err
}
}

if allowedActions == "all" {
_, _, err := client.Actions.EditActionsPermissionsInEnterprise(ctx,
enterpriseId,
github.ActionsPermissionsEnterprise{
AllowedActions: &allowedActions,
EnabledOrganizations: &enabledOrganizations,
})
if err != nil {
return err
}
}

if allowedActions == "selected" {
Expand Down
41 changes: 41 additions & 0 deletions github/resource_github_enterprise_actions_permissions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -285,4 +285,45 @@ func TestAccGithubActionsEnterprisePermissions(t *testing.T) {
})
})

t.Run("test disabling of actions at organization level", func(t *testing.T) {

enabledOrganizations := "none"

config := fmt.Sprintf(`
resource "github_enterprise_actions_permissions" "test" {
enterprise_slug = "%s"
enabled_organizations = "%s"
}
`, testEnterprise, enabledOrganizations)

check := resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(
"github_enterprise_actions_permissions.test", "enabled_organizations", enabledOrganizations,
),
)

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 enterprise account", func(t *testing.T) {
if isEnterprise != "true" {
t.Skip("Skipping because `ENTERPRISE_ACCOUNT` is not set or set to false")
}
if testEnterprise == "" {
t.Skip("Skipping because `ENTERPRISE_SLUG` is not set")
}
testCase(t, enterprise)
})
})

}