Merge remote-tracking branch public/main into release-2.6.1

launchdarkly · Apr 14, 2022 · 0c7a533 · 0c7a533
1 parent 1293654
commit 0c7a533
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/examples/v2/feature_flags/setup.tf b/examples/v2/feature_flags/setup.tf
@@ -17,6 +17,11 @@ resource "launchdarkly_project" "tf_flag_examples" {
     name = "example environment"
     key = "example-env"
     color = "ababab"
+    # You can configure approval settings per environment to control who can apply flag changes
+    approval_settings {
+      min_num_approvals = 2
+      required = true
+    }
   }
 
   tags = [

diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown
@@ -43,7 +43,7 @@ Please refer to [Terraform's documentation on upgrading to v0.13](https://www.te
 
 The provider supports the following arguments:
 
-- `access_token` - (Optional) The [personal access token](https://docs.launchdarkly.com/docs/api-access-tokens) you use to authenticate with LaunchDarkly. You can also set this with the `LAUNCHDARKLY_ACCESS_TOKEN` environment variable. You must provide either `access_token` or `oauth_token`.
+- `access_token` - (Optional) The [personal access token](https://docs.launchdarkly.com/api-access-tokens) or [service token](https://docs.launchdarkly.com/home/account-security/api-access-tokens#service-tokens) used to authenticate with LaunchDarkly. You can also set this with the `LAUNCHDARKLY_ACCESS_TOKEN` environment variable. You must provide either `access_token` or `oauth_token`.
 
 - `oauth_token` - (Optional) An OAuth V2 token you use to authenticate with LaunchDarkly. You can also set this with the `LAUNCHDARKLY_OAUTH_TOKEN` environment variable. You must provide either `access_token` or `oauth_token`.