Skip to content

Commit 53f842f

Browse files
committed
Fix linter issues
Signed-off-by: Timo Sand <timo.sand@f-secure.com>
1 parent a16cc74 commit 53f842f

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

github/resource_github_repository.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,8 @@ func customDiffFunction(ctx context.Context, diff *schema.ResourceDiff, v any) e
523523
isSquashMergeCommitTitleSet := !diff.GetRawConfig().GetAttr("squash_merge_commit_title").IsNull()
524524
isSquashMergeCommitMessageSet := !diff.GetRawConfig().GetAttr("squash_merge_commit_message").IsNull()
525525
if isSquashMergeCommitMessageSet && isSquashMergeCommitTitleSet {
526-
if !diff.Get("allow_squash_merge").(bool) {
526+
allowSquashMerge, _ := diff.Get("allow_squash_merge").(bool)
527+
if !allowSquashMerge {
527528
return fmt.Errorf("allow_squash_merge is required when squash_merge_commit_title and squash_merge_commit_message is set")
528529
}
529530
}
@@ -532,7 +533,8 @@ func customDiffFunction(ctx context.Context, diff *schema.ResourceDiff, v any) e
532533
isMergeCommitTitleSet := !diff.GetRawConfig().GetAttr("merge_commit_title").IsNull()
533534
isMergeCommitMessageSet := !diff.GetRawConfig().GetAttr("merge_commit_message").IsNull()
534535
if isMergeCommitMessageSet && isMergeCommitTitleSet {
535-
if !diff.Get("allow_merge_commit").(bool) {
536+
allowMergeCommit, _ := diff.Get("allow_merge_commit").(bool)
537+
if !allowMergeCommit {
536538
return fmt.Errorf("allow_merge_commit is required when merge_commit_title and merge_commit_message is set")
537539
}
538540
}
@@ -672,7 +674,7 @@ func resourceGithubRepositoryObject(d *schema.ResourceData) *github.Repository {
672674
}
673675

674676
func resourceGithubRepositoryCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
675-
meta := m.(*Owner)
677+
meta, _ := m.(*Owner)
676678
client := meta.v3client
677679

678680
if branchName, hasDefaultBranch := d.GetOk("default_branch"); hasDefaultBranch && (branchName != "main") {

0 commit comments

Comments
 (0)