prepare 1.5.0 release

.circleci/config.yml

@@ -0,0 +1,73 @@
+# Golang CircleCI 2.0 configuration file for terraform-provider-launchdarkly-private tests
+#
+# Check https://circleci.com/docs/2.0/language-go/ for more details
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/golang:1.14
+
+    working_directory: /go/src/github.com/launchdarkly/terraform-provider-launchdarkly-private
+    steps:
+      - checkout
+      - run:
+          name: go vet
+          command: make vet
+      - run: 
+          name: Test Custom Properties
+          command: TESTARGS="-run TestCustomProperties" make testacc
+      - run:
+          name: Test Data Sources
+          command: TESTARGS="-run TestAccDataSource" make testacc
+      - run:
+          name: Test Default Variations
+          command: TESTARGS="-run TestDefaultVariations" make testacc
+      - run:
+          name: Test Environment Helper
+          command: TESTARGS="-run TestEnvironmentPost" make testacc
+      - run:
+          name: Test Target Helper
+          command: TESTARGS="-run TestTargets" make testacc
+      - run:
+          name: Test Variations Helper
+          command: TESTARGS="-run TestVariations" make testacc
+      - run:
+          name: Test Handlers
+          command: TESTARGS="-run TestHandle" make testacc
+      - run:
+          name: Test Policy Statements
+          command: TESTARGS="-run TestPolicyStatement" make testacc
+      - run:
+          name: Test Access Token Resource
+          command: TESTARGS="-run TestAccAccessToken" make testacc
+      - run:
+          name: Test Custom Role Resource
+          command: TESTARGS="-run TestAccCustomRole" make testacc
+      - run:
+          name: Test Destination Resource
+          command: TESTARGS="-run TestAccDestination" make testacc
+      - run:
+          name: Test Environment Resource
+          command: TESTARGS="-run TestAccEnvironment" make testacc
+      - run:
+          name: Test Feature Flag Resource
+          command: TESTARGS="-run TestAccFeatureFlag" make testacc
+      - run:
+          name: Test Feature Flag Environment Resource
+          command: TESTARGS="-run TestAccFeatureFlagEnvironment" make testacc
+      - run:
+          name: Test Project Resource
+          command: TESTARGS="-run TestAccProject" make testacc
+      - run:
+          name: Test Segment Resource
+          command: TESTARGS="-run TestAccSegment" make testacc
+      - run: 
+          name: Test Team Members
+          command: |
+            TESTARGS="-run TestAccTeamMember_CreateGeneric" make testacc
+            TESTARGS="-run TestAccTeamMember_UpdateGeneric" make testacc
+            TESTARGS="-run TestAccTeamMember_CreateWithCustomRole" make testacc
+            TESTARGS="-run TestAccTeamMember_UpdateWithCustomRole" make testacc
+      - run:
+          name: Test Webhook Resource
+          command: TESTARGS="-run TestAccWebhook" make testacc

CHANGELOG.md

@@ -1,3 +1,33 @@
+## [1.5.0] (September 29, 2020)
+
+FEATURES:
+
+- Added a `launchdarkly_project` data source.
+
+- Added a `launchdarkly_environment` data source.
+
+- Added a `launchdarkly_feature_flag` data source.
+
+- Added a `launchdarkly_feature_flag_environment` data source.
+
+- Added a `launchdarkly_segment` data source.
+
+- Added a `launchdarkly_webhook` data source.
+
+ENHANCEMENTS:
+
+- Upgraded the LaunchDarkly API version to 3.5.0.
+
+BUG FIXES:
+
+- Resolved issues with the `launchdarkly_project`'s `environments` attribute. This attribute is no longer marked as deprecated and should be used when you wish to override the behavior of creating `Test` and `Production` environments during project creation.
+
+- Fixed a bug where creating a `launchdarkly_feature_flag_environment` with an `off_variation` was not actually setting the off variation.
+
+NOTES:
+
+- The `launchdarkly_project`'s `environments` attribute is no longer marked as `computed`. This means that if you have `launchdarkly_project` resources without nested `environments` that were created before this version, you will see a diff denoting the removal of the computed environments from your state. It is safe to apply this change as no changes be made to your LaunchDarkly resources when applied.
+
 ## [1.4.1] (September 8, 2020)
 
 FEATURES:

examples/multiple_projects/README.md

@@ -1,19 +1,20 @@
 ## Example: Configure multiple LaunchDarkly projects
 
 ### Introduction
