github-mirrors/terraform-provider-bitbucketserver
1
0
Fork 0
mirror of https://github.com/ysoftdevs/terraform-provider-bitbucketserver.git synced 2026-04-19 07:19:39 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Fix missing Default reviewers condition resource

Browse Source
This commit is contained in:
Martin Litvaj
2020-09-18 13:36:48 +02:00
parent f6d65b511f
commit 43286c778a
1 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
bitbucket/resource_default_reviewers_condition.go
View File

@@ -321,40 +321,36 @@ func resourceDefaultReviewersConditionRead(d *schema.ResourceData, m interface{}
return err return err
} }
if resp.StatusCode != 200 { if resp.StatusCode == 200 {
return fmt.Errorf("unable to find a matching default reviewers condition %s. API returned %d", d.Id(), resp.StatusCode) var conditions []DefaultReviewersConditionResp
}
var conditions []DefaultReviewersConditionResp body, err := ioutil.ReadAll(resp.Body)
body, err := ioutil.ReadAll(resp.Body) if err != nil {
return err
}
if err != nil { err = json.Unmarshal(body, &conditions)
return err
}
err = json.Unmarshal(body, &conditions) if err != nil {
return err
}
if err != nil { for _, c := range conditions {
return err cID := strconv.Itoa(c.ID)
}
for _, c := range conditions { if cID == conditionID {
cID := strconv.Itoa(c.ID) d.Set("project_key", projectKey)
d.Set("repository_slug", repositorySlug)
if cID == conditionID { d.Set("source_matcher", collapseMatcher(refMatcherToMatcher(c.SourceRefMatcher)))
d.Set("project_key", projectKey) d.Set("target_matcher", collapseMatcher(refMatcherToMatcher(c.TargetRefMatcher)))
d.Set("repository_slug", repositorySlug) d.Set("reviewers", collapseReviewers(c.Reviewers))
d.Set("source_matcher", collapseMatcher(refMatcherToMatcher(c.SourceRefMatcher))) d.Set("required_approvals", c.RequiredApprovals)
d.Set("target_matcher", collapseMatcher(refMatcherToMatcher(c.TargetRefMatcher))) }
d.Set("reviewers", collapseReviewers(c.Reviewers))
d.Set("required_approvals", c.RequiredApprovals)
return nil
} }
} }
return fmt.Errorf("unable to find a matching default reviewers condition %s", d.Id()) return nil
} }
func resourceDefaultReviewersConditionDelete(d *schema.ResourceData, m interface{}) error { func resourceDefaultReviewersConditionDelete(d *schema.ResourceData, m interface{}) error {