prepare 2.6.1 release

CHANGELOG.md

@@ -1,4 +1,11 @@
-## [2.5.1] (April 7, 2022)
+## [2.6.1] (April 12, 2022)
+
+NOTES: 
+
+- Removed callout to `bypassRequiredApproval` action in documentation pending further development.
+- Fix formatting in some documentation
+
+## [2.6.0] (April 7, 2022)
 
 ENHANCEMENTS:
 

examples/v2/feature_flags/README.md

@@ -10,10 +10,6 @@ This example contains three config files:
 - [flag_types_example.tf](./flag_types_example.tf), which provides examples of the different ways you can define binary (boolean) and multivariate (string, numeric, and JSON) flag variations using the `launchdarkly_feature_flag` resource
 - [targeting_example.tf](./targeting_example.tf), which provides complex examples of user targeting using the `launchdarkly_feature_flag_environment` resource. For more detail on user targeting, see the [official LaunchDarkly documentation](https://docs.launchdarkly.com/home/managing-flags/targeting-users).
 
-### Bypassing approval requests
-
-If [approval requests are required](https://docs.launchdarkly.com/home/feature-workflows/environment-approvals#configuring-approval-settings) in the feature flag's environment, you can bypass them by adding the [`bypassRequiredApproval` action](https://docs.launchdarkly.com/home/feature-workflows/environment-approvals#bypassing-required-approvals) to the role associated with the LaunchDarkly access token or service token used by the provider.
-
 ### 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:

examples/v2/feature_flags/setup.tf

@@ -18,8 +18,6 @@ resource "launchdarkly_project" "tf_flag_examples" {
     key = "example-env"
     color = "ababab"
     # You can configure approval settings per environment to control who can apply flag changes
-    # Your Terraform user can be configured with a custom role to allow it to bypass approval requirements
-    # See https://docs.launchdarkly.com/home/feature-workflows/environment-approvals#configuring-approval-settings
     approval_settings {
       min_num_approvals = 2
       required = true

website/docs/d/flag_trigger.html.markdown

@@ -30,7 +30,7 @@ data "launchdarkly_flag_trigger" "example" {
 - `id` - (Required) The Terraform trigger ID. This ID takes the following format: `<project_key>/<env_key>/<flag_key>/<trigger_id>`. The unique trigger ID can be found in your saved trigger URL:
 
 ```
-https://app.launchdarkly.com/webhook/triggers/<THIS_IS_YOUR_TRIGGER_ID>/aff25a53-17d9-4112-a9b8-12718d1a2e79
+https://app.launchdarkly.com/webhook/triggers/THIS_IS_YOUR_TRIGGER_ID/aff25a53-17d9-4112-a9b8-12718d1a2e79
 ```
 
 Please note that if you did not save this upon creation of the resource, you will have to reset it to get a new value, which can cause breaking changes.

website/docs/d/relay_proxy_configuration.html.markdown

@@ -31,7 +31,7 @@ resource "launchdarkly_relay_proxy_configuration" "example" {
 - `id` - (Required) The Relay Proxy configuration's unique 24 character ID. The unique relay proxy ID can be found in the relay proxy edit page URL, which you can locate by clicking the three dot menu on your relay proxy item in the UI and selecting 'Edit configuration':
 
 ```
-https://app.launchdarkly.com/settings/relay/<THIS_IS_YOUR_RELAY_PROXY_ID>/edit
+https://app.launchdarkly.com/settings/relay/THIS_IS_YOUR_RELAY_PROXY_ID/edit
 ```
 
 ## Attribute Reference

website/docs/index.html.markdown

@@ -43,8 +43,8 @@ Please refer to [Terraform's documentation on upgrading to v0.13](https://www.te
 
 The provider supports the following arguments:
 
-- `access_token` - (Optional) The [API access token](https://docs.launchdarkly.com/docs/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`.  
-If you want to grant the terraform provider the ability to make flag changes without requesting approval in an environment that is configured to require approvals, you can add the [`bypassRequiredApproval` action](https://docs.launchdarkly.com/home/feature-workflows/environment-approvals#bypassing-required-approvals) to the service token's custom role. To learn about custom role actions, read [Custom role actions](https://docs.launchdarkly.com/home/members/role-actions).
+- `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`.
 

website/docs/r/flag_trigger.html.markdown

@@ -57,13 +57,15 @@ In addition to the above arguments, this resource supports the following compute
 LaunchDarkly flag triggers can be imported using the following syntax:
 
 ```
-$ terraform import launchdarkly_flag_trigger.example <project_key>/<env_key>/<flag_key>/<trigger_id>
+$ terraform import launchdarkly_flag_trigger.example example-project-key/example-env-key/example-flag-key/62581d4488def814b831abc3
 ```
 
+where the string following the final slash is your unique trigger ID.
+
 The unique trigger ID can be found in your saved trigger URL:
 
 ```
-https://app.launchdarkly.com/webhook/triggers/<THIS_IS_YOUR_TRIGGER_ID>/aff25a53-17d9-4112-a9b8-12718d1a2e79
+https://app.launchdarkly.com/webhook/triggers/THIS_IS_YOUR_TRIGGER_ID/aff25a53-17d9-4112-a9b8-12718d1a2e79
 ```
 
 Please note that if you did not save this upon creation of the resource, you will have to reset it to get a new value, which can cause breaking changes.

website/docs/r/relay_proxy_configuration.html.markdown

@@ -56,12 +56,12 @@ Relay proxy configuration `policy` blocks are composed of the following argument
 
 Relay Proxy configurations can be imported using the configuration's unique 24 character ID, e.g.
 
-```shell-session
+```
 $ terraform import launchdarkly_relay_proxy_configuration.example 51d440e30c9ff61457c710f6
 ```
 
 The unique relay proxy ID can be found in the relay proxy edit page URL, which you can locate by clicking the three dot menu on your relay proxy item in the UI and selecting 'Edit configuration':
 
 ```
-https://app.launchdarkly.com/settings/relay/<THIS_IS_YOUR_RELAY_PROXY_ID>/edit
+https://app.launchdarkly.com/settings/relay/THIS_IS_YOUR_RELAY_PROXY_ID/edit
 ```