Merge pull request #218 from SamuZad/master

DrFaust92 · web-flow · commit 1ba18219f783 · 2024-11-09T19:05:42.000+02:00
Use more consistent endpoint for project branching models
diff --git a/bitbucket/resource_project_branching_model.go b/bitbucket/resource_project_branching_model.go
@@ -160,7 +160,7 @@ func resourceProjectBranchingModelsRead(ctx context.Context, d *schema.ResourceD
 	if err != nil {
 		return diag.FromErr(err)
 	}
-	branchingModelsReq, _ := client.Get(fmt.Sprintf("2.0/workspaces/%s/projects/%s/branching-model", workspace, repo))
+	branchingModelsReq, _ := client.Get(fmt.Sprintf("2.0/workspaces/%s/projects/%s/branching-model/settings", workspace, repo))
 
 	if branchingModelsReq.StatusCode == http.StatusNotFound {
 		log.Printf("[WARN] Project Branching Model (%s) not found, removing from state", d.Id())

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ func resourceProjectBranchingModelsRead(ctx context.Context, d *schema.ResourceD`
`160`	`160`	`if err != nil {`
`161`	`161`	`return diag.FromErr(err)`
`162`	`162`	`}`
`163`		`- branchingModelsReq, _ := client.Get(fmt.Sprintf("2.0/workspaces/%s/projects/%s/branching-model", workspace, repo))`
	`163`	`+ branchingModelsReq, _ := client.Get(fmt.Sprintf("2.0/workspaces/%s/projects/%s/branching-model/settings", workspace, repo))`
`164`	`164`
`165`	`165`	`if branchingModelsReq.StatusCode == http.StatusNotFound {`
`166`	`166`	`log.Printf("[WARN] Project Branching Model (%s) not found, removing from state", d.Id())`