prepare 2.18.4 release

go.mod

@@ -15,6 +15,8 @@ require (
 	github.com/stretchr/testify v1.7.2
 )
 
+require github.com/launchdarkly/api-client-go/v16 v16.1.1
+
 require (
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver/v3 v3.1.1 // indirect
@@ -52,7 +54,6 @@ require (
 	github.com/huandu/xstrings v1.3.2 // indirect
 	github.com/imdario/mergo v0.3.13 // indirect
 	github.com/jackc/sqlfmt v0.1.1-0.20191221211249-d576133216e1 // indirect
-	github.com/launchdarkly/api-client-go/v15 v15.0.0
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/mitchellh/cli v1.1.5 // indirect

go.sum

@@ -515,8 +515,8 @@ github.com/kunwardeep/paralleltest v1.0.3/go.mod h1:vLydzomDFpk7yu5UX02RmP0H8QfR
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/kyoh86/exportloopref v0.1.8/go.mod h1:1tUcJeiioIs7VWe5gcOObrux3lb66+sBqGZrRkMwPgg=
-github.com/launchdarkly/api-client-go/v15 v15.0.0 h1:tA1oYCrId9L9vE8nFtAtlqkYkjPtnlXeXFMqvuezDtA=
-github.com/launchdarkly/api-client-go/v15 v15.0.0/go.mod h1:7dpsX/epfhhRbCv5sEIxKng0xxYbzRYXlp0oJB3+XrQ=
+github.com/launchdarkly/api-client-go/v16 v16.1.1 h1:YkGeHD0Syls1NL+ta6FJOXxkACfT58LPB0itaG29mNk=
+github.com/launchdarkly/api-client-go/v16 v16.1.1/go.mod h1:LTKQebyewnd5lsscGIAjaJEG9TTRD6qglalv+1bixME=
 github.com/ldez/gomoddirectives v0.2.2/go.mod h1:cpgBogWITnCfRq2qGoDkKMEVSaarhdBr6g8G04uz6d0=
 github.com/ldez/tagliatelle v0.3.0/go.mod h1:8s6WJQwEYHbKZDsp/LjArytKOG8qaMrKQQ3mFukHs88=
 github.com/leonklingele/grouper v1.1.0/go.mod h1:uk3I3uDfi9B6PeUjsCKi6ndcf63Uy7snXgR4yDYQVDY=

launchdarkly/approvals_helper.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 )
 
 type approvalSchemaOptions struct {

launchdarkly/clause_helper.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 )
 
 const (

launchdarkly/clause_helper_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

launchdarkly/config.go

@@ -11,7 +11,7 @@ import (
 	"time"
 
 	retryablehttp "github.com/hashicorp/go-retryablehttp"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 )
 
 //nolint:staticcheck // The version string gets updated at build time using -ldflags
@@ -126,12 +126,7 @@ func backOff(min, max time.Duration, attemptNum int, resp *http.Response) time.D
 }
 
 func standardRetryPolicy(ctx context.Context, resp *http.Response, err error) (bool, error) {
-	retry, retryErr := retryablehttp.DefaultRetryPolicy(ctx, resp, err)
-	if !retry && retryErr == nil && err == nil && resp.StatusCode == http.StatusConflict {
-		return true, nil
-	}
-
-	return retry, retryErr
+	return retryablehttp.DefaultRetryPolicy(ctx, resp, err)
 }
 
 // retryPolicyWith404Retries extends our standard retryPolicy but also retries 404s (with exponential backoff).

launchdarkly/config_test.go

@@ -139,77 +139,6 @@ func TestHandleRateLimits(t *testing.T) {
 	})
 }
 
