https://veertu.atlassian.net/browse/CLOUD-1516: version wasn't being set + fix for SSH retries

Author: NorseGaud

.goreleaser.yaml

@@ -8,8 +8,8 @@ before:
 builds:
   - main: cmd/anka-cloud-gitlab-executor/main.go
     ldflags: >
-      -X github.com/veertuinc/anka-cloud-gitlab-executor/internal/version.Version={{.Version}}
-      -X github.com/veertuinc/anka-cloud-gitlab-executor/internal/version.Commit={{.ShortCommit}}
+      -X github.com/veertuinc/anka-cloud-gitlab-executor/internal/version.version={{.Version}}
+      -X github.com/veertuinc/anka-cloud-gitlab-executor/internal/version.commit={{.ShortCommit}}
     env:
       - CGO_ENABLED=0
     goos:

README.md

@@ -60,8 +60,8 @@ Accepted values for booleans are: "1", "t", "T", "true", "TRUE", "True", "0", "f
 | ANKA_CLOUD_VM_VRAM_MB | ❌ | Number | Set RAM in MiB for the VM. Only works on `stopped` templates. Minimum value of 1 |
 | ANKA_CLOUD_BUILDS_DIR | ❌ | String | Absolute path to a directory where builds are stored in the VM. If not supplied, "/tmp/builds" is used. |
 | ANKA_CLOUD_CACHE_DIR | ❌ | String | Absolute path to a directory where build caches are stored in the VM. If not supplied, "/tmp/cache" is used. |
-| ANKA_SSH_CONNECTION_ATTEMPTS | ❌ | Number | The attempts to make when sshing to the VM. Useful when VMs take a long time to start under stressful situations or slow disks (like EBS). Defaults to `4` -- Minimum value of 1 |
-| ANKA_SSH_CONNECTION_ATTEMPT_DELAY | ❌ | Number | The delay between ssh connection attempts in seconds. Defaults to `5` |
+| ANKA_CLOUD_SSH_CONNECTION_ATTEMPTS | ❌ | Number | The attempts to make when sshing to the VM. Useful when VMs take a long time to start under stressful situations or slow disks (like EBS). Defaults to `4` -- Minimum value of 1 |
+| ANKA_CLOUD_SSH_CONNECTION_ATTEMPT_DELAY | ❌ | Number | The delay between ssh connection attempts in seconds. Defaults to `5` |
 | ANKA_CLOUD_SSH_USER_NAME | ❌ | String | SSH user name to use inside VM. Defaults to "anka". This can also be set via a command line flags to prevent this value from being exposed to the job. See example below. |
 | ANKA_CLOUD_SSH_PASSWORD | ❌ | String | SSH password to use inside VM. Defaults to "admin". This can also be set via a command line flags to prevent this value from being exposed to the job. See example below. |
 

internal/gitlab/vars.go

@@ -114,19 +114,6 @@ func InitEnv() (Environment, error) {
 		e.SSHPassword = os.Getenv(varSshPassword)
 	}
 
-	if sshAttempts, ok, err := GetIntEnvVar(varSshAttempts); ok {
-		if err != nil {
-			return e, fmt.Errorf("%w %q: %w", ErrInvalidVar, varSshAttempts, err)
-		}
-		e.SSHAttempts = sshAttempts
-	}
-	if sshConnectionAttemptDelay, ok, err := GetIntEnvVar(varSshConnectionAttemptDelay); ok {
-		if err != nil {
-			return e, fmt.Errorf("%w %q: %w", ErrInvalidVar, varSshConnectionAttemptDelay, err)
-		}
-		e.SSHConnectionAttemptDelay = sshConnectionAttemptDelay
-	}
-
 	e.TemplateId = os.Getenv(varTemplateId)
 	e.TemplateName = os.Getenv(varTemplateName)
 	e.TemplateTag = os.Getenv(varTemplateTag)
@@ -194,6 +181,20 @@ func InitEnv() (Environment, error) {
 		e.VmVcpu = vcpu
 	}
 
+	if sshAttempts, ok, err := GetIntEnvVar(varSshAttempts); ok {
+		if err != nil {
+			return e, fmt.Errorf("%w %q: %w", ErrInvalidVar, varSshAttempts, err)
+		}
+		e.SSHAttempts = sshAttempts
+	}
+
+	if sshConnectionAttemptDelay, ok, err := GetIntEnvVar(varSshConnectionAttemptDelay); ok {
+		if err != nil {
+			return e, fmt.Errorf("%w %q: %w", ErrInvalidVar, varSshConnectionAttemptDelay, err)
+		}
+		e.SSHConnectionAttemptDelay = sshConnectionAttemptDelay
+	}
+
 	return e, nil
 }