Prepare 2.4.0 release

.circleci/config.yml

@@ -3,19 +3,17 @@ version: 2.1
 
 orbs:
   go: circleci/[email protected]
+  linter: talkiq/[email protected]
 
 jobs:
-  build:
+  test:
     executor:
       name: go/default
-      tag: "1.16"
+      tag: &go_version "1.16.10"
 
     steps:
       - checkout
       - go/mod-download-cached
-      - run:
-          name: go vet
-          command: make vet
       - run:
           name: Run unit tests
           command: TESTARGS="-v" make test
@@ -25,6 +23,9 @@ jobs:
       - run:
           name: Test Access Token Resource
           command: TESTARGS="-run TestAccAccessToken" make testacc
+      - run:
+          name: Test Audit Log Subscription Resource
+          command: TESTARGS="-run TestAccAuditLogSubscription" make testacc
       - run:
           name: Test Custom Role Resource
           command: TESTARGS="-run TestAccCustomRole" make testacc
@@ -40,9 +41,18 @@ jobs:
       - run:
           name: Test Feature Flag Environment Resource
           command: TESTARGS="-run TestAccFeatureFlagEnvironment" make testacc
+      - run:
+          name: Test Flag Trigger Resource
+          command: TESTARGS="-run TestAccFlagTrigger" make testacc
+      - run:
+          name: Test Metric Resource
+          command: TESTARGS="-run TestAccMetric" make testacc
       - run:
           name: Test Project Resource
           command: TESTARGS="-run TestAccProject" make testacc
+      - run:
+          name: Test Relay Proxy Configuration Resource
+          command: TESTARGS="-run TestAccRelayProxy" make testacc
       - run:
           name: Test Segment Resource
           command: TESTARGS="-run TestAccSegment" make testacc
@@ -57,7 +67,22 @@ jobs:
           name: Test Webhook Resource
           command: TESTARGS="-run TestAccWebhook" make testacc
 
+  lint:
+    executor:
+      name: go/default
+      tag: *go_version
+
+    steps:
+      - checkout
+      - run:
+          name: Install python
+          command: |
+            sudo apt update
+            sudo apt install python3-pip python-is-python3
+      - linter/pre-commit
+
 workflows:
   main:
     jobs:
-      - build
+      - test
+      - lint

.go-version

@@ -0,0 +1 @@
+1.16.10

.pre-commit-config.yaml

@@ -0,0 +1,22 @@
+minimum_pre_commit_version: "2.9.3"
+
+repos:
+  - repo: https://github.com/ashanbrown/gofmts
+    rev: v0.1.4
+    hooks:
+      - id: gofmts
+  - repo: https://github.com/golangci/golangci-lint
+    rev: v1.43.0
+    hooks:
+      - id: golangci-lint
+  - repo: local
+    hooks:
+      - id: generate-audit-log-subscription-configs
+        name: Generate Audit Log Subscription Configurations
+        description: This hook runs a python script to update the audit log subscription configuration validation fields.
+        entry: python scripts/generate_integration_audit_log_configs.py
+        pass_filenames: false
+        language: python
+        additional_dependencies: ['requests']
+        verbose: true
+

CHANGELOG.md

@@ -1,3 +1,25 @@
+## [2.4.0] (January 19, 2022)
+
+FEATURES:
+
+- Added a `launchdarkly_team_members` data source to allow using multiple team members in one data source.
+
+- Added a new `launchdarkly_metric` resource and data source for managing LaunchDarkly experiment flag metrics.
+
+- Added a new `launchdarkly_flag_triggers` resource and data source for managing LaunchDarkly flag triggers.
+
+- Added a new `launchdarkly_relay_proxy_configuration` resource and data source for managing configurations for the Relay Proxy's [automatic configuration](https://docs.launchdarkly.com/home/relay-proxy/automatic-configuration#writing-an-inline-policy) feature.
+
+- Added a new `launchdarkly_audit_log_subscription` resource and data source for managing LaunchDarkly audit log integration subscriptions.
+
+ENHANCEMENTS:
+
+- Updated tests to use the constant attribute keys defined in launchdarkly/keys.go.
+
+- Added a pre-commit file with a hook to alphabetize launchdarkly/keys.go
+
+- Improved 409 and 429 retry handling.
+
 ## [2.3.0] (January 4, 2022)
 
 FEATURES:
