Skip to content

Commit 21df0c3

Browse files
committed
chore: upgrade go-github dependency to v82 and update context usage in conditions and rules
1 parent 1cd1652 commit 21df0c3

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

github/data_source_github_enterprise_ruleset.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"net/http"
77
"strconv"
88

9-
"github.com/google/go-github/v81/github"
9+
"github.com/google/go-github/v82/github"
1010
"github.com/hashicorp/terraform-plugin-log/tflog"
1111
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
1212
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -396,10 +396,10 @@ func dataSourceGithubEnterpriseRulesetRead(ctx context.Context, d *schema.Resour
396396
if err := d.Set("bypass_actors", flattenBypassActors(ruleset.BypassActors)); err != nil {
397397
return diag.FromErr(err)
398398
}
399-
if err := d.Set("conditions", flattenConditions(ruleset.GetConditions(), true)); err != nil {
399+
if err := d.Set("conditions", flattenConditions(ctx, ruleset.GetConditions(), true)); err != nil {
400400
return diag.FromErr(err)
401401
}
402-
if err := d.Set("rules", flattenRules(ruleset.Rules, true)); err != nil {
402+
if err := d.Set("rules", flattenRules(ctx, ruleset.Rules, true)); err != nil {
403403
return diag.FromErr(err)
404404
}
405405
if err := d.Set("node_id", ruleset.GetNodeID()); err != nil {

github/resource_github_enterprise_ruleset.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"net/http"
88
"strconv"
99

10-
"github.com/google/go-github/v81/github"
10+
"github.com/google/go-github/v82/github"
1111
"github.com/hashicorp/terraform-plugin-log/tflog"
1212
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
1313
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -851,10 +851,10 @@ func resourceGithubEnterpriseRulesetRead(ctx context.Context, d *schema.Resource
851851
if err := d.Set("bypass_actors", flattenBypassActors(ruleset.BypassActors)); err != nil {
852852
return diag.FromErr(err)
853853
}
854-
if err := d.Set("conditions", flattenConditions(ruleset.GetConditions(), true)); err != nil {
854+
if err := d.Set("conditions", flattenConditions(ctx, ruleset.GetConditions(), true)); err != nil {
855855
return diag.FromErr(err)
856856
}
857-
if err := d.Set("rules", flattenRules(ruleset.Rules, true)); err != nil {
857+
if err := d.Set("rules", flattenRules(ctx, ruleset.Rules, true)); err != nil {
858858
return diag.FromErr(err)
859859
}
860860
if err := d.Set("node_id", ruleset.GetNodeID()); err != nil {

0 commit comments

Comments
 (0)