+
 LaunchDarkly projects allow you to manage multiple business objectives from a single LaunchDarkly account. Every project has its own unique set of associated environments and feature flags. For more, please see the [LaunchDarkly official documentation](https://docs.launchdarkly.com/home/managing-flags/projects).
 
 This directory contains an example of how one might configure multiple projects, each with their own environments and feature flags, in one go. Specifically, this example will create the following:
+
 - a "Terraform Example Project 1" with the key `tf-project-1` containing:
-    - a "Terraform Test Environment" with key `tf-test`
-    - a "Terraform Production Environment" with key `tf-production`
-    - (automatically-created "Test" and "Production" environments that come with all new projects)
-    - a boolean "Basic feature flag" with key "basic-flag"
-        - a `tf-test`-specific flag configuration attached to the "Basic feature flag" 
+  - a "Terraform Test Environment" with key `tf-test`
+  - a "Terraform Production Environment" with key `tf-production`
+  - a boolean "Basic feature flag" with key "basic-flag"
+    - a `tf-test`-specific flag configuration attached to the "Basic feature flag"
 - a "Terraform Example Project 2" with thte key `tf-project-2` containing:
-    - an "Example Environment A" with key `tf-example-env-a`
-    - an "Example Environment B" with key `tf-example-env-b`
-    - (automatically-created "Test" and "Production" environments that come with all new projects)
+  - an "Example Environment A" with key `tf-example-env-a`
+  - an "Example Environment B" with key `tf-example-env-b`
+  - (automatically-created "Test" and "Production" environments will also be created since this example does not use nested environments in the `launchdarkly_project` resource)
 
 Project 1 also contains an example of a feature flag that is configured differently in different environments using the `launchdarkly_feature_flag_environment` resource. You can see these differences from within the LaunchDarkly UI. When viewing the flag in the `tf_test` environment, the flag will look like this:
 
@@ -23,13 +24,14 @@ From all other environments, it will simply look like this:
 
 ![basic flag](../assets/images/multiple-proj-basic-flag.png)
 
-
 ### Important notes
-- Keep in mind that all new projects will automatically come with 'test' and 'production' environments, so it is redundant to create those! 
+
+- Keep in mind that all new projects that don't use nested `environments` blocks will automatically come with 'test' and 'production' environments, so it may be redundant to create those!
 - Project keys MUST be unique
 - Environment keys must be unique within their given project
 
 ### Run
+
 Init your working directory from the CL with `terraform init` and then apply the changes with `terraform apply`. You should see output resembling the following:
 
 ```
@@ -63,11 +65,13 @@ Plan: 8 to add, 0 to change, 0 to destroy.
 ```
 
 where all of the changes to be made should be described in the format seen above. Terraform will then ask you for your confirmation and then begin applying the changes:
+
 ```
 launchdarkly_project.tf_project_1: Creating...
 launchdarkly_project.tf_project_2: Creating...
 launchdarkly_project.tf_project_2: Creation complete after 0s [id=example-project-2]
 launchdarkly_environment.tf_env_a: Creating...
 launchdarkly_environment.tf_env_b: Creating...
 ```
-etc. Your projects should now be up, running, and accessible from your LaunchDarkly UI.
+
+etc. Your projects should now be up, running, and accessible from your LaunchDarkly UI.

examples/multiple_projects/example.tf

@@ -10,39 +10,35 @@ provider "launchdarkly" {
 # ----------------------------------------------------------------------------------- #
 # PROJECT 1
 
-# create the project
+# create the project with nested environments blocks
 resource "launchdarkly_project" "tf_project_1" {
   key  = "tf-project-1"
   name = "Terraform Example Project 1"
 
   tags = [
     "terraform-managed",
   ]
-}
-
-# create a terraform-specific test environment within project 1
-resource "launchdarkly_environment" "tf_test" {
-  name  = "Terraform Test Environment"
-  key   = "tf-test"
-  color = "999999"
-  tags = [
-    "terraform-managed",
-    "test"
-  ]
-
-  project_key = launchdarkly_project.tf_project_1.key
-}
 
-# create a terraform-specific production environment within project 1
-resource "launchdarkly_environment" "tf_production" {
-  name  = "Terraform Production Environment"
-  key   = "tf-production"
-  color = "333333"
-  tags = [
-    "terraform-managed",
-  ]
+  # create a terraform-specific test environment within the project
+  environments {
+    name  = "Terraform Test Environment"
+    key   = "tf-test"
+    color = "999999"
+    tags = [
+      "terraform-managed",
+      "test"
+    ]
+  }
 
-  project_key = launchdarkly_project.tf_project_1.key
+  # create a terraform-specific production environment within the project
+  environments {
+    name  = "Terraform Production Environment"
+    key   = "tf-production"
+    color = "333333"
+    tags = [
+      "terraform-managed",
+    ]
+  }
 }
 
 # create a basic feature flag within project 1
@@ -58,7 +54,10 @@ resource "launchdarkly_feature_flag" "basic" {
 # the flag will display variation 0 only to users whose country matches "de" or "fr".
 resource "launchdarkly_feature_flag_environment" "basic_variation" {
   flag_id = launchdarkly_feature_flag.basic.id
-  env_key = launchdarkly_environment.tf_test.key
+
+  # since the environment was specified as a nested block in the project resource, the environment
+  # key must be retrieved through the `launchdarkly_project` resource.
+  env_key = launchdarkly_project.tf_project_1.environments.0.key
 
   targeting_enabled = true
 
@@ -78,7 +77,8 @@ resource "launchdarkly_feature_flag_environment" "basic_variation" {
 }
 
 # ----------------------------------------------------------------------------------- #
-# PROJECT 2
+# PROJECT 2 - an example of how to use dedicated `launchdarkly_enviromnent` resources instead
+# of nested environments in the `launchdarkly_project` resource 
 
 resource "launchdarkly_project" "tf_project_2" {
   key  = "tf-project-2"
@@ -110,4 +110,4 @@ resource "launchdarkly_environment" "tf_env_b" {
   ]
 
   project_key = launchdarkly_project.tf_project_2.key
-}
+}

go.mod

@@ -5,6 +5,6 @@ go 1.14
 require (
 	github.com/antihax/optional v1.0.0
 	github.com/hashicorp/terraform-plugin-sdk v1.15.0
-	github.com/launchdarkly/api-client-go v3.2.1-0.20200812163818-441cfcaaa92c+incompatible
+	github.com/launchdarkly/api-client-go v3.5.0+incompatible
 	github.com/stretchr/testify v1.6.1
 )

go.sum

@@ -154,8 +154,8 @@ github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3v
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
 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/launchdarkly/api-client-go v3.2.1-0.20200812163818-441cfcaaa92c+incompatible h1:xWlvqEclZEIAX4+0k2TQZGxgWA4tElgXy/H1XNsD/cQ=
-github.com/launchdarkly/api-client-go v3.2.1-0.20200812163818-441cfcaaa92c+incompatible/go.mod h1:INGa7NUZYSwVozwPV7l6ikgD7pzSOpZvg9I5sqCZIWs=
+github.com/launchdarkly/api-client-go v3.5.0+incompatible h1:b2DN5SjdUZu4tf4AwEEt8BmvC1f1DXI/S+SeruNVbGM=
+github.com/launchdarkly/api-client-go v3.5.0+incompatible/go.mod h1:INGa7NUZYSwVozwPV7l6ikgD7pzSOpZvg9I5sqCZIWs=
 github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg=

launchdarkly/account_cleaner_test.go

@@ -87,7 +87,7 @@ func (c *Client) cleanTeamMembers() error {
 		return handleLdapiErr(err)
 	}
 	for _, m := range members.Items {
-		if *m.Role != ldapi.OWNER_Role {
+		if *m.Role != ldapi.OWNER_Role && m.PendingInvite == true {
 			_, err := c.ld.TeamMembersApi.DeleteMember(c.ctx, m.Id)
 			if err != nil {
 				return handleLdapiErr(err)

launchdarkly/data_source_launchdarkly_environment.go

@@ -0,0 +1,20 @@
+package launchdarkly
+
+import "github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+
+func dataSourceEnvironment() *schema.Resource {
+	envSchema := dataSourceEnvironmentSchema(false)
+	envSchema[PROJECT_KEY] = &schema.Schema{
+		Type:         schema.TypeString,
+		Required:     true,
+		ValidateFunc: validateKey(),
+	}
+	return &schema.Resource{
+		Read:   dataSourceEnvironmentRead,
+		Schema: envSchema,
+	}
+}
+
+func dataSourceEnvironmentRead(d *schema.ResourceData, meta interface{}) error {
+	return environmentRead(d, meta, true)
+}