release/v1.4.1 (#37)

* updates to go mods

* go releaser version bump + quick fix for failing test

* show cleanup logs in runner logs

Author: NorseGaud

.gitignore

@@ -3,3 +3,4 @@
 anka-gle
 dist/
 vendor/
+.DS_Store

.goreleaser.yaml

@@ -1,4 +1,4 @@
-version: 1
+version: 2
 
 before:
   hooks:

go.mod

@@ -1,14 +1,14 @@
 module github.com/veertuinc/anka-cloud-gitlab-executor
 
-go 1.20
+go 1.24
 
 require (
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
-	golang.org/x/crypto v0.21.0
+	golang.org/x/crypto v0.31.0
 )
 
 require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
 )

go.sum

@@ -6,10 +6,11 @@ github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
 github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
-golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
+golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/ankacloud/client.go

@@ -33,7 +33,7 @@ func (c *APIClient) parse(body []byte) (response, error) {
 	}
 
 	if r.Status != statusOK {
-		return r, fmt.Errorf(r.Message)
+		return r, fmt.Errorf("%s", r.Message)
 	}
 
 	return r, nil

internal/command/cleanup.go

@@ -3,7 +3,6 @@ package command
 import (
 	"context"
 	"fmt"
-	"os"
 
 	"github.com/spf13/cobra"
 	"github.com/veertuinc/anka-cloud-gitlab-executor/internal/ankacloud"
@@ -24,9 +23,9 @@ var cleanupCommand = &cobra.Command{
 }
 
 func executeCleanup(ctx context.Context, env gitlab.Environment) error {
-	log.SetOutput(os.Stdout)
+	// log.SetOutput(os.Stdout) // prevents us from logging Println, etc
 
-	log.Debugln("running cleanup stage")
+	log.Println("cleanup stage started for job: ", env.GitlabJobUrl)
 
 	if env.KeepAliveOnError && env.GitlabJobStatus == gitlab.JobStatusFailed {
 		log.Colorln("keeping VM alive on error")
@@ -36,22 +35,25 @@ func executeCleanup(ctx context.Context, env gitlab.Environment) error {
 	apiClientConfig := getAPIClientConfig(env)
 	apiClient, err := ankacloud.NewAPIClient(apiClientConfig)
 	if err != nil {
-		return fmt.Errorf("failed to initialize API client with config +%v: %w", apiClientConfig, err)
+		log.Errorf("cleanup: failed to initialize API client with config +%v: %v", apiClientConfig, err)
+		return fmt.Errorf("cleanup: failed to initialize API client with config +%v: %v", apiClientConfig, err)
 	}
 
 	controller := ankacloud.NewController(apiClient)
 
 	instance, err := controller.GetInstanceByExternalId(ctx, env.GitlabJobUrl)
 	if err != nil {
-		return fmt.Errorf("failed to get instance by external id %q: %w", env.GitlabJobUrl, err)
+		log.Errorf("cleanup: failed to get instance by external id %q: %v", env.GitlabJobUrl, err)
+		return fmt.Errorf("cleanup: failed to get instance by external id %q: %v", env.GitlabJobUrl, err)
 	}
 	log.Debugf("instance id: %s\n", instance.Id)
 
 	err = controller.TerminateInstance(ctx, ankacloud.TerminateInstanceRequest{
 		Id: instance.Id,
 	})
 	if err != nil {
-		return fmt.Errorf("failed to terminate instance %q: %w", instance.Id, err)
+		log.Errorf("cleanup: failed to terminate instance %q: %v", instance.Id, err)
+		return fmt.Errorf("cleanup: failed to terminate instance %q: %v", instance.Id, err)
 	}
 	log.Debugf("Issuing termination request for instance %s\n", instance.Id)