From 57338947814475b181ef264daf258297f23f30a4 Mon Sep 17 00:00:00 2001 From: Aaron Friel Date: Tue, 11 Oct 2022 09:12:29 -0700 Subject: [PATCH] revert(sdk/go): Revert changes to String & marshaling method receivers) --- sdk/go/common/resource/config/key.go | 8 ++++---- sdk/go/common/resource/resource_id.go | 4 ++-- sdk/go/common/workspace/plugins.go | 2 +- sdk/go/common/workspace/project.go | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sdk/go/common/resource/config/key.go b/sdk/go/common/resource/config/key.go index 71b81289dd53..6f62657a42a2 100644 --- a/sdk/go/common/resource/config/key.go +++ b/sdk/go/common/resource/config/key.go @@ -70,11 +70,11 @@ func (k *Key) Name() string { return k.name } -func (k *Key) MarshalJSON() ([]byte, error) { +func (k Key) MarshalJSON() ([]byte, error) { return json.Marshal(k.String()) } -func (k *Key) UnmarshalJSON(b []byte) error { +func (k Key) UnmarshalJSON(b []byte) error { var s string if err := json.Unmarshal(b, &s); err != nil { return errors.Wrap(err, "could not unmarshal key") @@ -90,7 +90,7 @@ func (k *Key) UnmarshalJSON(b []byte) error { return nil } -func (k *Key) MarshalYAML() (interface{}, error) { +func (k Key) MarshalYAML() (interface{}, error) { return k.String(), nil } @@ -110,7 +110,7 @@ func (k *Key) UnmarshalYAML(unmarshal func(interface{}) error) error { return nil } -func (k *Key) String() string { +func (k Key) String() string { return k.namespace + ":" + k.name } diff --git a/sdk/go/common/resource/resource_id.go b/sdk/go/common/resource/resource_id.go index ee05299bcf78..29da8693c712 100644 --- a/sdk/go/common/resource/resource_id.go +++ b/sdk/go/common/resource/resource_id.go @@ -30,8 +30,8 @@ import ( type ID string // String converts a resource ID into a string. -func (id *ID) String() string { - return string(*id) +func (id ID) String() string { + return string(id) } // StringPtr converts an optional ID into an optional string. diff --git a/sdk/go/common/workspace/plugins.go b/sdk/go/common/workspace/plugins.go index 060938130be8..6be48d4b3271 100644 --- a/sdk/go/common/workspace/plugins.go +++ b/sdk/go/common/workspace/plugins.go @@ -622,7 +622,7 @@ func (info *PluginInfo) Spec() PluginSpec { return PluginSpec{Name: info.Name, Kind: info.Kind, Version: info.Version} } -func (info *PluginInfo) String() string { +func (info PluginInfo) String() string { var version string if v := info.Version; v != nil { version = fmt.Sprintf("-%s", v) diff --git a/sdk/go/common/workspace/project.go b/sdk/go/common/workspace/project.go index 0970305f33ce..cfdd6e2c64be 100644 --- a/sdk/go/common/workspace/project.go +++ b/sdk/go/common/workspace/project.go @@ -348,7 +348,7 @@ func (info *ProjectRuntimeInfo) SetOption(key string, value interface{}) { info.options[key] = value } -func (info *ProjectRuntimeInfo) MarshalYAML() (interface{}, error) { +func (info ProjectRuntimeInfo) MarshalYAML() (interface{}, error) { if info.options == nil || len(info.options) == 0 { return info.name, nil } @@ -359,7 +359,7 @@ func (info *ProjectRuntimeInfo) MarshalYAML() (interface{}, error) { }, nil } -func (info *ProjectRuntimeInfo) MarshalJSON() ([]byte, error) { +func (info ProjectRuntimeInfo) MarshalJSON() ([]byte, error) { if info.options == nil || len(info.options) == 0 { return json.Marshal(info.name) }