Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issues/2252 #2368

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fix issues/2252 #2368

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
593a630
Fix issues/2252
fushi Aug 26, 2024
b2f77de
Merge branch 'main' into fushi/issues/2252
fushi Aug 26, 2024
94a53a8
Merge branch 'main' into fushi/issues/2252
fushi Sep 17, 2024
bc75083
Merge branch 'main' into fushi/issues/2252
fushi Sep 25, 2024
08fa313
Merge branch 'main' into fushi/issues/2252
fushi Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions github/resource_github_repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,6 +752,9 @@ func resourceGithubRepositoryUpdate(d *schema.ResourceData, meta interface{}) er
// handle visibility updates separately from other fields
repoReq.Visibility = nil

// handle security and analysis separately from other fields
repoReq.SecurityAndAnalysis = nil

// The documentation for `default_branch` states: "This can only be set
// after a repository has already been created". However, for backwards
// compatibility we need to allow terraform configurations that set
Expand Down Expand Up @@ -851,6 +854,17 @@ func resourceGithubRepositoryUpdate(d *schema.ResourceData, meta interface{}) er
log.Printf("[DEBUG] No privacy update required. private: %v", d.Get("private"))
}

if d.HasChange("security_and_analysis") {
repoReq.SecurityAndAnalysis = calculateSecurityAndAnalysis(d)
log.Printf("[DEBUG] Updating repository security_and_analysis to %v", repoReq.SecurityAndAnalysis)
_, _, err = client.Repositories.Edit(ctx, owner, repoName, repoReq)
if err != nil {
return err
}
} else {
log.Printf("[DEBUG] No security_and_analysis update required. security_and_analysis: %v", d.Get("security_and_analysis"))
}

return resourceGithubRepositoryRead(d, meta)
}

Expand Down