prepare 2.10.0 release

.circleci/config.yml

@@ -59,7 +59,7 @@ jobs:
           command: TESTARGS="-run TestAccEnvironment" make testacc-with-retry
       - run:
           name: Test Feature Flag Resource
-          command: TESTARGS="-run TestAccFeatureFlag" make testacc-with-retry
+          command: TESTARGS="-run TestAccFeatureFlag_" make testacc-with-retry
       - run:
           name: Test Feature Flag Environment Resource
           command: TESTARGS="-run TestAccFeatureFlagEnvironment" make testacc-with-retry

.goreleaser.yml

@@ -1,5 +1,10 @@
 # Visit https://goreleaser.com for documentation on how to customize this
 # behavior.
+# TODO: Figure out why this won't grab the correct dir off env
+# dist: {{ .Env.LD_RELEASE_ARTIFACTS_DIR }} // fails with  unmarshal errors: cannot unmarshal !!map into string
+# dist: "{{ .Env.LD_RELEASE_ARTIFACTS_DIR }}" // Doesn't replace the variable with actual value
+# Below is the default that project-releaser sets - we can probably leave this hardcoded for now as it won't change
+dist: /tmp/project-releaser/artifacts
 before:
   hooks:
     # this is just an example and not a requirement for provider building/publishing
@@ -48,7 +53,7 @@ signs:
       - "--detach-sign"
       - "${artifact}"
 release:
-  # Visit your project's GitHub Releases page to publish this release.
-  draft: true
+  # Actually creating the release is handled by project-releaser
+  disable: true
 changelog:
   skip: true

.ldrelease/build.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -ue
+
+echo "Skipping build step as we want to build artifacts after tagging in the publish step"

.ldrelease/config.yml

@@ -0,0 +1,18 @@
+version: 2
+
+repo:
+  public: terraform-provider-launchdarkly
+  private: terraform-provider-launchdarkly-private
+
+jobs:
+  - docker:
+      image: golang:1.18-buster
+      copyGitHistory: true
+    template:
+      name: go
+      # We run the tests as part of every merge
+      skip:
+        - test
+
+branches:
+  - name: main

.ldrelease/prepare.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -ue
+# Prep for getting goreleaser
+echo 'deb [trusted=yes] https://repo.goreleaser.com/apt/ /' | tee /etc/apt/sources.list.d/goreleaser.list
+apt-get update
+# Get goreleaser and gnupg
+apt-get install -y --no-install-recommends \
+    goreleaser \
+    gnupg \
+; \
+
+# Get GPG Key
+echo -e "$(cat "${LD_RELEASE_SECRETS_DIR}/gpg_private_key")" | gpg --import --batch --no-tty
+echo "hello world" > temp.txt
+gpg --detach-sig --yes -v --output=/dev/null --pinentry-mode loopback --passphrase "$(cat "${LD_RELEASE_SECRETS_DIR}/gpg_passphrase")" temp.txt
+rm temp.txt
+# Set it to env
+export GPG_FINGERPRINT=$(gpg --with-colons --list-keys | awk -F: '/^pub/ { print $5 }')

.ldrelease/publish-dry-run.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -ue
+
+# Run goreleaser
+# We can't run in the build step, as project-releaser only tags the commit after the build step finishes and goreleaser pulls the tag off the most recent commit
+GPG_FINGERPRINT=$(gpg --with-colons --list-keys | awk -F: '/^pub/ { print $5 }') GITHUB_TOKEN="$(cat "${LD_RELEASE_SECRETS_DIR}/github_token")" LD_RELEASE_ARTIFACTS_DIR="${LD_RELEASE_ARTIFACTS_DIR}" goreleaser release --clean --snapshot
+
+# Remove extra files that we don't want in our release
+rm /tmp/project-releaser/artifacts/artifacts.json
+rm /tmp/project-releaser/artifacts/metadata.json
+rm /tmp/project-releaser/artifacts/config.yaml
+# Remove the binaries themselves as goreleaser puts them in subfolders
+# We only want to keep the .zip files to release
+rm -rf /tmp/project-releaser/artifacts/*/

.ldrelease/publish.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -ue
+
+# Run goreleaser
+# We can't run in the build step, as project-releaser only tags the commit after the build step finishes and goreleaser pulls the tag off the most recent commit
+GPG_FINGERPRINT=$(gpg --with-colons --list-keys | awk -F: '/^pub/ { print $5 }') GITHUB_TOKEN="$(cat "${LD_RELEASE_SECRETS_DIR}/github_token")" goreleaser release --clean --release-notes ../entry.tmp
+
+# Remove extra files that we don't want in our release
+rm /tmp/project-releaser/artifacts/artifacts.json
+rm /tmp/project-releaser/artifacts/metadata.json
+rm /tmp/project-releaser/artifacts/config.yaml
+# Remove the binaries themselves as goreleaser puts them in subfolders
+# We only want to keep the .zip files to release
+rm -rf /tmp/project-releaser/artifacts/*/