@@ -29,6 +51,14 @@ NOTES:
 
 - The `launchdarkly_feature_flag` resource's argument `include_in_snippet` has been deprecated in favor of `client_side_availability`. Please update your config to use `client_side_availability` in order to maintain compatibility with future versions.
 
+ENHANCEMENTS:
+
+- Upgraded the LaunchDarkly API client to version 7.
+
+=======
+
+> > > > > > > 8c7d0fc67b7d6038363a5a9c20ff8a5ef0f364df
+
 ## [2.1.1] (October 11, 2021)
 
 BUG FIXES:

GNUmakefile

@@ -29,6 +29,8 @@ vet:
 	fi
 
 fmt:
+	go install github.com/ashanbrown/gofmts/cmd/[email protected]
+	gofmts -w $(GOFMT_FILES)
 	gofmt -w $(GOFMT_FILES)
 
 fmtcheck:

docs/DEVELOPMENT.md

@@ -20,6 +20,8 @@ $ mkdir -p $HOME/development/terraform-providers/; cd $HOME/development/terrafor
 $ git clone [email protected]:launchdarkly/terraform-provider-launchdarkly
 ```
 
+If you are working on the `launchdarkly_audit_log_subscription` resource, you will want to ensure the configuration field mapping is up-to-date with the [most recent changes](https://github.com/launchdarkly/integration-framework/tree/master/integrations) while testing by `cd`-ing into `scripts/` and running `python generate_integration_audit_log_configs.py`. Please note you will need to have the Python `requests` package installed locally. Otherwise, this will be run as a git commit hook. Then, to update the go mapping, follow the instructions in audit_log_subscription_configs.go and commit and push your changes.
+
 To compile the provider, run `make build`. This will build the provider and put the provider binary in the `$GOPATH/bin` directory.
 
 ```sh

examples/v2/audit_log_subscription/example.tf

@@ -0,0 +1,60 @@
+terraform {
+  required_providers {
+    launchdarkly = {
+      source  = "launchdarkly/launchdarkly"
+      version = "~> 2.0"
+    }
+  }
+  required_version = ">= 0.13"
+}
+
+resource "launchdarkly_audit_log_subscription" "datadog_example" {
+  integration_key = "datadog"
+  name            = "Example Terraform Subscription"
+  config = {
+    api_key  = "thisisasecretkey"
+    host_url = "https://api.datadoghq.com"
+  }
+  on   = false
+  tags = ["terraform-managed"]
+  statements {
+    actions   = ["*"]
+    effect    = "deny"
+    resources = ["proj/*:env/*:flag/*"]
+  }
+}
+
+resource "launchdarkly_audit_log_subscription" "dynatrace_example" {
+  integration_key = "dynatrace"
+  name            = "Example Terraform Subscription"
+  config = {
+    api_token = "verysecrettoken"
+    url       = "https://launchdarkly.appdynamics.com"
+    entity    = "APPLICATION_METHOD"
+  }
+  tags = ["terraform-managed"]
+  on   = true
+  statements {
+    actions   = ["*"]
+    effect    = "deny"
+    resources = ["proj/*:env/test:flag/*"]
+  }
+}
+
+resource "launchdarkly_audit_log_subscription" "splunk_example" {
+  integration_key = "splunk"
+  name            = "Example Terraform Subscription"
+  config = {
+    base_url             = "https://launchdarkly.splunk.com"
+    token                = "averysecrettoken"
+    skip_ca_verification = true
+  }
+  tags = ["terraform-managed"]
+  on   = true
+  statements {
+    actions   = ["*"]
+    effect    = "allow"
+    resources = ["proj/*:env/production:flag/*"]
+  }
+}
+

