Skip to content

Commit 00afcdb

Browse files
committed
Address review comments
Signed-off-by: Timo Sand <[email protected]>
1 parent c2a8bb3 commit 00afcdb

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

github/resource_github_organization_ruleset.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ func resourceGithubOrganizationRulesetCreate(ctx context.Context, d *schema.Reso
662662
return diag.FromErr(err)
663663
}
664664

665-
d.SetId(strconv.FormatInt(*ruleset.ID, 10))
665+
d.SetId(strconv.FormatInt(ruleset.GetID(), 10))
666666
if err := d.Set("ruleset_id", ruleset.ID); err != nil {
667667
return diag.FromErr(err)
668668
}
@@ -676,10 +676,10 @@ func resourceGithubOrganizationRulesetCreate(ctx context.Context, d *schema.Reso
676676
return diag.FromErr(err)
677677
}
678678

679-
tflog.Info(ctx, fmt.Sprintf("Created organization ruleset: %s/%s (ID: %d)", owner, name, *ruleset.ID), map[string]any{
679+
tflog.Info(ctx, fmt.Sprintf("Created organization ruleset: %s/%s (ID: %d)", owner, name, ruleset.GetID()), map[string]any{
680680
"owner": owner,
681681
"name": name,
682-
"ruleset_id": *ruleset.ID,
682+
"ruleset_id": ruleset.GetID(),
683683
})
684684

685685
return nil
@@ -806,7 +806,7 @@ func resourceGithubOrganizationRulesetUpdate(ctx context.Context, d *schema.Reso
806806
return diag.FromErr(err)
807807
}
808808

809-
d.SetId(strconv.FormatInt(*ruleset.ID, 10))
809+
d.SetId(strconv.FormatInt(ruleset.GetID(), 10))
810810
if err := d.Set("ruleset_id", ruleset.ID); err != nil {
811811
return diag.FromErr(err)
812812
}

github/resource_github_repository_ruleset.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ func resourceGithubRepositoryRulesetCreate(ctx context.Context, d *schema.Resour
666666
}
667667

668668
d.SetId(strconv.FormatInt(ruleset.GetID(), 10))
669-
if err := d.Set("ruleset_id", ruleset.GetID()); err != nil {
669+
if err := d.Set("ruleset_id", ruleset.ID); err != nil {
670670
return diag.FromErr(err)
671671
}
672672
if err := d.Set("node_id", ruleset.GetNodeID()); err != nil {
@@ -719,7 +719,7 @@ func resourceGithubRepositoryRulesetRead(ctx context.Context, d *schema.Resource
719719
return nil
720720
}
721721

722-
if err := d.Set("ruleset_id", ruleset.GetID()); err != nil {
722+
if err := d.Set("ruleset_id", ruleset.ID); err != nil {
723723
return diag.FromErr(err)
724724
}
725725
if err := d.Set("name", ruleset.Name); err != nil {
@@ -777,7 +777,7 @@ func resourceGithubRepositoryRulesetUpdate(ctx context.Context, d *schema.Resour
777777
if err != nil {
778778
return diag.FromErr(err)
779779
}
780-
d.SetId(strconv.FormatInt(*ruleset.ID, 10))
780+
d.SetId(strconv.FormatInt(ruleset.GetID(), 10))
781781
if err := d.Set("ruleset_id", ruleset.ID); err != nil {
782782
return diag.FromErr(err)
783783
}

0 commit comments

Comments
 (0)