.ldrelease/secrets.properties

@@ -0,0 +1,4 @@
+gpg_private_key=blob:/terraform-provider/private.pgp
+gpg_passphrase=param:/production/common/releasing/terraform-provider/gpg-passphrase
+# This token is the default config token for the releaser, set in it's releaser.conf
+github_token=param:/staging/common/services/github/releaser_access_token

CHANGELOG.md

@@ -1,3 +1,22 @@
+## [2.10.0] - 2023-02-27
+FEATURES:
+- Adds the optional `description` argument to the nested `rules` blocks on the `launchdarkly_feature_flag_environment` resource and data source.
+
+BUG FIXES: 
+
+- Fixes an issue on the `launchdarkly_feature_flag` resource affecting some customers where the `client_side_availability` property would sometimes unexpectedly update. Also updates the behavior of that field to not default back to project defaults even if removed, in keeping with [the behavior of the LaunchDarkly API](https://docs.launchdarkly.com/home/organize/projects/?q=project#project-flag-defaults). If a feature flag resource is created for the first time without `client_side_availability` set, it will be set to the project defaults.
+
+## [2.9.5] - 2023-01-30
+
+BUG FIXES:
+
+- Fixes a bug that allowed target blocks to be defined with no values in Terraform, resulting in a plan differential post-apply. A minimum of 1 item has been applied to the `values` field of `launchdarkly_feature_flag_environment` resource blocks.
+
+NOTES:
+
+- Adds a note to the `launchdarkly_feature_flag_environment` documentation to recommend against usage with experimentation.
+- Updates links to LaunchDarkly product and REST API documentation.
+
 ## [2.9.4] (October 26, 2022)
 
 BUG FIXES:
@@ -10,7 +29,7 @@ BUG FIXES:
 BUG FIXES:
 
 - Correctly set bucketBy to nil when explicitly set to an empty string to avoid API errors [#120](https://github.com/launchdarkly/terraform-provider-launchdarkly/issues/120)
-- Print error message from API response for Teams resource
+- Print error message from API response for `launchdarkly_team` resource
 
 NOTES:
 

GNUmakefile

@@ -20,10 +20,7 @@ testacc: fmtcheck
 	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m
 
 testacc-with-retry: fmtcheck
-	make testacc; if [ $$? -eq 1 ]; then \
-		printf "\n\nRetrying failed test\n\n"; \
-		make testacc; \
-	fi
+	make testacc || make testacc
 
 vet:
 	@echo "go vet ."

go.mod

@@ -53,8 +53,8 @@ require (
 	golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e // 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
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3 // indirect
 	google.golang.org/grpc v1.46.0 // indirect

go.sum

@@ -440,8 +440,8 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 h1:nonptSpoQ4vQjyraW20DXPAglgQfVnM9ZC6MmNLMR60=
-golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -451,8 +451,9 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

launchdarkly/audit_log_subscription_configs_generated.go

@@ -3,6 +3,32 @@
 package launchdarkly
 
 var SUBSCRIPTION_CONFIGURATION_FIELDS = map[string]IntegrationConfig{
+	"cloudtrail": {
+		"accountId": {
+			AllowedValues: []string{},
+			DefaultValue:  "",
+			Description:   "Enter your [AWS account ID](https://docs.aws.amazon.com/IAM/latest/UserGuide/console_account-alias.html#FindingYourAWSId). The associated account must be configured to use CloudTrail Lake.",
+			IsOptional:    true,
+			IsSecret:      false,
+			Type:          "string",
+		},
+		"externalId": {
+			AllowedValues: []string{},
+			DefaultValue:  nil,
+			Description:   "Use this [external id](https://docs.launchdarkly.com/integrations/cloudtrail) for your resource policy when setting up the integration in the AWS Console.",
+			IsOptional:    false,
+			IsSecret:      false,
+			Type:          "generated",
+		},
+		"ingestionChannelArn": {
+			AllowedValues: []string{},
+			DefaultValue:  nil,
+			Description:   "Enter the Channel ARN for LaunchDarkly to use.",
+			IsOptional:    false,
+			IsSecret:      false,
+			Type:          "string",
+		},
+	},
 	"datadog": {
 		"apiKey": {
 			AllowedValues: []string{},

launchdarkly/custom_properties_helper.go

@@ -9,7 +9,7 @@ import (
 	ldapi "github.com/launchdarkly/api-client-go/v10"
 )
 
-// https://docs.launchdarkly.com/docs/custom-properties
+// https://docs.launchdarkly.com/home/connecting/custom-properties
 const CUSTOM_PROPERTY_CHAR_LIMIT = 64
 const CUSTOM_PROPERTY_ITEM_LIMIT = 64
 

launchdarkly/data_source_launchdarkly_feature_flag_environment_test.go

@@ -93,7 +93,8 @@ func TestAccDataSourceFeatureFlagEnvironment_exists(t *testing.T) {
 
 	rules := []rule{
 		{
-			Variation: intPtr(1),
+			Description: strPtr("test rule"),
+			Variation:   intPtr(1),
 			Clauses: []ldapi.Clause{
 				{
 					Attribute: "thing",
@@ -155,6 +156,7 @@ func TestAccDataSourceFeatureFlagEnvironment_exists(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, ENV_KEY, envKey),
 					resource.TestCheckResourceAttr(resourceName, ON, fmt.Sprint(thisConfig.On)),
 					resource.TestCheckResourceAttr(resourceName, TRACK_EVENTS, fmt.Sprint(thisConfig.TrackEvents)),
+					resource.TestCheckResourceAttr(resourceName, "rules.0.description", *thisConfig.Rules[0].Description),
 					resource.TestCheckResourceAttr(resourceName, "rules.0.variation", fmt.Sprint(*thisConfig.Rules[0].Variation)),
 					resource.TestCheckResourceAttr(resourceName, "rules.0.clauses.0.attribute", thisConfig.Rules[0].Clauses[0].Attribute),
 					resource.TestCheckResourceAttr(resourceName, "rules.0.clauses.0.op", thisConfig.Rules[0].Clauses[0].Op),

launchdarkly/data_source_launchdarkly_team_test.go

@@ -7,14 +7,15 @@ import (
 	"regexp"
 	"testing"
 
+	"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/v10"
 	"github.com/stretchr/testify/require"
 )
 
 func testAccDataSourceTeamConfig(teamKey string) string {
 	return fmt.Sprintf(`
-data "launchdarkly_team" "chicken-nugget" {
+data "launchdarkly_team" "test" {
   key = "%s"
 }
 `, teamKey)
@@ -66,11 +67,11 @@ func TestAccDataSourceTeam_exists(t *testing.T) {
 	// Populate account with dummy team
 	client, err := newClient(os.Getenv(LAUNCHDARKLY_ACCESS_TOKEN), os.Getenv(LAUNCHDARKLY_API_HOST), false)
 	require.NoError(t, err)
-	teamKey := "chicken-nugget"
+	teamKey := acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)
 	team, createErr := testAccDataSourceTeamCreate(client, teamKey)
 	require.NoError(t, createErr)
 
-	resourceName := fmt.Sprintf("data.launchdarkly_team.%s", teamKey)
+	resourceName := "data.launchdarkly_team.test"
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
 			testAccPreCheck(t)

launchdarkly/environments_helper.go

@@ -43,7 +43,7 @@ func baseEnvironmentSchema(forProject bool) map[string]*schema.Schema {
 			Type:     schema.TypeInt,
 			Optional: true,
 			Default:  0,
-			// Default TTL should be between 0 and 60 minutes: https://docs.launchdarkly.com/docs/environments
+			// Default TTL should be between 0 and 60 minutes: https://docs.launchdarkly.com/home/organize/environments#ttl-settings
 			Description:      "The TTL for the environment. This must be between 0 and 60 minutes. The TTL setting only applies to environments using the PHP SDK",
 			ValidateDiagFunc: validation.ToDiagFunc(validation.IntBetween(0, 60)),
 		},