Skip to content

Commit 4210af7

Browse files
DrFaust92DrFaust92
committed
fmt
1 parent d7422c0 commit 4210af7

9 files changed

+37
-37
lines changed

‎bitbucket/resource_deploy_key.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func resourceDeployKeysRead(ctx context.Context, d *schema.ResourceData, m inter
107107

108108
deployKey, deployKeyRes, err := deployApi.RepositoriesWorkspaceRepoSlugDeployKeysKeyIdGet(c.AuthContext, keyId, repo, workspace)
109109
if err != nil {
110-
return diag.Errorf("error reading Deploy Key (%s): %w", d.Id(), err)
110+
return diag.Errorf("error reading Deploy Key (%s): %s", d.Id(), err)
111111
}
112112

113113
if deployKeyRes.StatusCode == http.StatusNotFound {
@@ -148,7 +148,7 @@ func resourceDeployKeysUpdate(ctx context.Context, d *schema.ResourceData, m int
148148
workspace, repo, keyId), bytes.NewBuffer(bytedata))
149149

150150
if err != nil {
151-
return diag.Errorf("error updating Deploy Key (%s): %w", d.Id(), err)
151+
return diag.Errorf("error updating Deploy Key (%s): %s", d.Id(), err)
152152
}
153153

154154
return resourceDeployKeysRead(ctx, d, m)
@@ -165,7 +165,7 @@ func resourceDeployKeysDelete(ctx context.Context, d *schema.ResourceData, m int
165165

166166
_, err = deployApi.RepositoriesWorkspaceRepoSlugDeployKeysKeyIdDelete(c.AuthContext, keyId, repo, workspace)
167167
if err != nil {
168-
return diag.Errorf("error deleting Deploy Key (%s): %w", d.Id(), err)
168+
return diag.Errorf("error deleting Deploy Key (%s): %s", d.Id(), err)
169169
}
170170

171171
return diag.FromErr(err)

‎bitbucket/resource_deployment_variable.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func resourceDeploymentVariableCreate(ctx context.Context, d *schema.ResourceDat
8686
rvRes, _, err := pipeApi.CreateDeploymentVariable(c.AuthContext, *rvcr, workspace, repoSlug, deployment)
8787

8888
if err != nil {
89-
return diag.Errorf("error creating Deployment Variable (%s): %w", d.Get("deployment").(string), err)
89+
return diag.Errorf("error creating Deployment Variable (%s): %s", d.Get("deployment").(string), err)
9090
}
9191

9292
d.Set("uuid", rvRes.Uuid)
@@ -108,7 +108,7 @@ func resourceDeploymentVariableRead(ctx context.Context, d *schema.ResourceData,
108108

109109
rvRes, res, err := pipeApi.GetDeploymentVariables(c.AuthContext, workspace, repoSlug, deployment)
110110
if err != nil {
111-
return diag.Errorf("error reading Deployment Variable (%s): %w", d.Id(), err)
111+
return diag.Errorf("error reading Deployment Variable (%s): %s", d.Id(), err)
112112
}
113113

114114
if res.StatusCode == http.StatusNotFound {
@@ -165,7 +165,7 @@ func resourceDeploymentVariableUpdate(ctx context.Context, d *schema.ResourceDat
165165
_, _, err = pipeApi.UpdateDeploymentVariable(c.AuthContext, *rvcr, workspace, repoSlug, deployment, d.Get("uuid").(string))
166166

167167
if err != nil {
168-
return diag.Errorf("error updating Deployment Variable (%s): %w", d.Get("deployment").(string), err)
168+
return diag.Errorf("error updating Deployment Variable (%s): %s", d.Get("deployment").(string), err)
169169
}
170170

171171
return resourceDeploymentVariableRead(ctx, d, m)
@@ -183,7 +183,7 @@ func resourceDeploymentVariableDelete(ctx context.Context, d *schema.ResourceDat
183183

184184
_, err = pipeApi.DeleteDeploymentVariable(c.AuthContext, workspace, repoSlug, deployment, d.Get("uuid").(string))
185185
if err != nil {
186-
return diag.Errorf("error deleting Deployment Variable (%s): %w", d.Id(), err)
186+
return diag.Errorf("error deleting Deployment Variable (%s): %s", d.Id(), err)
187187
}
188188

189189
return nil

‎bitbucket/resource_pipeline_schedule.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ func resourcePipelineScheduleCreate(ctx context.Context, d *schema.ResourceData,
105105
schedule, _, err := pipeApi.CreateRepositoryPipelineSchedule(c.AuthContext, *pipeSchedule, workspace, repo)
106106

107107
if err != nil {
108-
return diag.Errorf("error creating pipeline schedule: %w", err)
108+
return diag.Errorf("error creating pipeline schedule: %s", err)
109109
}
110110

111111
d.SetId(string(fmt.Sprintf("%s/%s/%s", workspace, repo, schedule.Uuid)))
@@ -114,7 +114,7 @@ func resourcePipelineScheduleCreate(ctx context.Context, d *schema.ResourceData,
114114
_, _, err = pipeApi.UpdateRepositoryPipelineSchedule(c.AuthContext, *pipeSchedule, workspace, repo, schedule.Uuid)
115115

116116
if err != nil {
117-
return diag.Errorf("error setting pipeline schedule to disabled: %w", err)
117+
return diag.Errorf("error setting pipeline schedule to disabled: %s", err)
118118
}
119119
}
120120

@@ -135,7 +135,7 @@ func resourcePipelineScheduleUpdate(ctx context.Context, d *schema.ResourceData,
135135
_, _, err = pipeApi.UpdateRepositoryPipelineSchedule(c.AuthContext, *pipeSchedule, workspace, repo, uuid)
136136

137137
if err != nil {
138-
return diag.Errorf("error updating pipeline schedule: %w", err)
138+
return diag.Errorf("error updating pipeline schedule: %s", err)
139139
}
140140

141141
return resourcePipelineScheduleRead(ctx, d, m)
@@ -152,7 +152,7 @@ func resourcePipelineScheduleRead(ctx context.Context, d *schema.ResourceData, m
152152

153153
schedule, res, err := pipeApi.GetRepositoryPipelineSchedule(c.AuthContext, workspace, repo, uuid)
154154
if err != nil {
155-
return diag.Errorf("error reading Pipeline Schedule (%s): %w", d.Id(), err)
155+
return diag.Errorf("error reading Pipeline Schedule (%s): %s", d.Id(), err)
156156
}
157157

158158
if res.StatusCode == http.StatusNotFound {
@@ -187,7 +187,7 @@ func resourcePipelineScheduleDelete(ctx context.Context, d *schema.ResourceData,
187187
_, err = pipeApi.DeleteRepositoryPipelineSchedule(c.AuthContext, workspace, repo, uuid)
188188

189189
if err != nil {
190-
return diag.Errorf("error deleting Pipeline Schedule (%s): %w", d.Id(), err)
190+
return diag.Errorf("error deleting Pipeline Schedule (%s): %s", d.Id(), err)
191191
}
192192

193193
return diag.FromErr(err)

‎bitbucket/resource_pipeline_ssh_key.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func resourcePipelineSshKeysPut(ctx context.Context, d *schema.ResourceData, m i
5757
_, _, err := pipeApi.UpdateRepositoryPipelineKeyPair(c.AuthContext, *pipeSshKey, workspace, repo)
5858

5959
if err != nil {
60-
return diag.Errorf("error creating pipeline ssh key: %w", err)
60+
return diag.Errorf("error creating pipeline ssh key: %s", err)
6161
}
6262

6363
d.SetId(string(fmt.Sprintf("%s/%s", workspace, repo)))
@@ -76,7 +76,7 @@ func resourcePipelineSshKeysRead(ctx context.Context, d *schema.ResourceData, m
7676

7777
key, res, err := pipeApi.GetRepositoryPipelineSshKeyPair(c.AuthContext, workspace, repo)
7878
if err != nil {
79-
return diag.Errorf("error reading Pipeline Ssh Key (%s): %w", d.Id(), err)
79+
return diag.Errorf("error reading Pipeline Ssh Key (%s): %s", d.Id(), err)
8080
}
8181

8282
if res.StatusCode == http.StatusNotFound {
@@ -109,7 +109,7 @@ func resourcePipelineSshKeysDelete(ctx context.Context, d *schema.ResourceData,
109109
_, err = pipeApi.DeleteRepositoryPipelineKeyPair(c.AuthContext, workspace, repo)
110110

111111
if err != nil {
112-
return diag.Errorf("error deleting Pipeline Ssh Key (%s): %w", d.Id(), err)
112+
return diag.Errorf("error deleting Pipeline Ssh Key (%s): %s", d.Id(), err)
113113
}
114114

115115
return diag.FromErr(err)

‎bitbucket/resource_pipeline_ssh_known_host.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func resourcePipelineSshKnownHostsCreate(ctx context.Context, d *schema.Resource
8484
host, _, err := pipeApi.CreateRepositoryPipelineKnownHost(c.AuthContext, *pipeSshKnownHost, workspace, repo)
8585

8686
if err != nil {
87-
return diag.Errorf("error creating pipeline ssh known host: %w", err)
87+
return diag.Errorf("error creating pipeline ssh known host: %s", err)
8888
}
8989

9090
d.SetId(string(fmt.Sprintf("%s/%s/%s", workspace, repo, host.Uuid)))
@@ -106,7 +106,7 @@ func resourcePipelineSshKnownHostsUpdate(ctx context.Context, d *schema.Resource
106106
_, _, err = pipeApi.UpdateRepositoryPipelineKnownHost(c.AuthContext, *pipeSshKnownHost, workspace, repo, uuid)
107107

108108
if err != nil {
109-
return diag.Errorf("error updating pipeline ssh known host: %w", err)
109+
return diag.Errorf("error updating pipeline ssh known host: %s", err)
110110
}
111111

112112
return resourcePipelineSshKnownHostsRead(ctx, d, m)
@@ -123,7 +123,7 @@ func resourcePipelineSshKnownHostsRead(ctx context.Context, d *schema.ResourceDa
123123

124124
host, res, err := pipeApi.GetRepositoryPipelineKnownHost(c.AuthContext, workspace, repo, uuid)
125125
if err != nil {
126-
return diag.Errorf("error reading Pipeline Ssh known host (%s): %w", d.Id(), err)
126+
return diag.Errorf("error reading Pipeline Ssh known host (%s): %s", d.Id(), err)
127127
}
128128

129129
if res.StatusCode == http.StatusNotFound {
@@ -156,7 +156,7 @@ func resourcePipelineSshKnownHostsDelete(ctx context.Context, d *schema.Resource
156156
_, err = pipeApi.DeleteRepositoryPipelineKnownHost(c.AuthContext, workspace, repo, uuid)
157157

158158
if err != nil {
159-
return diag.Errorf("error deleting Pipeline Ssh known host (%s): %w", d.Id(), err)
159+
return diag.Errorf("error deleting Pipeline Ssh known host (%s): %s", d.Id(), err)
160160
}
161161

162162
return diag.FromErr(err)

‎bitbucket/resource_project.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func resourceProjectUpdate(ctx context.Context, d *schema.ResourceData, m interf
115115
_, _, err := projectApi.WorkspacesWorkspaceProjectsProjectKeyPut(c.AuthContext, *project, projectKey, d.Get("owner").(string))
116116

117117
if err != nil {
118-
return diag.Errorf("error updating project (%s): %w", d.Id(), err)
118+
return diag.Errorf("error updating project (%s): %s", d.Id(), err)
119119
}
120120

121121
return resourceProjectRead(ctx, d, m)
@@ -136,7 +136,7 @@ func resourceProjectCreate(ctx context.Context, d *schema.ResourceData, m interf
136136

137137
projRes, _, err := projectApi.WorkspacesWorkspaceProjectsPost(c.AuthContext, *project, owner)
138138
if err != nil {
139-
return diag.Errorf("error creating project (%s): %w", projectKey, err)
139+
return diag.Errorf("error creating project (%s): %s", projectKey, err)
140140
}
141141

142142
d.SetId(string(fmt.Sprintf("%s/%s", owner, projRes.Key)))
@@ -168,7 +168,7 @@ func resourceProjectRead(ctx context.Context, d *schema.ResourceData, m interfac
168168
projRes, res, err := projectApi.WorkspacesWorkspaceProjectsProjectKeyGet(c.AuthContext, projectKey, d.Get("owner").(string))
169169

170170
if err != nil {
171-
return diag.Errorf("error reading project (%s): %w", d.Id(), err)
171+
return diag.Errorf("error reading project (%s): %s", d.Id(), err)
172172
}
173173
if res.StatusCode == http.StatusNotFound {
174174
log.Printf("[WARN] Project (%s) not found, removing from state", d.Id())
@@ -200,7 +200,7 @@ func resourceProjectDelete(ctx context.Context, d *schema.ResourceData, m interf
200200

201201
_, err := projectApi.WorkspacesWorkspaceProjectsProjectKeyDelete(c.AuthContext, projectKey, d.Get("owner").(string))
202202
if err != nil {
203-
return diag.Errorf("error deleting project (%s): %w", d.Id(), err)
203+
return diag.Errorf("error deleting project (%s): %s", d.Id(), err)
204204
}
205205

206206
return nil

‎bitbucket/resource_repository.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ func resourceRepositoryUpdate(ctx context.Context, d *schema.ResourceData, m int
179179
_, _, err := repoApi.RepositoriesWorkspaceRepoSlugPut(c.AuthContext, repoSlug, workspace, repoBody)
180180

181181
if err != nil {
182-
return diag.Errorf("error updating repository (%s): %w", repoSlug, err)
182+
return diag.Errorf("error updating repository (%s): %s", repoSlug, err)
183183
}
184184

185185
pipelinesEnabled := d.Get("pipelines_enabled").(bool)
@@ -188,7 +188,7 @@ func resourceRepositoryUpdate(ctx context.Context, d *schema.ResourceData, m int
188188
_, _, err = pipeApi.UpdateRepositoryPipelineConfig(c.AuthContext, *pipelinesConfig, workspace, repoSlug)
189189

190190
if err != nil {
191-
return diag.Errorf("error enabling pipeline for repository (%s): %w", repoSlug, err)
191+
return diag.Errorf("error enabling pipeline for repository (%s): %s", repoSlug, err)
192192
}
193193

194194
return resourceRepositoryRead(ctx, d, m)
@@ -215,7 +215,7 @@ func resourceRepositoryCreate(ctx context.Context, d *schema.ResourceData, m int
215215

216216
_, _, err := repoApi.RepositoriesWorkspaceRepoSlugPost(c.AuthContext, repoSlug, workspace, repoBody)
217217
if err != nil {
218-
return diag.Errorf("error creating repository (%s): %w", repoSlug, err)
218+
return diag.Errorf("error creating repository (%s): %s", repoSlug, err)
219219
}
220220

221221
d.SetId(string(fmt.Sprintf("%s/%s", d.Get("owner").(string), repoSlug)))
@@ -226,7 +226,7 @@ func resourceRepositoryCreate(ctx context.Context, d *schema.ResourceData, m int
226226
_, _, err = pipeApi.UpdateRepositoryPipelineConfig(c.AuthContext, *pipelinesConfig, workspace, repoSlug)
227227

228228
if err != nil {
229-
return diag.Errorf("error enabling pipeline for repository (%s): %w", repoSlug, err)
229+
return diag.Errorf("error enabling pipeline for repository (%s): %s", repoSlug, err)
230230
}
231231

232232
return resourceRepositoryRead(ctx, d, m)
@@ -258,7 +258,7 @@ func resourceRepositoryRead(ctx context.Context, d *schema.ResourceData, m inter
258258

259259
repoRes, res, err := repoApi.RepositoriesWorkspaceRepoSlugGet(c.AuthContext, repoSlug, workspace)
260260
if err != nil {
261-
return diag.Errorf("error reading repository (%s): %w", d.Id(), err)
261+
return diag.Errorf("error reading repository (%s): %s", d.Id(), err)
262262
}
263263

264264
if res.StatusCode == http.StatusNotFound {
@@ -321,7 +321,7 @@ func resourceRepositoryDelete(ctx context.Context, d *schema.ResourceData, m int
321321
if res.StatusCode == http.StatusNotFound {
322322
return nil
323323
}
324-
return diag.Errorf("error deleting repository (%s): %w", d.Id(), err)
324+
return diag.Errorf("error deleting repository (%s): %s", d.Id(), err)
325325
}
326326

327327
return nil

‎bitbucket/resource_repository_variable.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func resourceRepositoryVariableCreate(ctx context.Context, d *schema.ResourceDat
6969
rvRes, _, err := pipeApi.CreateRepositoryPipelineVariable(c.AuthContext, rvcr, workspace, repoSlug)
7070

7171
if err != nil {
72-
return diag.Errorf("error creating Repository Variable (%s): %w", repo, err)
72+
return diag.Errorf("error creating Repository Variable (%s): %s", repo, err)
7373
}
7474

7575
d.Set("uuid", rvRes.Uuid)
@@ -90,7 +90,7 @@ func resourceRepositoryVariableRead(ctx context.Context, d *schema.ResourceData,
9090

9191
rvRes, res, err := pipeApi.GetRepositoryPipelineVariable(c.AuthContext, workspace, repoSlug, d.Get("uuid").(string))
9292
if err != nil {
93-
return diag.Errorf("error reading Repository Variable (%s): %w", d.Id(), err)
93+
return diag.Errorf("error reading Repository Variable (%s): %s", d.Id(), err)
9494
}
9595
if res.StatusCode == http.StatusNotFound {
9696
log.Printf("[WARN] Repository Variable (%s) not found, removing from state", d.Id())
@@ -125,7 +125,7 @@ func resourceRepositoryVariableUpdate(ctx context.Context, d *schema.ResourceDat
125125

126126
_, _, err = pipeApi.UpdateRepositoryPipelineVariable(c.AuthContext, rvcr, workspace, repoSlug, d.Get("uuid").(string))
127127
if err != nil {
128-
return diag.Errorf("error updating Repository Variable (%s): %w", d.Id(), err)
128+
return diag.Errorf("error updating Repository Variable (%s): %s", d.Id(), err)
129129
}
130130

131131
return resourceRepositoryVariableRead(ctx, d, m)
@@ -143,7 +143,7 @@ func resourceRepositoryVariableDelete(ctx context.Context, d *schema.ResourceDat
143143

144144
_, err = pipeApi.DeleteRepositoryPipelineVariable(c.AuthContext, workspace, repoSlug, d.Get("uuid").(string))
145145
if err != nil {
146-
return diag.Errorf("error deleting Repository Variable (%s): %w", d.Id(), err)
146+
return diag.Errorf("error deleting Repository Variable (%s): %s", d.Id(), err)
147147
}
148148

149149
return nil

‎bitbucket/resource_ssh_key.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func resourceSshKeysCreate(ctx context.Context, d *schema.ResourceData, m interf
7272
user := d.Get("user").(string)
7373
sshKeyReq, _, err := sshApi.UsersSelectedUserSshKeysPost(c.AuthContext, user, sshKeyBody)
7474
if err != nil {
75-
return diag.Errorf("error creating ssh key: %w", err)
75+
return diag.Errorf("error creating ssh key: %s", err)
7676
}
7777

7878
d.SetId(string(fmt.Sprintf("%s/%s", user, sshKeyReq.Uuid)))
@@ -91,7 +91,7 @@ func resourceSshKeysRead(ctx context.Context, d *schema.ResourceData, m interfac
9191

9292
sshKeyReq, res, err := sshApi.UsersSelectedUserSshKeysKeyIdGet(c.AuthContext, keyId, user)
9393
if err != nil {
94-
return diag.Errorf("error reading ssh key (%s): %w", d.Id(), err)
94+
return diag.Errorf("error reading ssh key (%s): %s", d.Id(), err)
9595
}
9696

9797
if res.StatusCode == http.StatusNotFound {
@@ -130,7 +130,7 @@ func resourceSshKeysUpdate(ctx context.Context, d *schema.ResourceData, m interf
130130

131131
_, _, err = sshApi.UsersSelectedUserSshKeysKeyIdPut(c.AuthContext, keyId, user, sshKeyBody)
132132
if err != nil {
133-
return diag.Errorf("error updating ssh key (%s): %w", d.Id(), err)
133+
return diag.Errorf("error updating ssh key (%s): %s", d.Id(), err)
134134
}
135135

136136
return resourceSshKeysRead(ctx, d, m)
@@ -150,7 +150,7 @@ func resourceSshKeysDelete(ctx context.Context, d *schema.ResourceData, m interf
150150
if res.StatusCode == http.StatusNotFound {
151151
return nil
152152
}
153-
return diag.Errorf("error deleting ssh key (%s): %w", d.Id(), err)
153+
return diag.Errorf("error deleting ssh key (%s): %s", d.Id(), err)
154154
}
155155

156156
return nil

0 commit comments

Comments
 (0)