Skip to content

Commit

Permalink
fix(servergroup): use valid value as default for anti_affinity_policy
Browse files Browse the repository at this point in the history
  • Loading branch information
kangasta committed Oct 5, 2023
1 parent 4d5d1e4 commit 99bc819
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 3 deletions.
2 changes: 1 addition & 1 deletion internal/service/servergroup/servergroup.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func ResourceServerGroup() *schema.Resource {
Description: antiAffinityPolicyDescription,
Type: schema.TypeString,
Optional: true,
Default: false,
Default: "no",
ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice([]string{
string(upcloud.ServerGroupAntiAffinityPolicyBestEffort),
string(upcloud.ServerGroupAntiAffinityPolicyOff),
Expand Down
4 changes: 4 additions & 0 deletions upcloud/resource_upcloud_server_group_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ func TestAccUpCloudServerGroup(t *testing.T) {
var providers []*schema.Provider

group1 := "upcloud_server_group.tf_test_1"
group2 := "upcloud_server_group.tf_test_2"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand All @@ -27,6 +28,9 @@ func TestAccUpCloudServerGroup(t *testing.T) {
resource.TestCheckResourceAttr(group1, "members.#", "1"),
resource.TestCheckResourceAttr(group1, "labels.%", "3"),
resource.TestCheckResourceAttr(group1, "anti_affinity_policy", "no"),
resource.TestCheckResourceAttr(group2, "title", "tf_test_2"),
resource.TestCheckResourceAttr(group2, "members.#", "0"),
resource.TestCheckResourceAttr(group2, "anti_affinity_policy", "no"),
),
},
{
Expand Down
6 changes: 5 additions & 1 deletion upcloud/testdata/upcloud_server_group/step1.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,14 @@ resource "upcloud_server" "test" {
resource "upcloud_server_group" "tf_test_1" {
title = "tf_test_1"
anti_affinity_policy = "no"
labels = {
labels = {
"key1" = "val1"
"key2" = "val2"
"key3" = "val3"
}
members = [upcloud_server.test.id]
}

resource "upcloud_server_group" "tf_test_2" {
title = "tf_test_2"
}
6 changes: 5 additions & 1 deletion upcloud/testdata/upcloud_server_group/step2.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,12 @@ resource "upcloud_server" "test" {
resource "upcloud_server_group" "tf_test_1" {
title = "tf_test_1_updated"
anti_affinity_policy = "strict"
labels = {
labels = {
"key1" = "val1"
"key2" = "val2"
}
}

resource "upcloud_server_group" "tf_test_2" {
title = "tf_test_2"
}

0 comments on commit 99bc819

Please sign in to comment.