Support Conversion for Bitrise and Github Actions steps, Add UTs

convert/harness/downgrader/downgrade.go

@@ -736,6 +736,10 @@ func (d *Downgrader) convertStepBackground(src *v1.Step) *v0.Step {
 	if len(spec_.Envs) > 0 {
 		env = &flexible.Field[map[string]interface{}]{Value: spec_.Envs}
 	}
+	var runAsUser *flexible.Field[int]
+	if spec_.User != "" {
+		runAsUser.SetString(spec_.User)
+	}
 	return &v0.Step{
 		ID:   id,
 		Name: convertName(src.Name),
@@ -748,7 +752,7 @@ func (d *Downgrader) convertStepBackground(src *v1.Step) *v0.Step {
 			Image:           spec_.Image,
 			ImagePullPolicy: convertImagePull(spec_.Pull),
 			Privileged:      privileged,
-			RunAsUser:       spec_.User,
+			RunAsUser:       runAsUser,
 			PortBindings:    convertPorts(spec_.Ports),
 		},
 		When: convertStepWhen(src.When, id),
@@ -782,6 +786,10 @@ func (d *Downgrader) convertStepPlugin(src *v1.Step) *v0.Step {
 	if spec_.Privileged {
 		privileged = &flexible.Field[bool]{Value: true}
 	}
+	var runAsUser *flexible.Field[int]
+	if spec_.User != "" {
+		runAsUser.SetString(spec_.User)
+	}
 
 	switch spec_.Image {
 	case harness.GitPluginImage:
@@ -830,7 +838,7 @@ func (d *Downgrader) convertStepPlugin(src *v1.Step) *v0.Step {
 				ImagePullPolicy: convertImagePull(spec_.Pull),
 				Settings:        convertSettings(spec_.With),
 				Privileged:      privileged,
-				RunAsUser:       spec_.User,
+				RunAsUser:       runAsUser,
 			},
 			When: convertStepWhen(src.When, id),
 		}
@@ -1032,7 +1040,7 @@ func convertCache(src *v1.Cache) *v0.Cache {
 		return nil
 	}
 	return &v0.Cache{
-		Enabled: src.Enabled,
+		Enabled: &flexible.Field[bool]{Value: src.Enabled},
 		Key:     src.Key,
 		Paths:   src.Paths,
 	}

convert/harness/yaml/failure.go

@@ -23,7 +23,7 @@ const (
 	FailureTypeTimeout                 FailureType = "Timeout"
 	FailureTypeUnknown                 FailureType = "Unknown"
 	FailureTypeVerification            FailureType = "Verification"
-	FailureTypeUserMarkFail            FailureType = "UserMarkFail"
+	FailureTypeUserMarkFail            FailureType = "UserMarkedFailure"
 )
 
 type ActionType string

convert/harness/yaml/pipeline.go

@@ -65,11 +65,11 @@ type (
 
 	// Cache defines the cache settings.
 	Cache struct {
-		Enabled bool     `json:"enabled,omitempty" yaml:"enabled,omitempty"`
+		Enabled *flexible.Field[bool]     `json:"enabled,omitempty" yaml:"enabled,omitempty"`
 		Key     string   `json:"key,omitempty"     yaml:"key,omitempty"`
 		Paths   []string `json:"paths,omitempty"   yaml:"paths,omitempty"`
 		Policy  string   `json:"policy,omitempty"  yaml:"policy,omitempty"`
-		Override bool    `json:"override,omitempty"  yaml:"override,omitempty"`
+		Override *flexible.Field[bool]    `json:"override,omitempty"  yaml:"override,omitempty"`
 	}
 
 	// Codebase defines a codebase.

convert/harness/yaml/step.go

@@ -236,7 +236,7 @@ type (
 		ImagePullPolicy  string            `json:"imagePullPolicy,omitempty"  yaml:"imagePullPolicy,omitempty"`
 		IntelligenceMode *flexible.Field[bool]              `json:"intelligenceMode,omitempty" yaml:"intelligenceMode,omitempty"`
 		Globs            []string          `json:"globs,omitempty"            yaml:"globs,omitempty"`
-		RunAsUser        string            `json:"runAsUser,omitempty"        yaml:"runAsUser,omitempty"`
+		RunAsUser        *flexible.Field[int]             `json:"runAsUser,omitempty"        yaml:"runAsUser,omitempty"`
 		Resources        *Resources        `json:"resources,omitempty"        yaml:"resources,omitempty"`
 	}
 
@@ -341,23 +341,23 @@ type (
 		Privileged      *flexible.Field[bool]                    `json:"privileged,omitempty"      yaml:"privileged,omitempty"`
 		Reports         *Report                `json:"reports,omitempty"         yaml:"reports,omitempty"`
 		Resources       *Resources             `json:"resources,omitempty"       yaml:"resources,omitempty"`
-		RunAsUser       string                 `json:"runAsUser,omitempty"       yaml:"runAsUser,omitempty"`
+		RunAsUser       *flexible.Field[int]                 `json:"runAsUser,omitempty"       yaml:"runAsUser,omitempty"`
 		Settings        map[string]interface{} `json:"settings,omitempty"        yaml:"settings,omitempty"`
 		Entrypoint      *flexible.Field[[]string]               `json:"entrypoint,omitempty"      yaml:"entrypoint,omitempty"`
 	}
 
 	StepGitClone struct {
 		CommonStepSpec
-		Repository     string     `json:"repoName,omitempty"    yaml:"repoNama,omitempty"`
+		Repository     string     `json:"repoName,omitempty"    yaml:"repoName,omitempty"`
 		ConnRef        string     `json:"connectorRef,omitempty"    yaml:"connectorRef,omitempty"`
 		BuildType      *flexible.Field[Build]     `json:"build,omitempty"    yaml:"build,omitempty"`
 		CloneDirectory string     `json:"cloneDirectory,omitempty"    yaml:"cloneDirectory,omitempty"`
 		Privileged     *flexible.Field[bool]       `json:"privileged,omitempty"      yaml:"privileged,omitempty"`
-		Depth          *flexible.Field[int]     `json:"depth,omitempty"    yaml:"cloneDirectory,omitempty"`
+		Depth          *flexible.Field[int]     `json:"depth,omitempty"    yaml:"depth,omitempty"`
 		Resources      *Resources `json:"resources,omitempty"       yaml:"resources,omitempty"`
-		SSLVerify      string     `json:"sslVerify,omitempty"    yaml:"cloneDirectory,omitempty"`
+		SSLVerify      string     `json:"sslVerify,omitempty"    yaml:"sslVerify,omitempty"`
 		RunAsUser      string     `json:"runAsUser,omitempty"       yaml:"runAsUser,omitempty"`
-		Timeout        string     `json:"timeout,omitempty"    yaml:"cloneDirectory,omitempty"`
+		Timeout        string     `json:"timeout,omitempty"    yaml:"timeout,omitempty"`
 	}
 
 	StepAction struct {
@@ -406,7 +406,7 @@ type (
 		PortBindings    map[string]string `json:"portBindings,omitempty"    yaml:"portBindings,omitempty"`
 		Privileged      *flexible.Field[bool]               `json:"privileged,omitempty"      yaml:"privileged,omitempty"`
 		Resources       *Resources        `json:"resources,omitempty"       yaml:"resources,omitempty"`
-		RunAsUser       string            `json:"runAsUser,omitempty"       yaml:"runAsUser,omitempty"`
+		RunAsUser       *flexible.Field[int]            `json:"runAsUser,omitempty"       yaml:"runAsUser,omitempty"       v1path:"-"`
 		Reports         *Report           `json:"reports,omitempty"         yaml:"reports,omitempty"`
 		Shell           string            `json:"shell,omitempty"           yaml:"shell,omitempty"`
 	}
@@ -698,6 +698,8 @@ func (s *Step) UnmarshalJSON(data []byte) error {
 		s.Spec = new(StepIACMTerraformPlugin)
 	case StepTypeIACMOpenTofuPlugin:
 		s.Spec = new(StepIACMOpenTofuPlugin)
+	case StepTypeBitrise:
+		s.Spec = new(StepBitrise)
 	default:
 		// log.Printf("unknown step type while unmarshalling %s", s.Type)
 		return fmt.Errorf("unknown step type %s", s.Type)

convert/harness/yaml/step_iacm.go

@@ -14,6 +14,7 @@ type (
 	}
 
 	StepIACMOpenTofuPlugin struct {
+		CommonStepSpec
 		Command string `json:"command,omitempty" yaml:"command,omitempty"`
 		Target *flexible.Field[[]string] `json:"target,omitempty" yaml:"target,omitempty"`
 		Replace *flexible.Field[[]string] `json:"replace,omitempty" yaml:"replace,omitempty"`

convert/v0tov1/convert_helpers/convert_output_variables_test.go

@@ -0,0 +1,111 @@
+package converthelpers
+
+import (
+	"testing"
+
+	v0 "github.com/drone/go-convert/convert/harness/yaml"
+	v1 "github.com/drone/go-convert/convert/v0tov1/yaml"
+	"github.com/google/go-cmp/cmp"
+)
+
+func TestConvertOutputVariables(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    []*v0.Output
+		expected []*v1.Output
+	}{
+		{
+			name:     "nil input",
+			input:    nil,
+			expected: []*v1.Output{},
+		},
+		{
+			name:     "empty input",
+			input:    []*v0.Output{},
+			expected: []*v1.Output{},
+		},
+		{
+			name: "single output with value",
+			input: []*v0.Output{
+				{Name: "MY_VAR", Value: "output_value"},
+			},
+			expected: []*v1.Output{
+				{Alias: "MY_VAR", Name: "output_value", Mask: false},
+			},
+		},
+		{
+			name: "single output name fallback when value is empty",
+			input: []*v0.Output{
+				{Name: "MY_VAR", Value: ""},
+			},
+			expected: []*v1.Output{
+				{Alias: "MY_VAR", Name: "MY_VAR", Mask: false},
+			},
+		},
+		{
+			name: "multiple outputs",
+			input: []*v0.Output{
+				{Name: "VAR_A", Value: "val_a"},
+				{Name: "VAR_B", Value: "val_b"},
+				{Name: "VAR_C", Value: "val_c"},
+			},
+			expected: []*v1.Output{
+				{Alias: "VAR_A", Name: "val_a", Mask: false},
+				{Alias: "VAR_B", Name: "val_b", Mask: false},
+				{Alias: "VAR_C", Name: "val_c", Mask: false},
+			},
+		},
+		{
+			name: "output with Type Secret sets mask true",
+			input: []*v0.Output{
+				{Name: "SECRET_VAR", Value: "secret_val", Type: "Secret"},
+			},
+			expected: []*v1.Output{
+				{Alias: "SECRET_VAR", Name: "secret_val", Mask: true},
+			},
+		},
+		{
+			name: "output with non-Secret type sets mask false",
+			input: []*v0.Output{
+				{Name: "NORMAL_VAR", Value: "normal_val", Type: "String"},
+			},
+			expected: []*v1.Output{
+				{Alias: "NORMAL_VAR", Name: "normal_val", Mask: false},
+			},
+		},
+		{
+			name: "nil entries in slice are skipped",
+			input: []*v0.Output{
+				{Name: "VAR_A", Value: "val_a"},
+				nil,
+				{Name: "VAR_C", Value: "val_c"},
+			},
+			expected: []*v1.Output{
+				{Alias: "VAR_A", Name: "val_a", Mask: false},
+				{Alias: "VAR_C", Name: "val_c", Mask: false},
+			},
+		},
+		{
+			name: "mixed secret and non-secret outputs",
+			input: []*v0.Output{
+				{Name: "PUBLIC", Value: "pub_val", Type: "String"},
+				{Name: "PRIVATE", Value: "priv_val", Type: "Secret"},
+				{Name: "FALLBACK", Value: ""},
+			},
+			expected: []*v1.Output{
+				{Alias: "PUBLIC", Name: "pub_val", Mask: false},
+				{Alias: "PRIVATE", Name: "priv_val", Mask: true},
+				{Alias: "FALLBACK", Name: "FALLBACK", Mask: false},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := ConvertOutputVariables(tt.input)
+			if diff := cmp.Diff(tt.expected, result); diff != "" {
+				t.Errorf("mismatch (-want +got):\n%s", diff)
+			}
+		})
+	}
+}