-func TestHandleConflicts(t *testing.T) {
-	t.Run("no retries needed", func(t *testing.T) {
-		t.Parallel()
-		calls := 0
-
-		// create a test server
-		ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			calls++
-			w.WriteHeader(http.StatusOK)
-		}))
-		defer ts.Close()
-
-		// create a client
-		client, err := newClient("token", ts.URL, false, DEFAULT_HTTP_TIMEOUT_S)
-		require.NoError(t, err)
-
-		res, err := client.ld.GetConfig().HTTPClient.Get(ts.URL)
-		require.NoError(t, err)
-		assert.Equal(t, res.StatusCode, http.StatusOK)
-		assert.Equal(t, calls, 1)
-	})
-
-	t.Run("max retries exceeded", func(t *testing.T) {
-		t.Parallel()
-		calls := 0
-
-		// create a test server
-		ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			calls++
-			w.WriteHeader(http.StatusConflict)
-		}))
-		defer ts.Close()
-
-		// create a client
-		client, err := newClient("token", ts.URL, false, DEFAULT_HTTP_TIMEOUT_S)
-		require.NoError(t, err)
-
-		res, err := client.ld.GetConfig().HTTPClient.Get(ts.URL)
-		require.NoError(t, err)
-		assert.Equal(t, res.StatusCode, http.StatusConflict)
-		assert.Equal(t, calls, MAX_RETRIES+1)
-	})
-
-	t.Run("conflict resolved", func(t *testing.T) {
-		t.Parallel()
-		calls := 0
-
-		// create a test server
-		ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			calls++
-
-			if calls == 3 {
-				w.WriteHeader(http.StatusOK)
-				return
-			}
-
-			w.WriteHeader(http.StatusConflict)
-		}))
-		defer ts.Close()
-
-		// create a client
-		client, err := newClient("token", ts.URL, false, DEFAULT_HTTP_TIMEOUT_S)
-		require.NoError(t, err)
-
-		res, err := client.ld.GetConfig().HTTPClient.Get(ts.URL)
-		require.NoError(t, err)
-		assert.Equal(t, res.StatusCode, http.StatusOK)
-		assert.Equal(t, 3, calls)
-	})
-}
-
 func Test404RetryClient(t *testing.T) {
 	t.Run("no retries needed", func(t *testing.T) {
 		t.Parallel()

launchdarkly/custom_properties_helper.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 )
 
 // https://docs.launchdarkly.com/home/connecting/custom-properties

launchdarkly/custom_properties_helper_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 	"github.com/stretchr/testify/require"
 )
 

launchdarkly/data_source_launchdarkly_audit_log_subscription_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 	"github.com/stretchr/testify/require"
 )
 

launchdarkly/data_source_launchdarkly_environment_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 	"github.com/stretchr/testify/require"
 )
 

launchdarkly/data_source_launchdarkly_feature_flag_environment_test.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

launchdarkly/data_source_launchdarkly_feature_flag_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 	"github.com/stretchr/testify/require"
 )
 

launchdarkly/data_source_launchdarkly_flag_trigger_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 	"github.com/stretchr/testify/require"
 )
 

launchdarkly/data_source_launchdarkly_metric_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 	"github.com/stretchr/testify/require"
 )
 

launchdarkly/data_source_launchdarkly_project_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 	"github.com/stretchr/testify/require"
 )
 

launchdarkly/data_source_launchdarkly_relay_proxy_configuration_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 	"github.com/stretchr/testify/require"
 )
 

launchdarkly/data_source_launchdarkly_segment_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 	"github.com/stretchr/testify/require"
 )
 

launchdarkly/data_source_launchdarkly_team_member.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 )
 
 func memberSchema() map[string]*schema.Schema {

launchdarkly/data_source_launchdarkly_team_member_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 	"github.com/stretchr/testify/require"
 )
 

launchdarkly/data_source_launchdarkly_team_members.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 )
 
 func dataSourceTeamMembers() *schema.Resource {

launchdarkly/data_source_launchdarkly_team_members_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 	"github.com/stretchr/testify/require"
 )
 

launchdarkly/data_source_launchdarkly_team_test.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 	"github.com/stretchr/testify/require"
 )
 

launchdarkly/data_source_launchdarkly_webhook_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 	"github.com/stretchr/testify/require"
 )
 

launchdarkly/default_variations_helper.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 )
 
 func defaultVariationsFromResourceData(d *schema.ResourceData) (*ldapi.Defaults, error) {

launchdarkly/default_variations_helper_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

launchdarkly/environments_helper.go

@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 )
 
 type environmentSchemaOptions struct {

launchdarkly/environments_helper_test.go

@@ -3,7 +3,7 @@ package launchdarkly
 import (
 	"testing"
 
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

launchdarkly/fallthrough_helper.go

@@ -6,7 +6,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 )
 
 // In the LD model, this corresponds to the VariationOrRollout type

launchdarkly/feature_flag_environment_helper.go

@@ -10,7 +10,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 )
 
 type featureFlagEnvSchemaOptions struct {

launchdarkly/feature_flags_helper.go

@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 )
 
 type featureFlagSchemaOptions struct {

launchdarkly/helper.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 )
 
 var randomRetrySleepSeeded = false

launchdarkly/metrics_helper.go

@@ -10,7 +10,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 )
 
 func baseMetricSchema(isDataSource bool) map[string]*schema.Schema {

launchdarkly/policies_helper.go

@@ -5,7 +5,7 @@ import (
 	"sort"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	ldapi "github.com/launchdarkly/api-client-go/v15"
+	ldapi "github.com/launchdarkly/api-client-go/v16"
 )
 
 func policyArraySchema() *schema.Schema {