Prepare 2.7.1 release

.circleci/config.yml

@@ -31,7 +31,7 @@ jobs:
 
     environment:
       # sc-146360 - overrides the default timeout of 3000ms when reaching checkpoint-api.hashicorp.com
-      CHECKPOINT_TIMEOUT: 10000
+      CHECKPOINT_TIMEOUT: 15000
 
     steps:
       - checkout

CHANGELOG.md

@@ -1,4 +1,10 @@
-## [2.7.0] (Unreleased)
+## [2.7.1] (July 21, 2022)
+
+BUG FIXES:
+
+- Datasource `launchdarkly_feature_flag_environment` now checks whether the environment exists and print out a more descriptive error.
+
+## [2.7.0] (May 5, 2022)
 
 FEATURES:
 

go.mod

@@ -7,26 +7,21 @@ require (
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
-	github.com/hashicorp/go-hclog v1.0.0 // indirect
-	github.com/hashicorp/go-plugin v1.4.3 // indirect
-	github.com/hashicorp/go-retryablehttp v0.7.0
-	github.com/hashicorp/hcl/v2 v2.11.1 // indirect
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.10.0
-	github.com/hashicorp/terraform-registry-address v0.0.0-20210816115301-cb2034eba045 // indirect
+	github.com/hashicorp/go-plugin v1.4.4 // indirect
+	github.com/hashicorp/go-retryablehttp v0.7.1
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.16.0
+	github.com/hashicorp/terraform-registry-address v0.0.0-20220510144317-d78f4a47ae27 // indirect
 	github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect
 	github.com/launchdarkly/api-client-go/v7 v7.1.1
 	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
-	github.com/mitchellh/mapstructure v1.4.3 // indirect
 	github.com/oklog/run v1.1.0 // indirect
 	github.com/stoewer/go-strcase v1.2.0
 	github.com/stretchr/testify v1.7.0
-	github.com/zclconf/go-cty v1.10.0 // indirect
-	golang.org/x/net v0.0.0-20211208012354-db4efeb81f4b // indirect
-	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
-	golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect
-	golang.org/x/text v0.3.7 // indirect
+	github.com/vmihailenco/tagparser v0.1.2 // indirect
+	golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 // indirect
+	golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
+	golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
-	google.golang.org/grpc v1.42.0 // indirect
+	google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3 // indirect
 )

launchdarkly/feature_flag_environment_helper.go

@@ -70,6 +70,22 @@ func featureFlagEnvironmentRead(ctx context.Context, d *schema.ResourceData, raw
 	}
 	envKey := d.Get(ENV_KEY).(string)
 
+	envExists, err := environmentExists(projectKey, envKey, client)
+
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	if !envExists {
+		log.Printf("[WARN] failed to find environment %q in project %q, removing from state", envKey, projectKey)
+		diags = append(diags, diag.Diagnostic{
+			Severity: diag.Warning,
+			Summary:  fmt.Sprintf("[WARN] failed to find environment %q in project %q, removing from state", envKey, projectKey),
+		})
+		d.SetId("")
+		return diags
+	}
+
 	flag, res, err := getFeatureFlagEnvironment(client, projectKey, flagKey, envKey)
 	if isStatusNotFound(res) && !isDataSource {
 		log.Printf("[WARN] failed to find flag %q in project %q, removing from state", flagKey, projectKey)

launchdarkly/resource_launchdarkly_environment_test.go

@@ -299,7 +299,7 @@ func TestAccEnvironmentWithApprovals(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "approval_settings.0.can_review_own_request", "true"),
 					resource.TestCheckResourceAttr(resourceName, "approval_settings.0.can_apply_declined_changes", "false"),
 					resource.TestCheckResourceAttr(resourceName, "approval_settings.0.min_num_approvals", "1"),
-					resource.TestCheckNoResourceAttr(resourceName, "approval_settings.0.required_approval_tags"),
+					resource.TestCheckNoResourceAttr(resourceName, "approval_settings.0.required_approval_tags.#"),
 				),
 			},
 			{
@@ -316,7 +316,7 @@ func TestAccEnvironmentWithApprovals(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, KEY, "approvals-test"),
 					resource.TestCheckResourceAttr(resourceName, COLOR, "bababa"),
 					resource.TestCheckResourceAttr(resourceName, PROJECT_KEY, projectKey),
-					resource.TestCheckNoResourceAttr(resourceName, APPROVAL_SETTINGS),
+					resource.TestCheckNoResourceAttr(resourceName, fmt.Sprintf("%s.%%", APPROVAL_SETTINGS)),
 				),
 			},
 		},

launchdarkly/resource_launchdarkly_feature_flag_environment_test.go

@@ -401,11 +401,11 @@ func TestAccFeatureFlagEnvironment_Empty(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, OFF_VARIATION, "2"),
 					resource.TestCheckResourceAttr(resourceName, "fallthrough.0.variation", "0"),
 					resource.TestCheckResourceAttr(resourceName, TRACK_EVENTS, "false"),
-					resource.TestCheckNoResourceAttr(resourceName, RULES),
+					resource.TestCheckNoResourceAttr(resourceName, fmt.Sprintf("%s.0", RULES)),
 					resource.TestCheckNoResourceAttr(resourceName, "rules.#"),
-					resource.TestCheckNoResourceAttr(resourceName, PREREQUISITES),
+					resource.TestCheckNoResourceAttr(resourceName, fmt.Sprintf("%s.0", PREREQUISITES)),
 					resource.TestCheckNoResourceAttr(resourceName, "prerequisites.#"),
-					resource.TestCheckNoResourceAttr(resourceName, TARGETS),
+					resource.TestCheckNoResourceAttr(resourceName, fmt.Sprintf("%s.0", TARGETS)),
 					resource.TestCheckNoResourceAttr(resourceName, "targets.#"),
 				),
 			},

launchdarkly/resource_launchdarkly_project_test.go

@@ -228,7 +228,6 @@ func TestAccProject_Update(t *testing.T) {
 					testAccCheckProjectExists(resourceName),
 					resource.TestCheckResourceAttr(resourceName, KEY, projectKey),
 					resource.TestCheckResourceAttr(resourceName, NAME, "awesome test project"),
-					resource.TestCheckNoResourceAttr(resourceName, "tags"),
 					resource.TestCheckNoResourceAttr(resourceName, "tags.#"),
 					resource.TestCheckResourceAttr(resourceName, INCLUDE_IN_SNIPPET, "false"),
 				),

launchdarkly/resource_launchdarkly_segment_test.go

@@ -208,7 +208,7 @@ func TestAccSegment_Update(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "excluded.#", "2"),
 					resource.TestCheckResourceAttr(resourceName, "excluded.0", "user3"),
 					resource.TestCheckResourceAttr(resourceName, "excluded.1", "user4"),
-					resource.TestCheckNoResourceAttr(resourceName, RULES),
+					resource.TestCheckNoResourceAttr(resourceName, fmt.Sprintf("%s.#", RULES)),
 				),
 			},
 			{

launchdarkly/variations_helper.go

@@ -3,7 +3,6 @@ package launchdarkly
 import (
 	"encoding/json"
 	"fmt"
-	"reflect"
 	"strconv"
 	"strings"
 
@@ -307,7 +306,7 @@ func variationsToVariationType(variations []ldapi.Variation) (string, error) {
 	case map[string]interface{}, []interface{}:
 		variationType = JSON_VARIATION
 	default:
-		return "", fmt.Errorf("unknown variation type: %q", reflect.TypeOf(variationValue))
+		return "", fmt.Errorf("unknown variation type: %T", variationValue)
 	}
 	return variationType, nil
 }