Merge pull request #182 from drone/fix_enum

fix enum types in go-convert

Author: vistaarjuneja

convert/circle/util.go

@@ -233,35 +233,35 @@ func convertPlatform(job *circle.Job, config *circle.Config) *harness.Platform {
 	}
 	if executor.Windows != nil {
 		return &harness.Platform{
-			Os:   harness.OSWindows,
-			Arch: harness.ArchAmd64,
+			Os:   harness.OSWindows.String(),
+			Arch: harness.ArchAmd64.String(),
 		}
 	}
 	if executor.Machine != nil {
 		if strings.Contains(executor.Machine.Image, "win") ||
 			strings.Contains(executor.ResourceClass, "win") {
 			return &harness.Platform{
-				Os:   harness.OSWindows,
-				Arch: harness.ArchAmd64,
+				Os:   harness.OSWindows.String(),
+				Arch: harness.ArchAmd64.String(),
 			}
 		}
 		if strings.Contains(executor.Machine.Image, "arm") ||
 			strings.Contains(executor.ResourceClass, "arm") {
 			return &harness.Platform{
-				Os:   harness.OSLinux,
-				Arch: harness.ArchArm64,
+				Os:   harness.OSLinux.String(),
+				Arch: harness.ArchArm64.String(),
 			}
 		}
 	}
 	if executor.Macos != nil {
 		return &harness.Platform{
-			Os:   harness.OSMacos,
-			Arch: harness.ArchArm64,
+			Os:   harness.OSMacos.String(),
+			Arch: harness.ArchArm64.String(),
 		}
 	}
 	return &harness.Platform{
-		Os:   harness.OSLinux,
-		Arch: harness.ArchAmd64,
+		Os:   harness.OSLinux.String(),
+		Arch: harness.ArchAmd64.String(),
 	}
 }
 

convert/cloudbuild/convert.go

@@ -137,8 +137,8 @@ func (d *Converter) convert(src *cloudbuild.Config) ([]byte, error) {
 		Cache: nil, // No Google equivalent
 		Envs:  nil,
 		Platform: &harness.Platform{
-			Os:   harness.OSLinux,
-			Arch: harness.ArchAmd64,
+			Os:   harness.OSLinux.String(),
+			Arch: harness.ArchAmd64.String(),
 		},
 		Runtime: d.convertRuntime(src),
 		Steps:   d.convertSteps(src),

convert/drone/convert.go

@@ -686,17 +686,17 @@ func convertPlatform(src v1.Platform) *v2.Platform {
 	dst := new(v2.Platform)
 	switch src.OS {
 	case "windows", "win", "win32":
-		dst.Os = v2.OSWindows
+		dst.Os = v2.OSWindows.String()
 	case "darwin", "macos", "mac":
-		dst.Os = v2.OSDarwin
+		dst.Os = v2.OSDarwin.String()
 	default:
-		dst.Os = v2.OSLinux
+		dst.Os = v2.OSLinux.String()
 	}
 	switch src.Arch {
 	case "arm", "arm64":
-		dst.Arch = v2.ArchArm64
+		dst.Arch = v2.ArchArm64.String()
 	default:
-		dst.Arch = v2.ArchAmd64
+		dst.Arch = v2.ArchAmd64.String()
 	}
 	return dst
 }

convert/github/convert.go

@@ -309,13 +309,13 @@ func convertRunsOn(src string) *harness.Platform {
 	dst := new(harness.Platform)
 	switch {
 	case strings.Contains(src, "windows"), strings.Contains(src, "win"):
-		dst.Os = harness.OSWindows
+		dst.Os = harness.OSWindows.String()
 	case strings.Contains(src, "darwin"), strings.Contains(src, "macos"), strings.Contains(src, "mac"):
-		dst.Os = harness.OSDarwin
+		dst.Os = harness.OSDarwin.String()
 	default:
-		dst.Os = harness.OSLinux
+		dst.Os = harness.OSLinux.String()
 	}
-	dst.Arch = harness.ArchAmd64 // we assume amd64 for now
+	dst.Arch = harness.ArchAmd64.String() // we assume amd64 for now
 	return dst
 }
 

convert/harness/downgrader/downgrade.go

@@ -714,7 +714,7 @@ func convertPlatform(platform *v1.Platform, runtime *v0.Runtime) *v0.Platform {
 		var os, arch string
 
 		// convert the OS name
-		switch platform.Os.String() {
+		switch platform.Os {
 		case "linux":
 			os = "Linux"
 		case "windows":
@@ -726,7 +726,7 @@ func convertPlatform(platform *v1.Platform, runtime *v0.Runtime) *v0.Platform {
 		}
 
 		// convert the Arch name
-		switch platform.Arch.String() {
+		switch platform.Arch {
 		case "amd64":
 			arch = "Amd64"
 		case "arm", "arm64":

go.mod

@@ -7,12 +7,12 @@ require (
 	github.com/bmatcuk/doublestar v1.3.4
 	github.com/buildkite/yaml v2.1.0+incompatible
 	github.com/docker/go-units v0.4.0
-	github.com/drone/spec v0.0.0-20230911203429-f7f1b5e9aa40
+	github.com/drone/spec v0.0.0-20230919004456-7455b8913ff5
 	github.com/ghodss/yaml v1.0.0
 	github.com/google/go-cmp v0.5.9
 	github.com/google/subcommands v1.2.0
 	github.com/gotidy/ptr v1.4.0
-	golang.org/x/text v0.7.0
+	golang.org/x/text v0.13.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 

go.sum

@@ -8,6 +8,8 @@ github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw
 github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/drone/spec v0.0.0-20230911203429-f7f1b5e9aa40 h1:XTADVN1LXkDk+TJc0WQr3ohWu94/NSP4FoIo50gwxIw=
 github.com/drone/spec v0.0.0-20230911203429-f7f1b5e9aa40/go.mod h1:pdaL6nOipGF/5L6jAu1DwAeLzmZdaU3+UIvQ1MUIZ9Y=
+github.com/drone/spec v0.0.0-20230919004456-7455b8913ff5 h1:NgAseJNQpJE3XtgJUPu4x7x5fcBjqZ3oKHDJfwBYdWk=
+github.com/drone/spec v0.0.0-20230919004456-7455b8913ff5/go.mod h1:KyQZA9qwuscbbM7yTrtZg25Wammoc5GKwaRem8kDA5k=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
@@ -18,6 +20,8 @@ github.com/gotidy/ptr v1.4.0 h1:7++suUs+HNHMnyz6/AW3SE+4EnBhupPSQTSI7QNijVc=
 github.com/gotidy/ptr v1.4.0/go.mod h1:MjRBG6/IETiiZGWI8LrRtISXEji+8b/jigmj2q0mEyM=
 golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=