Skip to content

Commit 4e87fe8

Browse files
authored
chore: [REL-8483] wrap some calls for concurrency i missed earlier (#340)
* wrap some missing client calls i missed to handle concurrency * wrap some missing client calls i missed to handle concurrency
1 parent f38b51f commit 4e87fe8

7 files changed

+52
-14
lines changed

launchdarkly/resource_launchdarkly_access_token.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,13 @@ func resourceAccessTokenExists(d *schema.ResourceData, metaRaw interface{}) (boo
348348
return accessTokenExists(d.Id(), metaRaw.(*Client))
349349
}
350350

351-
func accessTokenExists(accessTokenID string, meta *Client) (bool, error) {
352-
_, res, err := meta.ld.AccessTokensApi.GetToken(meta.ctx, accessTokenID).Execute()
351+
func accessTokenExists(accessTokenID string, client *Client) (bool, error) {
352+
var res *http.Response
353+
var err error
354+
err = client.withConcurrency(client.ctx, func() error {
355+
_, res, err = client.ld.AccessTokensApi.GetToken(client.ctx, accessTokenID).Execute()
356+
return err
357+
})
353358
if isStatusNotFound(res) {
354359
return false, nil
355360
}

launchdarkly/resource_launchdarkly_custom_role.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,13 @@ func resourceCustomRoleExists(d *schema.ResourceData, metaRaw interface{}) (bool
215215
return customRoleExists(d.Id(), metaRaw.(*Client))
216216
}
217217

218-
func customRoleExists(customRoleKey string, meta *Client) (bool, error) {
219-
_, res, err := meta.ld.CustomRolesApi.GetCustomRole(meta.ctx, customRoleKey).Execute()
218+
func customRoleExists(customRoleKey string, client *Client) (bool, error) {
219+
var res *http.Response
220+
var err error
221+
err = client.withConcurrency(client.ctx, func() error {
222+
_, res, err = client.ld.CustomRolesApi.GetCustomRole(client.ctx, customRoleKey).Execute()
223+
return err
224+
})
220225
if isStatusNotFound(res) {
221226
return false, nil
222227
}

launchdarkly/resource_launchdarkly_environment.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package launchdarkly
33
import (
44
"context"
55
"fmt"
6+
"net/http"
67
"strings"
78

89
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -167,8 +168,13 @@ func resourceEnvironmentExists(d *schema.ResourceData, metaRaw interface{}) (boo
167168
return environmentExists(d.Get(PROJECT_KEY).(string), d.Get(KEY).(string), metaRaw.(*Client))
168169
}
169170

170-
func environmentExists(projectKey string, key string, meta *Client) (bool, error) {
171-
_, res, err := meta.ld.EnvironmentsApi.GetEnvironment(meta.ctx, projectKey, key).Execute()
171+
func environmentExists(projectKey string, key string, client *Client) (bool, error) {
172+
var res *http.Response
173+
var err error
174+
err = client.withConcurrency(client.ctx, func() error {
175+
_, res, err = client.ld.EnvironmentsApi.GetEnvironment(client.ctx, projectKey, key).Execute()
176+
return err
177+
})
172178
if isStatusNotFound(res) {
173179
return false, nil
174180
}

launchdarkly/resource_launchdarkly_project.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"fmt"
66
"log"
7+
"net/http"
78

89
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
910
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -319,8 +320,13 @@ func resourceProjectExists(d *schema.ResourceData, metaRaw interface{}) (bool, e
319320
return projectExists(d.Get(KEY).(string), metaRaw.(*Client))
320321
}
321322

322-
func projectExists(projectKey string, meta *Client) (bool, error) {
323-
_, res, err := meta.ld.ProjectsApi.GetProject(meta.ctx, projectKey).Execute()
323+
func projectExists(projectKey string, client *Client) (bool, error) {
324+
var res *http.Response
325+
var err error
326+
err = client.withConcurrency(client.ctx, func() error {
327+
_, res, err = client.ld.ProjectsApi.GetProject(client.ctx, projectKey).Execute()
328+
return err
329+
})
324330
if isStatusNotFound(res) {
325331
log.Println("got 404 when getting project. returning false.")
326332
return false, nil

launchdarkly/resource_launchdarkly_team.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,13 @@ func resourceTeamExists(d *schema.ResourceData, metaRaw interface{}) (bool, erro
405405
return teamExists(d.Id(), metaRaw.(*Client))
406406
}
407407

408-
func teamExists(teamKey string, meta *Client) (bool, error) {
409-
_, res, err := meta.ld.TeamsApi.GetTeam(meta.ctx, teamKey).Execute()
408+
func teamExists(teamKey string, client *Client) (bool, error) {
409+
var res *http.Response
410+
var err error
411+
err = client.withConcurrency(client.ctx, func() error {
412+
_, res, err = client.ld.TeamsApi.GetTeam(client.ctx, teamKey).Execute()
413+
return err
414+
})
410415
if isStatusNotFound(res) {
411416
return false, nil
412417
}

launchdarkly/resource_launchdarkly_team_member.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,13 @@ func resourceTeamMemberExists(d *schema.ResourceData, metaRaw interface{}) (bool
213213
return teamMemberExists(d.Id(), metaRaw.(*Client))
214214
}
215215

216-
func teamMemberExists(memberID string, meta *Client) (bool, error) {
217-
_, res, err := meta.ld.AccountMembersApi.GetMember(meta.ctx, memberID).Execute()
216+
func teamMemberExists(memberID string, client *Client) (bool, error) {
217+
var res *http.Response
218+
var err error
219+
err = client.withConcurrency(client.ctx, func() error {
220+
_, res, err = client.ld.AccountMembersApi.GetMember(client.ctx, memberID).Execute()
221+
return err
222+
})
218223
if isStatusNotFound(res) {
219224
return false, nil
220225
}

launchdarkly/resource_launchdarkly_webhook.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package launchdarkly
33
import (
44
"context"
55
"fmt"
6+
"net/http"
67

78
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
89
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -162,8 +163,13 @@ func resourceWebhookExists(d *schema.ResourceData, metaRaw interface{}) (bool, e
162163
return webhookExists(d.Id(), metaRaw.(*Client))
163164
}
164165

165-
func webhookExists(webhookID string, meta *Client) (bool, error) {
166-
_, res, err := meta.ld.WebhooksApi.GetWebhook(meta.ctx, webhookID).Execute()
166+
func webhookExists(webhookID string, client *Client) (bool, error) {
167+
var res *http.Response
168+
var err error
169+
err = client.withConcurrency(client.ctx, func() error {
170+
_, res, err = client.ld.WebhooksApi.GetWebhook(client.ctx, webhookID).Execute()
171+
return err
172+
})
167173
if isStatusNotFound(res) {
168174
return false, nil
169175
}

0 commit comments

Comments
 (0)