Skip to content

Commit

Permalink
add sort
Browse files Browse the repository at this point in the history
  • Loading branch information
TomerHeber committed Sep 23, 2024
1 parent e871acb commit 325de3e
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 4 deletions.
12 changes: 12 additions & 0 deletions env0/data_environment.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package env0

import (
"context"
"slices"
"strings"

"github.com/env0/terraform-provider-env0/client"
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
Expand Down Expand Up @@ -158,6 +160,16 @@ func dataEnvironmentRead(ctx context.Context, d *schema.ResourceData, meta inter
}
}

slices.SortFunc(subEnvironments, func(a, b interface{}) int {
amap := a.(map[string]interface{})
bmap := b.(map[string]interface{})

aalias := amap["alias"].(string)
balias := bmap["alias"].(string)

return strings.Compare(aalias, balias)
})

d.Set("sub_environment_configuration", subEnvironments)

templateId := environment.LatestDeploymentLog.BlueprintId
Expand Down
8 changes: 4 additions & 4 deletions env0/data_environment_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ func TestEnvironmentDataSource(t *testing.T) {
resource.TestCheckResourceAttr(accessor, "token_id", template.TokenId),
resource.TestCheckResourceAttr(accessor, "github_installation_id", strconv.Itoa(template.GithubInstallationId)),
resource.TestCheckResourceAttr(accessor, "bitbucket_client_key", template.BitbucketClientKey),
resource.TestCheckResourceAttr(accessor, "sub_environment_configuration.0.alias", "db"),
resource.TestCheckResourceAttr(accessor, "sub_environment_configuration.0.id", "id_db"),
resource.TestCheckResourceAttr(accessor, "sub_environment_configuration.1.alias", "compute"),
resource.TestCheckResourceAttr(accessor, "sub_environment_configuration.1.id", "id_compute"),
resource.TestCheckResourceAttr(accessor, "sub_environment_configuration.0.alias", "compute"),
resource.TestCheckResourceAttr(accessor, "sub_environment_configuration.0.id", "id_compute"),
resource.TestCheckResourceAttr(accessor, "sub_environment_configuration.1.alias", "db"),
resource.TestCheckResourceAttr(accessor, "sub_environment_configuration.1.id", "id_db"),
),
},
},
Expand Down

0 comments on commit 325de3e

Please sign in to comment.