Merge pull request #31684 from Skarlso/fix-function-naming

fix: typo in the function names
copilot/backport-reflect-pointer-change
Terry Howe 8 months ago committed by GitHub
commit bed5b732ba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -23,14 +23,13 @@ import (
"go.yaml.in/yaml/v3" "go.yaml.in/yaml/v3"
) )
// Config represents an plugin type specific configuration // Config represents a plugin type specific configuration
// It is expected to type assert (cast) the a Config to its expected underlying type (schema.ConfigCLIV1, schema.ConfigGetterV1, etc). // It is expected to type assert (cast) the Config to its expected underlying type (schema.ConfigCLIV1, schema.ConfigGetterV1, etc).
type Config interface { type Config interface {
Validate() error Validate() error
} }
func unmarshaConfig(pluginType string, configData map[string]any) (Config, error) { func unmarshalConfig(pluginType string, configData map[string]any) (Config, error) {
pluginTypeMeta, ok := pluginTypesIndex[pluginType] pluginTypeMeta, ok := pluginTypesIndex[pluginType]
if !ok { if !ok {
return nil, fmt.Errorf("unknown plugin type %q", pluginType) return nil, fmt.Errorf("unknown plugin type %q", pluginType)

@ -27,7 +27,7 @@ import (
func TestUnmarshaConfig(t *testing.T) { func TestUnmarshaConfig(t *testing.T) {
// Test unmarshalling a CLI plugin config // Test unmarshalling a CLI plugin config
{ {
config, err := unmarshaConfig("cli/v1", map[string]any{ config, err := unmarshalConfig("cli/v1", map[string]any{
"usage": "usage string", "usage": "usage string",
"shortHelp": "short help string", "shortHelp": "short help string",
"longHelp": "long help string", "longHelp": "long help string",
@ -46,7 +46,7 @@ func TestUnmarshaConfig(t *testing.T) {
// Test unmarshalling invalid config data // Test unmarshalling invalid config data
{ {
config, err := unmarshaConfig("cli/v1", map[string]any{ config, err := unmarshalConfig("cli/v1", map[string]any{
"invalid field": "foo", "invalid field": "foo",
}) })
require.Error(t, err) require.Error(t, err)

@ -174,13 +174,12 @@ func buildLegacyRuntimeConfig(m MetadataLegacy) RuntimeConfig {
} }
func fromMetadataV1(mv1 MetadataV1) (*Metadata, error) { func fromMetadataV1(mv1 MetadataV1) (*Metadata, error) {
config, err := unmarshalConfig(mv1.Type, mv1.Config)
config, err := unmarshaConfig(mv1.Type, mv1.Config)
if err != nil { if err != nil {
return nil, err return nil, err
} }
runtimeConfig, err := convertMetdataRuntimeConfig(mv1.Runtime, mv1.RuntimeConfig) runtimeConfig, err := convertMetadataRuntimeConfig(mv1.Runtime, mv1.RuntimeConfig)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -197,7 +196,7 @@ func fromMetadataV1(mv1 MetadataV1) (*Metadata, error) {
}, nil }, nil
} }
func convertMetdataRuntimeConfig(runtimeType string, runtimeConfigRaw map[string]any) (RuntimeConfig, error) { func convertMetadataRuntimeConfig(runtimeType string, runtimeConfigRaw map[string]any) (RuntimeConfig, error) {
var runtimeConfig RuntimeConfig var runtimeConfig RuntimeConfig
var err error var err error

Loading…
Cancel
Save