Skip to content

Commit e56e0ce

Browse files
anurag-harnessanurag-harness
authored
[feat]: [CI-11166]: Upgrade go-convert and spec (#16)
* [feat]: [CI-11166]: Upgrade go-convert and spec * upgrade convert * Update go-convert
1 parent 6106c29 commit e56e0ce

6 files changed

Lines changed: 18 additions & 58 deletions

File tree

‎builder/builder.go‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ func (b *Builder) Build(fsys fs.FS) ([]byte, error) {
4747
stage.Spec = stageci
4848

4949
pipeline := new(spec.Pipeline)
50-
pipeline.Name = "sample pipeline"
5150
pipeline.Stages = append(pipeline.Stages, stage)
5251
for _, rule := range b.vendor.GetRules() {
5352
if err := rule(fsys, pipeline); err == utils.SkipAll {
@@ -59,7 +58,13 @@ func (b *Builder) Build(fsys fs.FS) ([]byte, error) {
5958
// never prevent yaml generation.
6059
}
6160

62-
yml, err := yaml.Marshal(pipeline)
61+
config := new(spec.Config)
62+
config.Type = "pipeline"
63+
config.Kind = "pipeline"
64+
config.Version = 1
65+
config.Spec = pipeline
66+
67+
yml, err := yaml.Marshal(config)
6368
if (b.version == "v1") || (b.version == "default") {
6469
return yml, err
6570
} else {

‎builder/rules/harness.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ func NewHarness() Harness {
1212

1313
func (h Harness) GetRules() []Rule {
1414
return []Rule{
15-
harness.ConfigurePipelineVersion,
1615
harness.ConfigurePlatform,
1716
harness.ConfigureGo,
1817
harness.ConfigureGoGlide,

‎builder/rules/harness/rule_platform.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ func ConfigurePlatform(fsys fs.FS, pipeline *spec.Pipeline) error {
2323

2424
// unless this is an xcode project
2525
if isXcode(fsys) {
26-
stage.Platform.Os = spec.OSMacos
27-
stage.Platform.Arch = spec.ArchArm64
26+
stage.Platform.Os = spec.OSMacos.String()
27+
stage.Platform.Arch = spec.ArchArm64.String()
2828
}
2929

3030
return nil

‎builder/rules/harness/rule_version.go‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎go.mod‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,15 @@ module github.com/wings-software/autogen-go
33
go 1.19
44

55
require (
6-
github.com/drone/spec v0.0.0-20230328162846-c2bc4a6d62ab
6+
github.com/drone/go-convert v0.0.0-20240305164238-a810cce167fd
7+
github.com/drone/spec v0.0.0-20230920145636-3827abdce961
78
github.com/ghodss/yaml v1.0.0
89
)
910

1011
require (
11-
github.com/bmatcuk/doublestar v1.3.4 // indirect
12-
github.com/buildkite/yaml v2.1.0+incompatible // indirect
13-
github.com/coreos/go-semver v0.3.0 // indirect
1412
github.com/docker/go-units v0.5.0 // indirect
15-
github.com/drone/drone-go v1.7.1 // indirect
16-
github.com/drone/go-convert v0.0.0-20230329091825-a238380a6b0e // indirect
17-
github.com/google/subcommands v1.2.0 // indirect
18-
github.com/gotidy/ptr v1.4.0 // indirect
1913
github.com/kr/text v0.2.0 // indirect
20-
golang.org/x/text v0.7.0 // indirect
14+
golang.org/x/text v0.13.0 // indirect
2115
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
2216
gopkg.in/yaml.v2 v2.4.0 // indirect
23-
gopkg.in/yaml.v3 v3.0.1 // indirect
2417
)

‎go.sum‎

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,24 @@
1-
github.com/99designs/httpsignatures-go v0.0.0-20170731043157-88528bf4ca7e/go.mod h1:Xa6lInWHNQnuWoF0YPSsx+INFA9qk7/7pTjwb3PInkY=
2-
github.com/bmatcuk/doublestar v1.3.4 h1:gPypJ5xD31uhX6Tf54sDPUOBXTqKH4c9aPY66CyQrS0=
3-
github.com/bmatcuk/doublestar v1.3.4/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE=
4-
github.com/buildkite/yaml v2.1.0+incompatible h1:xirI+ql5GzfikVNDmt+yeiXpf/v1Gt03qXTtT5WXdr8=
5-
github.com/buildkite/yaml v2.1.0+incompatible/go.mod h1:UoU8vbcwu1+vjZq01+KrpSeLBgQQIjL/H7Y6KwikUrI=
6-
github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
7-
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
81
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
92
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
103
github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
11-
github.com/drone/drone-go v1.7.1 h1:ZX+3Rs8YHUSUQ5mkuMLmm1zr1ttiiE2YGNxF3AnyDKw=
12-
github.com/drone/drone-go v1.7.1/go.mod h1:fxCf9jAnXDZV1yDr0ckTuWd1intvcQwfJmTRpTZ1mXg=
13-
github.com/drone/go-convert v0.0.0-20230329091825-a238380a6b0e h1:ybfe4Po+BUQjm2BpIZjEpng9fXBYgPvAehNe2edC0lY=
14-
github.com/drone/go-convert v0.0.0-20230329091825-a238380a6b0e/go.mod h1:HamZvO81G2K1g9FeRVliWaN0vEV4AMSfMsINzI2ZbS4=
15-
github.com/drone/spec v0.0.0-20230203155728-6f5b316cad3e h1:9IrlHM84CSV6ui+PnxWRTslm8VJiyvpyd8tIsUVCSKE=
16-
github.com/drone/spec v0.0.0-20230203155728-6f5b316cad3e/go.mod h1:lhM5nV3zKzXnHD2WPLQ2KoJ/65hr3vr0KaiKod2T3W8=
17-
github.com/drone/spec v0.0.0-20230316030012-8fb992844a55 h1:3JssRUXnMnGVSXUni4mkln4TGzvHMgcN4lpviuH35dY=
18-
github.com/drone/spec v0.0.0-20230316030012-8fb992844a55/go.mod h1:pdaL6nOipGF/5L6jAu1DwAeLzmZdaU3+UIvQ1MUIZ9Y=
19-
github.com/drone/spec v0.0.0-20230328162846-c2bc4a6d62ab h1:SCRvpZOFAS/kFo6q0c+oeH+ID0OBDPLpDAx4uHYQwYo=
20-
github.com/drone/spec v0.0.0-20230328162846-c2bc4a6d62ab/go.mod h1:pdaL6nOipGF/5L6jAu1DwAeLzmZdaU3+UIvQ1MUIZ9Y=
4+
github.com/drone/go-convert v0.0.0-20240305164238-a810cce167fd h1:RjIUkMF7oUxrIn4IKUj4DbKjCxTNkC58M/kYSbXFXh0=
5+
github.com/drone/go-convert v0.0.0-20240305164238-a810cce167fd/go.mod h1:PyCDcuAhGF6W0VJ6qMmlM47dsSyGv/zDiMqeJxMFuGM=
6+
github.com/drone/spec v0.0.0-20230920145636-3827abdce961 h1:aUWrLS2ghyxIpDICpZOV50V1x7JLM3U80UQDQxMKT54=
7+
github.com/drone/spec v0.0.0-20230920145636-3827abdce961/go.mod h1:KyQZA9qwuscbbM7yTrtZg25Wammoc5GKwaRem8kDA5k=
218
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
229
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
23-
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
2410
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
25-
github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN9oE=
26-
github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
27-
github.com/gotidy/ptr v1.4.0 h1:7++suUs+HNHMnyz6/AW3SE+4EnBhupPSQTSI7QNijVc=
28-
github.com/gotidy/ptr v1.4.0/go.mod h1:MjRBG6/IETiiZGWI8LrRtISXEji+8b/jigmj2q0mEyM=
2911
github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
3012
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
3113
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
3214
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
3315
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
3416
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
35-
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
36-
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
17+
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
18+
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
3719
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
3820
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
3921
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
4022
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
4123
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
4224
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
43-
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 commit comments

Comments
 (0)