examples/v2/flag_trigger/example.tf

@@ -0,0 +1,39 @@
+terraform {
+  required_providers {
+    launchdarkly = {
+      source  = "launchdarkly/launchdarkly"
+      version = "~> 2.0"
+    }
+  }
+  required_version = ">= 0.13"
+}
+
+resource "launchdarkly_project" "trigger_test" {
+  key  = "trigger-test"
+  name = "A Trigger Test Project"
+  # configure a production environment
+  environments {
+    name  = "Terraform Production Environment"
+    key   = "production"
+    color = "581845"
+  }
+}
+
+resource "launchdarkly_feature_flag" "trigger_test_flag" {
+  project_key = launchdarkly_project.trigger_test.key
+  key         = "trigger-test-flag"
+  name        = "Trigger Test Flag"
+
+  variation_type = "boolean"
+}
+
+resource "launchdarkly_flag_trigger" "test_trigger" {
+  project_key     = launchdarkly_project.trigger_test.key
+  env_key         = launchdarkly_project.trigger_test.environments.0.key
+  flag_key        = launchdarkly_feature_flag.trigger_test_flag.key
+  integration_key = "generic-trigger"
+  instructions {
+    kind = "turnFlagOff"
+  }
+  enabled = false
+}

examples/v2/metric/example.tf

@@ -0,0 +1,72 @@
+resource "launchdarkly_project" "example" {
+  key  = "example-project"
+  name = "metrics example project"
+  environments {
+    name  = "example environment"
+    key   = "example-env"
+    color = "010101"
+  }
+}
+
+resource "launchdarkly_metric" "pageview_example" {
+  project_key    = launchdarkly_project.example.key
+  key            = "pageview-metric"
+  name           = "Pageview Metric"
+  description    = "example pageview metric"
+  kind           = "pageview"
+  is_active      = false
+  tags           = [
+    "example",
+  ]
+  urls {
+    kind = "substring"
+    substring = "foo"
+  }
+  urls {
+    kind = "regex"
+    pattern = "`foo`gm"
+  }
+}
+
+resource "launchdarkly_metric" "click_example" {
+  project_key    = launchdarkly_project.example.key
+  key            = "click-metric"
+  name           = "click Metric"
+  description    = "example click metric"
+  kind           = "click"
+  selector       = ".foo"
+  tags           = [
+    "example",
+  ]
+  urls {
+    kind = "exact"
+    url = "https://example.com/example/"
+  }
+}
+
+resource "launchdarkly_metric" "custom_example" {
+  project_key    = launchdarkly_project.example.key
+  key            = "custom-metric"
+  name           = "custom Metric"
+  description    = "example custom metric"
+  kind           = "custom"
+  event_key      = "foo"
+  tags           = [
+    "example",
+  ]
+}
+
+resource "launchdarkly_metric" "numeric_example" {
+  project_key      = launchdarkly_project.example.key
+  key              = "numeric-metric"
+  name             = "numeric Metric"
+  description      = "example numeric metric"
+  kind             = "custom"
+  is_numeric       = true
+  unit             = "bar"
+  success_criteria = "HigherThanBaseline"
+  event_key        = "foo"
+  tags             = [
+    "example",
+  ]
+}

examples/v2/metric/versions.tf

@@ -0,0 +1,9 @@
+terraform {
+  required_providers {
+    launchdarkly = {
+      source  = "launchdarkly/launchdarkly"
+      version = "~> 2.0.0"
+    }
+  }
+  required_version = ">= 0.13"
+}

go.mod

@@ -6,17 +6,20 @@ require (
 	github.com/agext/levenshtein v1.2.3 // indirect
 	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/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect
-	github.com/launchdarkly/api-client-go/v7 v7.0.0
+	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