Skip to content

Commit c2a8bb3

Browse files
deigadeiga
committed
Don't ignore errors
Signed-off-by: Timo Sand <[email protected]>
1 parent cc7d1f2 commit c2a8bb3

2 files changed

Lines changed: 101 additions & 35 deletions

File tree

‎github/resource_github_organization_ruleset.go‎

Lines changed: 48 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -663,10 +663,18 @@ func resourceGithubOrganizationRulesetCreate(ctx context.Context, d *schema.Reso
663663
}
664664

665665
d.SetId(strconv.FormatInt(*ruleset.ID, 10))
666-
_ = d.Set("ruleset_id", ruleset.ID)
667-
_ = d.Set("node_id", ruleset.GetNodeID())
668-
_ = d.Set("etag", resp.Header.Get("ETag"))
669-
_ = d.Set("rules", flattenRules(ctx, ruleset.Rules, true))
666+
if err := d.Set("ruleset_id", ruleset.ID); err != nil {
667+
return diag.FromErr(err)
668+
}
669+
if err := d.Set("node_id", ruleset.GetNodeID()); err != nil {
670+
return diag.FromErr(err)
671+
}
672+
if err := d.Set("etag", resp.Header.Get("ETag")); err != nil {
673+
return diag.FromErr(err)
674+
}
675+
if err := d.Set("rules", flattenRules(ctx, ruleset.Rules, true)); err != nil {
676+
return diag.FromErr(err)
677+
}
670678

