Merge pull request #5 from fabi200123/set-version-v0.1.0

Update provider to use explicitly version v0.1.0

go.mod

@@ -6,7 +6,7 @@ toolchain go1.22.3
 
 require (
 	github.com/BurntSushi/toml v1.3.2
-	github.com/cloudbase/garm-provider-common v0.1.3
+	github.com/cloudbase/garm-provider-common v0.1.4-0.20240906095211-57315d4ac8ae
 	github.com/equinix/equinix-sdk-go v0.39.1
 	github.com/google/uuid v1.6.0
 	github.com/juju/clock v1.0.3
@@ -29,8 +29,8 @@ require (
 	github.com/teris-io/shortid v0.0.0-20220617161101-71ec9f2aa569 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
-	golang.org/x/crypto v0.25.0 // indirect
-	golang.org/x/sys v0.22.0 // indirect
+	golang.org/x/crypto v0.26.0 // indirect
+	golang.org/x/sys v0.24.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,7 +1,7 @@
 github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
 github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/cloudbase/garm-provider-common v0.1.3 h1:8pHSRs2ljwLHgtDrge68dZ7ILUW97VF5h2ZA2fQubGQ=
-github.com/cloudbase/garm-provider-common v0.1.3/go.mod h1:VIJzbcg5iwyD4ac99tnnwcActfwibn/VOt2MYOFjf2c=
+github.com/cloudbase/garm-provider-common v0.1.4-0.20240906095211-57315d4ac8ae h1:GDcVb/ForsCtpGj2kFH+iPu6/IIj0b5pV/h27qL6+GI=
+github.com/cloudbase/garm-provider-common v0.1.4-0.20240906095211-57315d4ac8ae/go.mod h1:sK26i2NpjjAjhanNKiWw8iPkqt+XeohTKpFnEP7JdZ4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -59,15 +59,15 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
 github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
-golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
-golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
-golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
-golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
+golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
+golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
+golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
+golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
 golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
+golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

main.go

@@ -23,6 +23,7 @@ import (
 	"syscall"
 
 	"github.com/cloudbase/garm-provider-common/execution"
+	commonExecution "github.com/cloudbase/garm-provider-common/execution/common"
 
 	"github.com/cloudbase/garm-provider-equinix/provider"
 )
@@ -32,21 +33,7 @@ var signals = []os.Signal{
 	syscall.SIGTERM,
 }
 
-var (
-	// Version is the version of the application
-	Version = "v0.0.0-unknown"
-)
-
 func main() {
-	// This is an unofficial command. It will be added into future versions of the
-	// external provider interface. For now we manually hardcode it here. This is not
-	// used by GARM itself. It is informative for the user to be able to check the version
-	// of the provider.
-	garmCommand := os.Getenv("GARM_COMMAND")
-	if garmCommand == "GetVersion" {
-		fmt.Println(Version)
-		os.Exit(0)
-	}
 
 	ctx, stop := signal.NotifyContext(context.Background(), signals...)
 	defer stop()
@@ -61,10 +48,10 @@ func main() {
 		log.Fatal(err)
 	}
 
-	result, err := execution.Run(ctx, prov, executionEnv)
+	result, err := executionEnv.Run(ctx, prov)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "failed to run command: %s", err)
-		os.Exit(execution.ResolveErrorToExitCode(err))
+		os.Exit(commonExecution.ResolveErrorToExitCode(err))
 	}
 	if len(result) > 0 {
 		fmt.Fprint(os.Stdout, result)

provider/provider.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/cloudbase/garm-provider-common/execution"
+	execution "github.com/cloudbase/garm-provider-common/execution/v0.1.0"
 	"github.com/cloudbase/garm-provider-common/params"
 	"github.com/cloudbase/garm-provider-equinix/config"
 	"github.com/cloudbase/garm-provider-equinix/internal/spec"
@@ -30,6 +30,8 @@ import (
 
 var _ execution.ExternalProvider = &equinixProvider{}
 
+var Version = "v0.0.0-unknown"
+
 func NewEquinixProvider(configPath, controllerID string) (execution.ExternalProvider, error) {
 	conf, err := config.NewConfig(configPath)
 	if err != nil {
@@ -205,3 +207,8 @@ func (a *equinixProvider) Start(ctx context.Context, instance string) error {
 	}
 	return nil
 }
+
+// GetVersion returns the provider version
+func (a *equinixProvider) GetVersion(ctx context.Context) string {
+	return Version
+}

scripts/build-static.sh

@@ -31,18 +31,18 @@ cd $GARM_SOURCE
 GOOS=linux GOARCH=amd64 go build -mod vendor \
     -o $BUILD_DIR/linux/amd64/$GARM_PROVIDER_NAME \
     -tags osusergo,netgo,sqlite_omit_load_extension \
-    -ldflags "-extldflags '-static' -s -w -X main.Version=$VERSION" .
+    -ldflags "-extldflags '-static' -s -w -X github.com/cloudbase/garm-provider-equinix/provider.Version=$VERSION" .
 GOOS=linux GOARCH=arm64 CC=aarch64-linux-musl-gcc go build \
     -mod vendor \
     -o $BUILD_DIR/linux/arm64/$GARM_PROVIDER_NAME \
     -tags osusergo,netgo,sqlite_omit_load_extension \
-    -ldflags "-extldflags '-static' -s -w -X main.Version=$VERSION" .
+    -ldflags "-extldflags '-static' -s -w -X github.com/cloudbase/garm-provider-equinix/provider.Version=$VERSION" .
 
 # Windows
 GOOS=windows GOARCH=amd64 CC=x86_64-w64-mingw32-cc go build -mod vendor \
     -o $BUILD_DIR/windows/amd64/$GARM_PROVIDER_NAME.exe \
     -tags osusergo,netgo,sqlite_omit_load_extension \
-    -ldflags "-s -w -X main.Version=$VERSION" .
+    -ldflags "-s -w -X github.com/cloudbase/garm-provider-equinix/provider.Version=$VERSION" .
 
 git checkout $CURRENT_BRANCH || true
 chown $USER_ID:$USER_GROUP -R "$OUTPUT_DIR"