Fix multiple bugs in handling of branch_types.enabled #205
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
barrywhart
commented
May 14, 2024
| @@ -181,7 +184,7 @@ func resourceBranchingModelsRead(ctx context.Context, d *schema.ResourceData, m | |||
| if err != nil { | |||
| return diag.FromErr(err) | |||
| } | |||
| branchingModelsReq, _ := client.Get(fmt.Sprintf("2.0/repositories/%s/%s/branching-model", owner, repo)) | |||
| branchingModelsReq, _ := client.Get(fmt.Sprintf("2.0/repositories/%s/%s/branching-model/settings", owner, repo)) | |||
There was a problem hiding this comment.
The old code used the wrong API. The two APIs are similar, but the old one omits disabled branches in branch_types, and it omits production if disabled. Using settings returns everything. Note that the code was already using settings for PUT operations. This change aligns GET and PUT to use the same URL.
barrywhart
commented
May 14, 2024
| @@ -206,6 +209,14 @@ func resourceBranchingModelsRead(ctx context.Context, d *schema.ResourceData, m | |||
| return diag.FromErr(decodeerr) | |||
| } | |||
|
|
|||
| // Set default value for Enabled if it is nil | |||
| for _, branchType := range branchingModel.BranchTypes { | |||
There was a problem hiding this comment.
See the comment above (on BranchType) for an explanation of this code.
barrywhart
commented
May 14, 2024
| @@ -302,11 +313,6 @@ func flattenBranchModel(rp *BranchModel, typ string) []interface{} { | |||
| "name": rp.Name, | |||
| } | |||
|
|
|||
| // if production branch is disabled it wont show up in response and will show up without the proerty if enabled | |||
There was a problem hiding this comment.
This workaround should no longer be needed now that we're using the settings URL.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #183