Skip to content
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

Fix regession in matchbox_group reading of empty metadata #104

Merged
merged 1 commit into from
Jul 30, 2022
Merged

Fix regession in matchbox_group reading of empty metadata #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions matchbox/resource_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,16 +95,19 @@ func resourceGroupRead(ctx context.Context, d *schema.ResourceData, meta interfa

group := groupGetResponse.Group

var metadata map[string]string
if err := json.Unmarshal(group.Metadata, &metadata); err != nil {
return diag.FromErr(err)
}
if err := d.Set("selector", group.Selector); err != nil {
return diag.FromErr(err)
}
if err := d.Set("profile", group.Profile); err != nil {
return diag.FromErr(err)
}

var metadata map[string]string
if len(group.Metadata) > 0 {
if err := json.Unmarshal(group.Metadata, &metadata); err != nil {
return diag.FromErr(err)
}
}
if err := d.Set("metadata", metadata); err != nil {
return diag.FromErr(err)
}
Expand Down
132 changes: 67 additions & 65 deletions matchbox/resource_group_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,32 @@
package matchbox

import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
"github.com/poseidon/matchbox/matchbox/storage/testfakes"
)

const groupWithAllFields = `
resource "matchbox_group" "default" {
name = "default"
profile = "worker"
selector = {
os = "installed"
}
metadata = {
user = "core"
}
}
`

const groupMinimal = `
resource "matchbox_group" "default" {
name = "minimal"
profile = "worker"
}
`

func TestResourceGroup(t *testing.T) {
srv := NewFixtureServer(clientTLSInfo, serverTLSInfo, testfakes.NewFixedStore())
go func() {
Expand All @@ -19,57 +37,35 @@ func TestResourceGroup(t *testing.T) {
}()
defer srv.Stop()

hcl := `
resource "matchbox_group" "default" {
name = "default"
profile = "foo"
selector = {
qux = "baz"
}

metadata = {
foo = "bar"
}
}
`

check := func(s *terraform.State) error {
grp, err := srv.Store.GroupGet("default")
if err != nil {
return err
}

if grp.GetId() != "default" {
return fmt.Errorf("id, found %q", grp.GetId())
}

if grp.GetProfile() != "foo" {
return fmt.Errorf("profile, found %q", grp.GetProfile())
}

selector := grp.GetSelector()
if len(selector) != 1 || selector["qux"] != "baz" {
return fmt.Errorf("selector.qux, found %q", selector["qux"])
}

if string(grp.GetMetadata()) != "{\"foo\":\"bar\"}" {
return fmt.Errorf("metadata, found %q", grp.GetProfile())
}

return nil
}

resource.UnitTest(t, resource.TestCase{
Providers: testProviders,
Steps: []resource.TestStep{{
Config: srv.AddProviderConfig(hcl),
Check: check,
}},
Steps: []resource.TestStep{
{
Config: srv.AddProviderConfig(groupWithAllFields),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("matchbox_group.default", "id", "default"),
resource.TestCheckResourceAttr("matchbox_group.default", "profile", "worker"),
resource.TestCheckResourceAttr("matchbox_group.default", "selector.%", "1"),
resource.TestCheckResourceAttr("matchbox_group.default", "selector.os", "installed"),
resource.TestCheckResourceAttr("matchbox_group.default", "metadata.%", "1"),
resource.TestCheckResourceAttr("matchbox_group.default", "metadata.user", "core"),
),
},
{
Config: srv.AddProviderConfig(groupMinimal),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("matchbox_group.default", "id", "minimal"),
resource.TestCheckResourceAttr("matchbox_group.default", "profile", "worker"),
resource.TestCheckResourceAttr("matchbox_group.default", "selector.%", "0"),
resource.TestCheckResourceAttr("matchbox_group.default", "metadata.%", "0"),
),
},
},
})
}

// TestResourceGroup_Read checks the provider compares the desired state with the actual matchbox state and not only
// the Terraform state.
// TestResourceGroup_Read checks the provider compares the desired state with
// the actual matchbox state
func TestResourceGroup_Read(t *testing.T) {
srv := NewFixtureServer(clientTLSInfo, serverTLSInfo, testfakes.NewFixedStore())
go func() {
Expand All @@ -80,35 +76,41 @@ func TestResourceGroup_Read(t *testing.T) {
}()
defer srv.Stop()

hcl := `
resource "matchbox_group" "default" {
name = "default"
profile = "foo"
selector = {
qux = "baz"
}

metadata = {
foo = "bar"
}
}
`

resource.UnitTest(t, resource.TestCase{
Providers: testProviders,
Steps: []resource.TestStep{
{
Config: srv.AddProviderConfig(hcl),
Config: srv.AddProviderConfig(groupWithAllFields),
},
{
PreConfig: func() {
// mutate resource on matchbox server
group, _ := srv.Store.GroupGet("default")
group.Selector["bux"] = "qux"
group.Profile = "altered"
},
Config: srv.AddProviderConfig(hcl),
Config: srv.AddProviderConfig(groupWithAllFields),
PlanOnly: true,
ExpectNonEmptyPlan: true,
},
// leave selector and metadata empty
{
Config: srv.AddProviderConfig(groupMinimal),
},
{
Config: srv.AddProviderConfig(groupWithAllFields),
PlanOnly: true,
ExpectNonEmptyPlan: true,
},
// real matchbox empty metadata is an empty []byte
{
PreConfig: func() {
// mutate resource on matchbox server
group, _ := srv.Store.GroupGet("minimal")
group.Metadata = []byte("")
},
Config: srv.AddProviderConfig(groupMinimal),
PlanOnly: true,
},
},
})
}
4 changes: 2 additions & 2 deletions matchbox/resource_profile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ func TestResourceProfile_withIgnitionAndContainerLinuxConfig(t *testing.T) {
})
}

// TestResourceProfile_Read checks the provider compares the desired state with the actual matchbox state and not only
// the Terraform state.
// TestResourceProfile_Read checks the provider compares the desired state with
// the actual matchbox state
func TestResourceProfile_Read(t *testing.T) {
srv := NewFixtureServer(clientTLSInfo, serverTLSInfo, testfakes.NewFixedStore())
go func() {
Expand Down