diff --git a/.vscode/launch.json b/.vscode/launch.json index 3a9c9fd..20fe1a3 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,7 +8,7 @@ "mode": "debug", "buildFlags": "-tags 'netgo osusergo'", "program": "${workspaceRoot}/cmd/pipeline-convert/", - "args": ["-s", "drone/testdata/simple.yml", "-d", "output/"], + "args": ["-s", "drone/testdata/.drone.yml", "-d", "output/"], "cwd": "${workspaceFolder}", } ] diff --git a/drone/drone_test.go b/drone/drone_test.go index a294bf6..0fbcf1d 100644 --- a/drone/drone_test.go +++ b/drone/drone_test.go @@ -25,7 +25,7 @@ func getPipelineByName(pipelines []*transform.Pipeline, name string) *transform. } func TestTransformSimple(t *testing.T) { - buf, err := os.ReadFile("testdata/simple.yml") + buf, err := os.ReadFile("testdata/.drone.yml") require.NoError(t, err) d := drone.New() diff --git a/drone/testdata/simple.yml b/drone/testdata/.drone.yml similarity index 100% rename from drone/testdata/simple.yml rename to drone/testdata/.drone.yml diff --git a/secrets.go b/secrets.go index 8026248..fc91adc 100644 --- a/secrets.go +++ b/secrets.go @@ -16,13 +16,13 @@ type Secrets []Secret func (s Secrets) MarshalYAML() (interface{}, error) { arr := make([]interface{}, 0, len(s)) for _, secret := range s { - if secret.Target == "" || strings.EqualFold(secret.Source, secret.Target) { + if secret.Target != "" && !strings.EqualFold(secret.Source, secret.Target) { arr = append(arr, Secret{ Source: secret.Source, Target: strings.ToLower(secret.Target), }) } else { - arr = append(arr, secret) + arr = append(arr, secret.Source) } } return arr, nil