# HG changeset patch # User Steeve Chailloux <steeve.chailloux@orus.io> # Date 1654183845 -7200 # Thu Jun 02 17:30:45 2022 +0200 # Node ID 97d0355704ac411645fe53c8cca118e4462c9f64 # Parent 4fd1b672157ea7c5775e8c1a3b701cf593daca5a split now contains resource kind first diff --git a/runner/cmd_test.go b/runner/cmd_test.go --- a/runner/cmd_test.go +++ b/runner/cmd_test.go @@ -124,13 +124,13 @@ resource := make(map[string]interface{}) require.NoError(t, v.Unmarshal(&resource)) + kind, ok := resource["kind"].(string) + require.True(t, ok) + assert.Equal(t, tokens[0], kind) + apiVersion, ok := resource["apiversion"].(string) require.True(t, ok) - assert.Equal(t, tokens[0], apiVersion) - - kind, ok := resource["kind"].(string) - require.True(t, ok) - assert.Equal(t, tokens[1], kind) + assert.Equal(t, tokens[1], apiVersion) metadata, ok := resource["metadata"].(map[string]interface{}) require.True(t, ok) diff --git a/runner/main.go b/runner/main.go --- a/runner/main.go +++ b/runner/main.go @@ -169,7 +169,7 @@ if !ok { return nil, fmt.Errorf("fail to type assert metadata.name from: %+v", resource) } - filename := fmt.Sprintf("%s.%s.%s.yaml", strings.Replace(apiVersion, "/", "_", -1), kind, name) + filename := fmt.Sprintf("%s.%s.%s.yaml", kind, strings.Replace(apiVersion, "/", "_", -1), name) fPath := filepath.Join(buildDir, filename) if out, err := yaml.Marshal(resource); err != nil {