Skip to content

Commit 47b280b

Browse files
authored
Merge pull request #246 from Scalr/fix/changelog
updated CHANGELOG.md
2 parents c7eb005 + f14faff commit 47b280b

File tree

5 files changed

+13
-10
lines changed

5 files changed

+13
-10
lines changed

CHANGELOG.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [1.0.6] - 2023-05-12
11+
1012
### Added
1113

1214
- **New data source:** `scalr_environments` ([#225](https://github.com/Scalr/terraform-provider-scalr/pull/225))
1315
- **New data source:** `scalr_workspaces` ([#225](https://github.com/Scalr/terraform-provider-scalr/pull/225))
1416

1517
### Changed
1618

17-
- `scalr_vcs_provider`: added new attribute `agent_pool_id` ([#233](https://github.com/Scalr/terraform-provider-scalr/pull/233))
18-
- `data.scalr_vcs_provider`: added new attribute `agent_pool_id` ([#233](https://github.com/Scalr/terraform-provider-scalr/pull/233))
1919
- `scalr_agent_pool`: added new attribute `vcs_enabled` ([#233](https://github.com/Scalr/terraform-provider-scalr/pull/233))
20-
- `data.scalr_agent_pool`: added new attribute `vcs_enabled` ([#233](https://github.com/Scalr/terraform-provider-scalr/pull/232))
20+
- `scalr_vcs_provider`: added new attribute `agent_pool_id` ([#233](https://github.com/Scalr/terraform-provider-scalr/pull/233))
2121
- `scalr_vcs_provider`: added new attribute `environments` ([#243](https://github.com/Scalr/terraform-provider-scalr/pull/243))
2222
- `scalr_workspace`: added new attribute `deletion_protection_enabled` ([#242](https://github.com/Scalr/terraform-provider-scalr/pull/242))
23+
- `data.scalr_agent_pool`: added new attribute `vcs_enabled` ([#233](https://github.com/Scalr/terraform-provider-scalr/pull/232))
24+
- `data.scalr_vcs_provider`: added new attribute `agent_pool_id` ([#233](https://github.com/Scalr/terraform-provider-scalr/pull/233))
2325
- `data.scalr_workspace`: added new attribute `deletion_protection_enabled` ([#242](https://github.com/Scalr/terraform-provider-scalr/pull/242))
2426

2527
### Fixed
@@ -30,7 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3032

3133
### Required
3234

33-
- scalr-server >= `8.65.0`
35+
- scalr-server >= `8.66.0`
3436

3537
## [1.0.5] - 2023-04-21
3638

@@ -670,7 +672,8 @@ Requires Scalr 8.0.1-beta.20200625 at least
670672

671673
- Initial release.
672674

673-
[Unreleased]: https://github.com/Scalr/terraform-provider-scalr/compare/v1.0.5...HEAD
675+
[Unreleased]: https://github.com/Scalr/terraform-provider-scalr/compare/v1.0.6...HEAD
676+
[1.0.6]: https://github.com/Scalr/terraform-provider-scalr/releases/tag/v1.0.6
674677
[1.0.5]: https://github.com/Scalr/terraform-provider-scalr/releases/tag/v1.0.5
675678
[1.0.4]: https://github.com/Scalr/terraform-provider-scalr/releases/tag/v1.0.4
676679
[1.0.3]: https://github.com/Scalr/terraform-provider-scalr/releases/tag/v1.0.3

docs/data-sources/scalr_vcs_provider.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The following arguments are supported:
2828
* `vcs_type` - (Optional) Type of the VCS provider. For example, `github`.
2929
* `environment_id` - (Optional) ID of the environment the VCS provider has to be linked to, in the format `env-<RANDOM STRING>`.
3030
* `account_id` - (Optional) ID of the account, in the format `acc-<RANDOM STRING>`.
31-
* `agent_pool_id` - (Optional) ID of the agent pool, in the format `apool-<RANDOM STRING>`.
31+
* `agent_pool_id` - (Optional) The id of the agent pool to connect Scalr to self-hosted VCS provider, in the format `apool-<RANDOM STRING>`.
3232

3333
## Attribute Reference
3434

docs/data-sources/scalr_workspace.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ All arguments plus:
4646
* `vcs_repo` - If a workspace is linked to a VCS repository this block shows the details, otherwise `{}`
4747
* `created_by` - Details of the user that created the workspace.
4848
* `has_resources` - The presence of active terraform resources in the current state version.
49-
* `deletion_protection_enabled` - Boolean indicates whether to prevent deletion when the workspace has resources.
49+
* `deletion_protection_enabled` - Boolean, indicates if the workspace has the protection from an accidental state lost. If enabled and the workspace has resource, the deletion will not be allowed.
5050
* `auto_queue_runs` - Indicates if runs have to be queued automatically when a new configuration version is uploaded.
5151

5252
Supported values are `skip_first`, `always`, `never`:

docs/resources/scalr_vcs_provider.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ resource "scalr_vcs_provider" "example" {
2727
* `account_id` - (Optional) ID of the account.
2828
* `url` - (Optional) This field is required for self-hosted vcs providers.
2929
* `username` - (Optional) This field is required for `bitbucket_enterprise` provider type.
30-
* `agent_pool_id` - (Optional) ID of the agent pool to communicate with VCS through.
30+
* `agent_pool_id` - (Optional) The id of the agent pool to connect Scalr to self-hosted VCS provider.
3131
* `environments` - (Optional) The list of environment identifiers that the VCS provider is shared to.
32-
Use `["*"]` to share with all environments.
32+
Use `["*"]` to share with all environments.
3333

3434

3535
## Attribute Reference

docs/resources/scalr_workspace.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ resource "scalr_workspace" "cli-driven" {
9595
* `environment_id` - (Required) ID of the environment, in the format `env-<RANDOM STRING>`.
9696
* `auto_apply` - (Optional) Set (true/false) to configure if `terraform apply` should automatically run when `terraform plan` ends without error. Default `false`.
9797
* `force_latest_run` - (Optional) Set (true/false) to configure if latest new run will be automatically raised in priority. Default `false`.
98-
* `deletion_protection_enabled` - (Optional) Set (true/false) to configure whether to prevent deletion when the workspace has resources. Default `true`.
98+
* `deletion_protection_enabled` - (Optional) Indicates if the workspace has the protection from an accidental state lost. If enabled and the workspace has resource, the deletion will not be allowed. Default `true`.
9999
* `operations` - Deprecated. Use `execution_mode` instead.
100100
* `auto_queue_runs` - Indicates if runs have to be queued automatically when a new configuration version is uploaded.
101101

0 commit comments

Comments
 (0)