671679
tflog.Info(ctx, fmt.Sprintf("Created organization ruleset: %s/%s (ID: %d)", owner, name, *ruleset.ID), map[string]any{
672680
"owner": owner,
@@ -728,15 +736,33 @@ func resourceGithubOrganizationRulesetRead(ctx context.Context, d *schema.Resour
728736
return diag.FromErr(err)
729737
}
730738

731-
_ = d.Set("ruleset_id", ruleset.ID)
732-
_ = d.Set("name", ruleset.Name)
733-
_ = d.Set("target", ruleset.GetTarget())
734-
_ = d.Set("enforcement", ruleset.Enforcement)
735-
_ = d.Set("bypass_actors", flattenBypassActors(ruleset.BypassActors))
736-
_ = d.Set("conditions", flattenConditions(ctx, ruleset.GetConditions(), true))
737-
_ = d.Set("rules", flattenRules(ctx, ruleset.Rules, true))
738-
_ = d.Set("node_id", ruleset.GetNodeID())
739-
_ = d.Set("etag", resp.Header.Get("ETag"))
739+
if err := d.Set("ruleset_id", ruleset.ID); err != nil {
740+
return diag.FromErr(err)
741+
}
742+
if err := d.Set("name", ruleset.Name); err != nil {
743+
return diag.FromErr(err)
744+
}
745+
if err := d.Set("target", ruleset.GetTarget()); err != nil {
746+
return diag.FromErr(err)
747+
}
748+
if err := d.Set("enforcement", ruleset.Enforcement); err != nil {
749+
return diag.FromErr(err)
750+
}
751+
if err := d.Set("bypass_actors", flattenBypassActors(ruleset.BypassActors)); err != nil {
752+
return diag.FromErr(err)
753+
}
754+
if err := d.Set("conditions", flattenConditions(ctx, ruleset.GetConditions(), true)); err != nil {
755+
return diag.FromErr(err)
756+
}
757+
if err := d.Set("rules", flattenRules(ctx, ruleset.Rules, true)); err != nil {
758+
return diag.FromErr(err)
759+
}
760+
if err := d.Set("node_id", ruleset.GetNodeID()); err != nil {
761+
return diag.FromErr(err)
762+
}
763+
if err := d.Set("etag", resp.Header.Get("ETag")); err != nil {
764+
return diag.FromErr(err)
765+
}
740766

741767
tflog.Trace(ctx, fmt.Sprintf("Successfully read organization ruleset: %s/%d", owner, rulesetID), map[string]any{
742768
"owner": owner,
@@ -781,9 +807,15 @@ func resourceGithubOrganizationRulesetUpdate(ctx context.Context, d *schema.Reso
781807
}
782808

783809
d.SetId(strconv.FormatInt(*ruleset.ID, 10))
784-
_ = d.Set("ruleset_id", ruleset.ID)
785-
_ = d.Set("node_id", ruleset.GetNodeID())
786-
_ = d.Set("etag", resp.Header.Get("ETag"))
810+
if err := d.Set("ruleset_id", ruleset.ID); err != nil {
811+
return diag.FromErr(err)
812+
}
813+
if err := d.Set("node_id", ruleset.GetNodeID()); err != nil {
814+
return diag.FromErr(err)
815+
}
816+
if err := d.Set("etag", resp.Header.Get("ETag")); err != nil {
817+
return diag.FromErr(err)
818+
}
787819

788820
tflog.Info(ctx, fmt.Sprintf("Updated organization ruleset: %s/%d", owner, rulesetID), map[string]any{
789821
"owner": owner,

‎github/resource_github_repository_ruleset.go‎

Lines changed: 53 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -665,11 +665,19 @@ func resourceGithubRepositoryRulesetCreate(ctx context.Context, d *schema.Resour
665665
return diag.FromErr(err)
666666
}
667667

668-
d.SetId(strconv.FormatInt(*ruleset.ID, 10))
669-
_ = d.Set("ruleset_id", ruleset.ID)
670-
_ = d.Set("node_id", ruleset.GetNodeID())
671-
_ = d.Set("etag", resp.Header.Get("ETag"))
672-
_ = d.Set("rules", flattenRules(ctx, ruleset.Rules, false))
668+
d.SetId(strconv.FormatInt(ruleset.GetID(), 10))
669+
if err := d.Set("ruleset_id", ruleset.GetID()); err != nil {
670+
return diag.FromErr(err)
671+
}
672+
if err := d.Set("node_id", ruleset.GetNodeID()); err != nil {
673+
return diag.FromErr(err)
674+
}
675+
if err := d.Set("etag", resp.Header.Get("ETag")); err != nil {
676+
return diag.FromErr(err)
677+
}
678+
if err := d.Set("rules", flattenRules(ctx, ruleset.Rules, false)); err != nil {
679+
return diag.FromErr(err)
680+
}
673681

674682
return nil
675683
}
@@ -711,15 +719,33 @@ func resourceGithubRepositoryRulesetRead(ctx context.Context, d *schema.Resource
711719
return nil
712720
}
713721

714-
_ = d.Set("ruleset_id", ruleset.ID)
715-
_ = d.Set("name", ruleset.Name)
716-
_ = d.Set("target", ruleset.GetTarget())
717-
_ = d.Set("enforcement", ruleset.Enforcement)
718-
_ = d.Set("bypass_actors", flattenBypassActors(ruleset.BypassActors))
719-
_ = d.Set("conditions", flattenConditions(ctx, ruleset.GetConditions(), false))
720-
_ = d.Set("rules", flattenRules(ctx, ruleset.Rules, false))
721-
_ = d.Set("node_id", ruleset.GetNodeID())
722-
_ = d.Set("etag", resp.Header.Get("ETag"))
722+
if err := d.Set("ruleset_id", ruleset.GetID()); err != nil {
723+
return diag.FromErr(err)
724+
}
725+
if err := d.Set("name", ruleset.Name); err != nil {
726+
return diag.FromErr(err)
727+
}
728+
if err := d.Set("target", ruleset.GetTarget()); err != nil {
729+
return diag.FromErr(err)
730+
}
731+
if err := d.Set("enforcement", ruleset.Enforcement); err != nil {
732+
return diag.FromErr(err)
733+
}
734+
if err := d.Set("bypass_actors", flattenBypassActors(ruleset.BypassActors)); err != nil {
735+
return diag.FromErr(err)
736+
}
737+
if err := d.Set("conditions", flattenConditions(ctx, ruleset.GetConditions(), false)); err != nil {
738+
return diag.FromErr(err)
739+
}
740+
if err := d.Set("rules", flattenRules(ctx, ruleset.GetRules(), false)); err != nil {
741+
return diag.FromErr(err)
742+
}
743+
if err := d.Set("node_id", ruleset.GetNodeID()); err != nil {
744+
return diag.FromErr(err)
745+
}
746+
if err := d.Set("etag", resp.Header.Get("ETag")); err != nil {
747+
return diag.FromErr(err)
748+
}
723749

724750
return nil
725751
}
@@ -752,9 +778,15 @@ func resourceGithubRepositoryRulesetUpdate(ctx context.Context, d *schema.Resour
752778
return diag.FromErr(err)
753779
}
754780
d.SetId(strconv.FormatInt(*ruleset.ID, 10))
755-
_ = d.Set("ruleset_id", ruleset.ID)
756-
_ = d.Set("node_id", ruleset.GetNodeID())
757-
_ = d.Set("etag", resp.Header.Get("ETag"))
781+
if err := d.Set("ruleset_id", ruleset.ID); err != nil {
782+
return diag.FromErr(err)
783+
}
784+
if err := d.Set("node_id", ruleset.GetNodeID()); err != nil {
785+
return diag.FromErr(err)
786+
}
787+
if err := d.Set("etag", resp.Header.Get("ETag")); err != nil {
788+
return diag.FromErr(err)
789+
}
758790

759791
return nil
760792
}
@@ -796,9 +828,11 @@ func resourceGithubRepositoryRulesetImport(ctx context.Context, d *schema.Resour
796828
if repository == nil || err != nil {
797829
return []*schema.ResourceData{d}, err
798830
}
799-
_ = d.Set("repository", *repository.Name)
831+
if err := d.Set("repository", repository.GetName()); err != nil {
832+
return []*schema.ResourceData{d}, err
833+
}
800834

801-
ruleset, _, err := client.Repositories.GetRuleset(ctx, owner, *repository.Name, rulesetID, false)
835+
ruleset, _, err := client.Repositories.GetRuleset(ctx, owner, repository.GetName(), rulesetID, false)
802836
if ruleset == nil || err != nil {
803837
return []*schema.ResourceData{d}, err
804838
}

0 commit comments

Comments
 (0)