From a4b61d5ea806fb84254c6917df5fd49468f128d7 Mon Sep 17 00:00:00 2001 From: Viacheslav Lyzohub Date: Mon, 7 Nov 2022 15:57:51 +0200 Subject: [PATCH 1/5] SCALRCORE-23367 Mark environment cloud_credentials field as deprecated --- CHANGELOG.md | 4 ++++ docs/resources/scalr_environment.md | 2 +- scalr/resource_scalr_environment.go | 9 +++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07bd09f0..5cadc34d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `scalr_policy_group` data source: remove `workspaces` attribute ([173](https://github.com/Scalr/terraform-provider-scalr/pull/173)) - `scalr_policy_group` resource: remove `workspaces` attribute ([173](https://github.com/Scalr/terraform-provider-scalr/pull/173)) +### Deprecated + +- `scalr_environment`: attribute `cloud_credentials` has been deprecated ([#158](https://github.com/Scalr/terraform-provider-scalr/pull/158)) + ## [1.0.0-rc36] - 2022-08-19 ### Added diff --git a/docs/resources/scalr_environment.md b/docs/resources/scalr_environment.md index 9f4a99f8..20653da1 100644 --- a/docs/resources/scalr_environment.md +++ b/docs/resources/scalr_environment.md @@ -23,7 +23,7 @@ resource "scalr_environment" "test" { * `name` - (Required) Name of the environment. * `account_id` - (Required) ID of the environment account, in the format `acc-` * `cost_estimation_enabled` - (Optional) Set (true/false) to enable/disable cost estimation for the environment. Default `true`. -* `cloud_credentials` - (Optional) List of the environment cloud-credentials IDs, in the format `cred-`. +* `cloud_credentials` - Deprecated. Use `default_provider_configurations` instead. * `policy_groups` - (Optional) List of the environment policy-groups IDs, in the format `pgrp-`. * `default_provider_configurations` - (Optional) List of IDs of provider configurations, used in the environment workspaces by default. * `tag_ids` - (Optional) List of tag IDs associated with the environment. diff --git a/scalr/resource_scalr_environment.go b/scalr/resource_scalr_environment.go index 91bc814f..5a8b6bfa 100644 --- a/scalr/resource_scalr_environment.go +++ b/scalr/resource_scalr_environment.go @@ -59,10 +59,11 @@ func resourceScalrEnvironment() *schema.Resource { ForceNew: true, }, "cloud_credentials": { - Type: schema.TypeList, - Computed: true, - Optional: true, - Elem: &schema.Schema{Type: schema.TypeString}, + Type: schema.TypeList, + Computed: true, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Deprecated: "The attribute `cloud_credentials` is deprecated. Use `default_provider_configurations` instead", }, "policy_groups": { Type: schema.TypeList, From 9906495e5d683e93f615b8190a11dc5540a0452d Mon Sep 17 00:00:00 2001 From: Viacheslav Lyzohub Date: Fri, 11 Nov 2022 15:57:14 +0200 Subject: [PATCH 2/5] SCALRCORE-23367 Fix CHANGELOG.md --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd802ddb..b6b8b64b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `module_verion`: data source: change relation from latest-module-version to module-version ([#181](https://github.com/Scalr/terraform-provider-scalr/pull/181)) +### Deprecated + +- `scalr_environment`: attribute `cloud_credentials` has been deprecated ([#190](https://github.com/Scalr/terraform-provider-scalr/pull/190)) + ## [1.0.0-rc38] - 2022-10-20 ### Added @@ -44,10 +48,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - scalr-server >= `8.37.0` -### Deprecated - -- `scalr_environment`: attribute `cloud_credentials` has been deprecated ([#158](https://github.com/Scalr/terraform-provider-scalr/pull/158)) - ## [1.0.0-rc36] - 2022-08-19 ### Added From 25f8d5ee769f760231abc05bec7d9339b043ad40 Mon Sep 17 00:00:00 2001 From: Viacheslav Lyzohub Date: Mon, 14 Nov 2022 12:34:03 +0200 Subject: [PATCH 3/5] SCALRCORE-23367 Add sunset date for cloud_credentials --- docs/resources/scalr_environment.md | 2 +- scalr/resource_scalr_environment.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/resources/scalr_environment.md b/docs/resources/scalr_environment.md index 20653da1..a4c1a904 100644 --- a/docs/resources/scalr_environment.md +++ b/docs/resources/scalr_environment.md @@ -23,7 +23,7 @@ resource "scalr_environment" "test" { * `name` - (Required) Name of the environment. * `account_id` - (Required) ID of the environment account, in the format `acc-` * `cost_estimation_enabled` - (Optional) Set (true/false) to enable/disable cost estimation for the environment. Default `true`. -* `cloud_credentials` - Deprecated. Use `default_provider_configurations` instead. +* `cloud_credentials` - Deprecated and will be removed at 2023-01-12. Use `default_provider_configurations` instead. * `policy_groups` - (Optional) List of the environment policy-groups IDs, in the format `pgrp-`. * `default_provider_configurations` - (Optional) List of IDs of provider configurations, used in the environment workspaces by default. * `tag_ids` - (Optional) List of tag IDs associated with the environment. diff --git a/scalr/resource_scalr_environment.go b/scalr/resource_scalr_environment.go index 5a8b6bfa..65c073f1 100644 --- a/scalr/resource_scalr_environment.go +++ b/scalr/resource_scalr_environment.go @@ -63,7 +63,7 @@ func resourceScalrEnvironment() *schema.Resource { Computed: true, Optional: true, Elem: &schema.Schema{Type: schema.TypeString}, - Deprecated: "The attribute `cloud_credentials` is deprecated. Use `default_provider_configurations` instead", + Deprecated: "The attribute `cloud_credentials` is deprecated and will be removed at 2023-01-12. Use `default_provider_configurations` instead", }, "policy_groups": { Type: schema.TypeList, From ac5cae3a873083c9915c998f2c1ed8f41a5f2866 Mon Sep 17 00:00:00 2001 From: Viacheslav Lyzohub Date: Tue, 15 Nov 2022 14:11:37 +0200 Subject: [PATCH 4/5] SCALRCORE-23367 Update deprecation message --- docs/resources/scalr_environment.md | 2 +- scalr/resource_scalr_environment.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/resources/scalr_environment.md b/docs/resources/scalr_environment.md index a4c1a904..0b389b2d 100644 --- a/docs/resources/scalr_environment.md +++ b/docs/resources/scalr_environment.md @@ -23,7 +23,7 @@ resource "scalr_environment" "test" { * `name` - (Required) Name of the environment. * `account_id` - (Required) ID of the environment account, in the format `acc-` * `cost_estimation_enabled` - (Optional) Set (true/false) to enable/disable cost estimation for the environment. Default `true`. -* `cloud_credentials` - Deprecated and will be removed at 2023-01-12. Use `default_provider_configurations` instead. +* `cloud_credentials` - (Optional) Deprecated and will be removed in Q1 2023 (Specific date will be announced separately). Use `default_provider_configurations` instead. * `policy_groups` - (Optional) List of the environment policy-groups IDs, in the format `pgrp-`. * `default_provider_configurations` - (Optional) List of IDs of provider configurations, used in the environment workspaces by default. * `tag_ids` - (Optional) List of tag IDs associated with the environment. diff --git a/scalr/resource_scalr_environment.go b/scalr/resource_scalr_environment.go index 65c073f1..4ef29ee5 100644 --- a/scalr/resource_scalr_environment.go +++ b/scalr/resource_scalr_environment.go @@ -63,7 +63,7 @@ func resourceScalrEnvironment() *schema.Resource { Computed: true, Optional: true, Elem: &schema.Schema{Type: schema.TypeString}, - Deprecated: "The attribute `cloud_credentials` is deprecated and will be removed at 2023-01-12. Use `default_provider_configurations` instead", + Deprecated: "The attribute `cloud_credentials` is deprecated and will be removed in Q1 2023 (Specific date will be announced separately). Use `default_provider_configurations` instead", }, "policy_groups": { Type: schema.TypeList, From ae4ba83d04d14ddd7194dfb32dfd76c93d817f5a Mon Sep 17 00:00:00 2001 From: Viacheslav Lyzohub Date: Mon, 21 Nov 2022 17:45:27 +0200 Subject: [PATCH 5/5] SCALRCORE-23367 Updated deprecation message --- docs/resources/scalr_environment.md | 2 +- scalr/resource_scalr_environment.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/resources/scalr_environment.md b/docs/resources/scalr_environment.md index 0b389b2d..597de1f8 100644 --- a/docs/resources/scalr_environment.md +++ b/docs/resources/scalr_environment.md @@ -23,7 +23,7 @@ resource "scalr_environment" "test" { * `name` - (Required) Name of the environment. * `account_id` - (Required) ID of the environment account, in the format `acc-` * `cost_estimation_enabled` - (Optional) Set (true/false) to enable/disable cost estimation for the environment. Default `true`. -* `cloud_credentials` - (Optional) Deprecated and will be removed in Q1 2023 (Specific date will be announced separately). Use `default_provider_configurations` instead. +* `cloud_credentials` - (Optional) Deprecated. Use `default_provider_configurations` instead. * `policy_groups` - (Optional) List of the environment policy-groups IDs, in the format `pgrp-`. * `default_provider_configurations` - (Optional) List of IDs of provider configurations, used in the environment workspaces by default. * `tag_ids` - (Optional) List of tag IDs associated with the environment. diff --git a/scalr/resource_scalr_environment.go b/scalr/resource_scalr_environment.go index 4ef29ee5..5a8b6bfa 100644 --- a/scalr/resource_scalr_environment.go +++ b/scalr/resource_scalr_environment.go @@ -63,7 +63,7 @@ func resourceScalrEnvironment() *schema.Resource { Computed: true, Optional: true, Elem: &schema.Schema{Type: schema.TypeString}, - Deprecated: "The attribute `cloud_credentials` is deprecated and will be removed in Q1 2023 (Specific date will be announced separately). Use `default_provider_configurations` instead", + Deprecated: "The attribute `cloud_credentials` is deprecated. Use `default_provider_configurations` instead", }, "policy_groups": { Type: schema.TypeList,