Skip to content

Commit a93305e

Browse files
committed
Refactor to use tflog
Signed-off-by: Timo Sand <[email protected]>
1 parent a8998c6 commit a93305e

2 files changed

Lines changed: 13 additions & 5 deletions

File tree

github/resource_github_actions_organization_workflow_permissions.go

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import (
66
"errors"
77
"fmt"
88
"io"
9-
"log"
109
"net/http"
1110

1211
"github.com/google/go-github/v81/github"
12+
"github.com/hashicorp/terraform-plugin-log/tflog"
1313
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
1414
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1515
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
@@ -91,7 +91,11 @@ func resourceGithubActionsOrganizationWorkflowPermissionsCreateOrUpdate(ctx cont
9191
workflowPerms.CanApprovePullRequestReviews = github.Ptr(v.(bool))
9292
}
9393

94-
log.Printf("[DEBUG] Updating workflow permissions for Organization: %s", organizationSlug)
94+
tflog.Debug(ctx, "Updating workflow permissions for Organization", map[string]any{
95+
"organization_slug": organizationSlug,
96+
"default_workflow_permissions": workflowPerms.DefaultWorkflowPermissions,
97+
"can_approve_pull_request_reviews": workflowPerms.CanApprovePullRequestReviews,
98+
})
9599
_, resp, err := client.Actions.UpdateDefaultWorkflowPermissionsInOrganization(ctx, organizationSlug, workflowPerms)
96100
if err != nil {
97101
return handleEditWorkflowPermissionsError(err, resp)
@@ -105,7 +109,9 @@ func resourceGithubActionsOrganizationWorkflowPermissionsRead(ctx context.Contex
105109
client := meta.(*Owner).v3client
106110

107111
organizationSlug := d.Id()
108-
log.Printf("[DEBUG] Reading workflow permissions for Organization: %s", organizationSlug)
112+
tflog.Debug(ctx, "Reading workflow permissions for Organization", map[string]any{
113+
"organization_slug": organizationSlug,
114+
})
109115

110116
workflowPerms, _, err := client.Actions.GetDefaultWorkflowPermissionsInOrganization(ctx, organizationSlug)
111117
if err != nil {
@@ -129,7 +135,9 @@ func resourceGithubActionsOrganizationWorkflowPermissionsDelete(ctx context.Cont
129135
client := meta.(*Owner).v3client
130136

131137
organizationSlug := d.Id()
132-
log.Printf("[DEBUG] Resetting workflow permissions to defaults for Organization: %s", organizationSlug)
138+
tflog.Debug(ctx, "Resetting workflow permissions to defaults for Organization", map[string]any{
139+
"organization_slug": organizationSlug,
140+
})
133141

134142
// Reset to safe defaults
135143
workflowPerms := github.DefaultWorkflowPermissionOrganization{

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ require (
77
github.com/google/go-github/v81 v81.0.0
88
github.com/google/uuid v1.6.0
99
github.com/hashicorp/go-cty v1.5.0
10+
github.com/hashicorp/terraform-plugin-log v0.9.0
1011
github.com/hashicorp/terraform-plugin-sdk/v2 v2.38.1
1112
github.com/shurcooL/githubv4 v0.0.0-20221126192849-0b5c4c7994eb
1213
github.com/stretchr/testify v1.11.1
@@ -39,7 +40,6 @@ require (
3940
github.com/hashicorp/terraform-exec v0.23.1 // indirect
4041
github.com/hashicorp/terraform-json v0.27.1 // indirect
4142
github.com/hashicorp/terraform-plugin-go v0.29.0 // indirect
42-
github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
4343
github.com/hashicorp/terraform-registry-address v0.4.0 // indirect
4444
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
4545
github.com/hashicorp/yamux v0.1.2 // indirect

0 commit comments

Comments
 (0)