Skip to content

SCALRCORE-35338 The scalr_wokspace_ids data source must request only those attributes it uses. #437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 14, 2025
Merged

SCALRCORE-35338 The scalr_wokspace_ids data source must request only those attributes it uses. #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f329342
SCALRCORE-35338 The scalr_wokspace_ids data source must request only …
recipe Jul 12, 2025
3243d5f
SCALRCORE-35338 updated CHANGELOG.md
recipe Jul 12, 2025
aafe10b
SCALRCORE-35338 typo
recipe Jul 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed

- `scalr_wokspace_ids` data source must request only those attributes it uses. ([#437](https://github.com/Scalr/terraform-provider-scalr/pull/437))

## [3.4.0] - 2025-07-11

### Added
Expand Down
2 changes: 1 addition & 1 deletion docs/data-sources/workspace_ids.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ data "scalr_workspace_ids" "all" {
### Read-Only

- `id` (String) The ID of this resource.
- `ids` (Map of String) A map of workspace names and their opaque IDs, in the format `env_id/name`.
- `ids` (Map of String) A map of workspace names and their opaque IDs, in the format `id/name`.
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/hashicorp/terraform-plugin-sdk/v2 v2.35.0
github.com/hashicorp/terraform-plugin-testing v1.11.0
github.com/hashicorp/terraform-svchost v0.1.1
github.com/scalr/go-scalr v0.0.0-20250709084620-8b3fc4d46833
github.com/scalr/go-scalr v0.0.0-20250712001519-9f42032f4be3
)

require (
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,8 @@ github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3V
github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY=
github.com/scalr/go-scalr v0.0.0-20250709084620-8b3fc4d46833 h1:ecfQzig7ry0tSQEPo5/dIG8kLP3qjWeI6MpKt5lppnY=
github.com/scalr/go-scalr v0.0.0-20250709084620-8b3fc4d46833/go.mod h1:Om3UIkHGeOcUK72OzjWI1GlS/hFyY8RRLxgbO0ZPsn4=
github.com/scalr/go-scalr v0.0.0-20250712001519-9f42032f4be3 h1:adgID8xOmBR3uu7gpUo0mZlzNEkhpsQkPdPfCDwSIsw=
github.com/scalr/go-scalr v0.0.0-20250712001519-9f42032f4be3/go.mod h1:Om3UIkHGeOcUK72OzjWI1GlS/hFyY8RRLxgbO0ZPsn4=
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
Expand Down
3 changes: 2 additions & 1 deletion internal/provider/data_source_scalr_workspace_ids.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func dataSourceScalrWorkspaceIDs() *schema.Resource {
},

"ids": {
Description: "A map of workspace names and their opaque IDs, in the format `env_id/name`.",
Description: "A map of workspace names and their opaque IDs, in the format `id/name`.",
Type: schema.TypeMap,
Computed: true,
},
Expand All @@ -57,6 +57,7 @@ func dataSourceScalrWorkspaceIDsRead(ctx context.Context, d *schema.ResourceData

options := scalr.WorkspaceListOptions{
Filter: &scalr.WorkspaceFilter{Environment: &environmentID},
Fields: &scalr.WorkspaceSparseFields{Workspaces: "id,name"},
}
for {
wl, err := scalrClient.Workspaces.List(ctx, options)
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/data_source_scalr_workspace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func TestAccScalrWorkspaceDataSource_basic(t *testing.T) {
resource.TestCheckResourceAttr(
"data.scalr_workspace.test", "auto_apply", "true"),
resource.TestCheckResourceAttr(
"data.scalr_workspace.test", "terraform_version", "1.1.9"),
"data.scalr_workspace.test", "terraform_version", "1.5.7"),
resource.TestCheckResourceAttr(
"data.scalr_workspace.test", "iac_platform", "terraform"),
resource.TestCheckResourceAttr(
Expand Down Expand Up @@ -118,7 +118,7 @@ resource scalr_workspace test {
name = "workspace-test-%[1]d"
environment_id = scalr_environment.test.id
auto_apply = true
terraform_version = "1.1.9"
terraform_version = "1.5.7"
iac_platform = "terraform"
working_directory = "terraform/test"
type = "production"
Expand Down
16 changes: 8 additions & 8 deletions internal/provider/workspace_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ func TestAccScalrWorkspace_update(t *testing.T) {
resource.TestCheckResourceAttr(
"scalr_workspace.test", "execution_mode", string(scalr.WorkspaceExecutionModeLocal)),
resource.TestCheckResourceAttr(
"scalr_workspace.test", "terraform_version", "1.1.9"),
"scalr_workspace.test", "terraform_version", "1.5.7"),
resource.TestCheckResourceAttr(
"scalr_workspace.test", "iac_platform", string(scalr.WorkspaceIaCPlatformTerraform)),
resource.TestCheckResourceAttr(
Expand Down Expand Up @@ -217,7 +217,7 @@ func TestAccScalrWorkspace_update(t *testing.T) {
resource.TestCheckResourceAttr(
"scalr_workspace.test", "execution_mode", string(scalr.WorkspaceExecutionModeLocal)),
resource.TestCheckResourceAttr(
"scalr_workspace.test", "terraform_version", "1.1.9"),
"scalr_workspace.test", "terraform_version", "1.5.7"),
resource.TestCheckResourceAttr(
"scalr_workspace.test", "iac_platform", string(scalr.WorkspaceIaCPlatformTerraform)),
resource.TestCheckResourceAttr(
Expand Down Expand Up @@ -525,7 +525,7 @@ func testAccCheckScalrWorkspaceAttributesUpdated(
return fmt.Errorf("Bad execution mode: %s", workspace.ExecutionMode)
}

if workspace.TerraformVersion != "1.1.9" {
if workspace.TerraformVersion != "1.5.7" {
return fmt.Errorf("Bad Terraform version: %s", workspace.TerraformVersion)
}

Expand Down Expand Up @@ -757,7 +757,7 @@ resource "scalr_workspace" "test" {
environment_id = scalr_environment.test.id
auto_apply = false
execution_mode = "%s"
terraform_version = "1.1.9"
terraform_version = "1.5.7"
working_directory = "terraform/test"
run_operation_timeout = 200
deletion_protection_enabled = true
Expand All @@ -782,7 +782,7 @@ resource "scalr_workspace" "test" {
environment_id = scalr_environment.test.id
auto_apply = false
execution_mode = "%s"
terraform_version = "1.1.9"
terraform_version = "1.5.7"
working_directory = "terraform/test"
vcs_repo {
identifier = "TestRepo/local"
Expand All @@ -800,7 +800,7 @@ resource "scalr_workspace" "test" {
environment_id = scalr_environment.test.id
auto_apply = false
execution_mode = "%s"
terraform_version = "1.1.9"
terraform_version = "1.5.7"
working_directory = "terraform/test"
vcs_provider_id = "test_provider_id"
}`, scalr.WorkspaceExecutionModeLocal),
Expand All @@ -815,7 +815,7 @@ resource "scalr_workspace" "test" {
environment_id = scalr_environment.test.id
auto_apply = false
execution_mode = "%s"
terraform_version = "1.1.9"
terraform_version = "1.5.7"
working_directory = "terraform/test"
}`, scalr.WorkspaceExecutionModeLocal),
)
Expand All @@ -829,7 +829,7 @@ resource "scalr_workspace" "test" {
environment_id = scalr_environment.test.id
auto_apply = false
execution_mode = "%s"
terraform_version = "1.1.9"
terraform_version = "1.5.7"
working_directory = ""
hooks {
pre_init = "./scripts/pre-init_updated.sh"
Expand Down
Loading