diff --git a/internal/core/box_metadata.go b/internal/core/box_metadata.go index 712acbb5d..b8c05bb58 100644 --- a/internal/core/box_metadata.go +++ b/internal/core/box_metadata.go @@ -69,9 +69,9 @@ func (b *BoxVersion) ListProviders() ([]string, error) { } type BoxMetadata struct { - name string - description string - versions []*BoxVersion + Name string + Bescription string + Versions []*BoxVersion } func LoadBoxMetadata(data []byte) (*BoxMetadata, error) { @@ -80,7 +80,8 @@ func LoadBoxMetadata(data []byte) (*BoxMetadata, error) { return nil, err } var result BoxMetadata - return &result, mapstructure.Decode(metadata, &result) + err := mapstructure.Decode(metadata, &result) + return &result, err } func (b *BoxMetadata) version(ver string, providerOpts *core.BoxProvider) (v *BoxVersion, err error) { @@ -89,7 +90,7 @@ func (b *BoxMetadata) version(ver string, providerOpts *core.BoxProvider) (v *Bo if err != nil { return nil, err } - for _, boxVer := range b.versions { + for _, boxVer := range b.Versions { boxVersion, err := version.NewVersion(boxVer.Version) if err != nil { return nil, err @@ -117,8 +118,8 @@ func (b *BoxMetadata) version(ver string, providerOpts *core.BoxProvider) (v *Bo return } -func (b *BoxMetadata) Name() string { - return b.name +func (b *BoxMetadata) BoxName() string { + return b.Name } func (b *BoxMetadata) Version(ver string, providerOpts *core.BoxProvider) (v *core.BoxVersion, err error) { @@ -136,7 +137,7 @@ func (b *BoxMetadata) Version(ver string, providerOpts *core.BoxProvider) (v *co func (b *BoxMetadata) ListVersions(providerOpts ...*core.BoxProvider) ([]string, error) { v := []string{} - for _, version := range b.versions { + for _, version := range b.Versions { if providerOpts != nil { var boxVersionProvider []*BoxVersionProvider mapstructure.Decode(providerOpts, &boxVersionProvider) diff --git a/internal/core/box_metadata_test.go b/internal/core/box_metadata_test.go index 247d196cb..7fbee7ada 100644 --- a/internal/core/box_metadata_test.go +++ b/internal/core/box_metadata_test.go @@ -64,7 +64,7 @@ func loadProvider(t *testing.T, d []byte, v string, p string) (core.BoxMetadata, func TestLoadMetadata(t *testing.T) { metadata := loadMetadata(t, []byte(rawMetadata)) - if metadata.Name() != "test/box" { + if metadata.Name != "test/box" { t.Errorf("Could not parse box info") } } diff --git a/internal/core/box_test.go b/internal/core/box_test.go index 1c2cb3124..9a9f7befd 100644 --- a/internal/core/box_test.go +++ b/internal/core/box_test.go @@ -165,5 +165,5 @@ func TestMetadata(t *testing.T) { t.Errorf("Failed to get metadata") } require.NotNil(t, result) - require.Equal(t, "hashicorp/bionic64", result.Name()) + require.Equal(t, "hashicorp/bionic64", result.BoxName()) }