From 25eab2277d2980cc11b2a547d23614b110d530a9 Mon Sep 17 00:00:00 2001
From: Martin McCaffery <martin.mccaffery@think-ahead.tech>
Date: Tue, 21 Oct 2025 16:28:40 +0200
Subject: [PATCH] chore(api): upgrade edge connect client to v2

---
 go.mod               |  2 +-
 go.sum               |  4 ++--
 provider/provider.go | 24 ++++++++++++++----------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/go.mod b/go.mod
index 25c353e..02d2ca6 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module edp.buildth.ing/DevFW-CICD/garm-provider-edge-connect
 go 1.25.1
 
 require (
-	edp.buildth.ing/DevFW-CICD/edge-connect-client v1.0.0
+	edp.buildth.ing/DevFW-CICD/edge-connect-client/v2 v2.0.2
 	github.com/BurntSushi/toml v1.5.0
 	github.com/cloudbase/garm-provider-common v0.1.7
 	k8s.io/api v0.34.1
diff --git a/go.sum b/go.sum
index b9a1607..4b4285c 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-edp.buildth.ing/DevFW-CICD/edge-connect-client v1.0.0 h1:WcQmJNHS/4dlGx3lpw3x0hZdPj+GKSdGsQrWRxpdhyI=
-edp.buildth.ing/DevFW-CICD/edge-connect-client v1.0.0/go.mod h1:qZUPl2hFLNuhtkIojGfSq/MF7DQJGwvq6KbmtqPwZws=
+edp.buildth.ing/DevFW-CICD/edge-connect-client/v2 v2.0.2 h1:AcHIt5oOevf8NJPDRE/rpWHBWMStMWlq0A+jz7Wd5Oo=
+edp.buildth.ing/DevFW-CICD/edge-connect-client/v2 v2.0.2/go.mod h1:nPZ4K4BB7eXyeSrcHXvSPkNZbs+XgmxbDJOM4KhbI1A=
 github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
 github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/cloudbase/garm-provider-common v0.1.7 h1:V0upTejFRDiyFBO4hhkMWmPtmRTguyOt/4i1u9/rfbg=
diff --git a/provider/provider.go b/provider/provider.go
index da2493f..823cc04 100644
--- a/provider/provider.go
+++ b/provider/provider.go
@@ -25,7 +25,7 @@ import (
 	"strings"
 	"time"
 
-	"edp.buildth.ing/DevFW-CICD/edge-connect-client/sdk/edgeconnect"
+	edgeconnect "edp.buildth.ing/DevFW-CICD/edge-connect-client/v2/sdk/edgeconnect/v2"
 	"edp.buildth.ing/DevFW-CICD/garm-provider-edge-connect/config"
 	"edp.buildth.ing/DevFW-CICD/garm-provider-edge-connect/internal/spec"
 
@@ -83,7 +83,7 @@ func (a *edgeConnectProvider) CreateInstance(ctx context.Context, bootstrapParam
 	log.Printf("Executing CreateInstance with %v\n", bootstrapParams)
 	log.Printf("Executing CreateInstance with RepoURL %v\n", bootstrapParams.RepoURL)
 
-	instancename := fmt.Sprintf("garm-%v-%v-%v", a.controllerID[:8], bootstrapParams.PoolID[:8], strings.ToLower(bootstrapParams.Name))
+	instancename := fmt.Sprintf("garm-%v-%v", bootstrapParams.PoolID[:8], strings.ToLower(bootstrapParams.Name))
 
 	gitHubScopeDetails, err := spec.ExtractGitHubScopeDetails(bootstrapParams.RepoURL)
 	if err != nil {
@@ -147,7 +147,7 @@ func (a *edgeConnectProvider) CreateInstance(ctx context.Context, bootstrapParam
 	_, err = a.client.ShowApp(ctx, edgeconnect.AppKey{
 		Organization: a.cfg.Organization,
 		Name:         instancename,
-		Version:      "0.0.1",
+		Version:      "1",
 	}, a.cfg.Region)
 	if err != nil && !errors.Is(err, edgeconnect.ErrResourceNotFound) {
 		return params.ProviderInstance{}, err
@@ -159,7 +159,7 @@ func (a *edgeConnectProvider) CreateInstance(ctx context.Context, bootstrapParam
 				Key: edgeconnect.AppKey{
 					Organization: a.cfg.Organization,
 					Name:         instancename,
-					Version:      "0.0.1",
+					Version:      "1",
 				},
 				Deployment:       "kubernetes",
 				ImageType:        "Docker",
@@ -167,18 +167,18 @@ func (a *edgeConnectProvider) CreateInstance(ctx context.Context, bootstrapParam
 				AllowServerless:  true,
 				ServerlessConfig: struct{}{},
 				DefaultFlavor: edgeconnect.Flavor{
-					Name: "EU.small",
+					Name: "defualt",
 				},
 				DeploymentGenerator: "kubernetes-basic",
 				DeploymentManifest:  string(manifest),
 				RequiredOutboundConnections: []edgeconnect.SecurityRule{
-					edgeconnect.SecurityRule{
+					{
 						PortRangeMax: 65535,
 						PortRangeMin: 1,
 						Protocol:     "TCP",
 						RemoteCIDR:   "0.0.0.0/0",
 					},
-					edgeconnect.SecurityRule{
+					{
 						PortRangeMax: 65535,
 						PortRangeMin: 1,
 						Protocol:     "UDP",
@@ -212,10 +212,10 @@ func (a *edgeConnectProvider) CreateInstance(ctx context.Context, bootstrapParam
 				AppKey: edgeconnect.AppKey{
 					Organization: a.cfg.Organization,
 					Name:         instancename,
-					Version:      "0.0.1",
+					Version:      "1",
 				},
 				Flavor: edgeconnect.Flavor{
-					Name: "EU.small",
+					Name: "defualt",
 				},
 			},
 		})
@@ -263,6 +263,10 @@ func GetRunnerEnvs(gitHubScope GitHubScopeDetails, bootstrapParams params.Bootst
 			Name:  "RUNNER_LABELS",
 			Value: strings.Join(bootstrapParams.Labels, ","),
 		},
+		{
+			Name:  "RUNNER_HOME",
+			Value: "/tmp",
+		},
 		{
 			Name:  "RUNNER_NO_DEFAULT_LABELS",
 			Value: "true",
@@ -273,7 +277,7 @@ func GetRunnerEnvs(gitHubScope GitHubScopeDetails, bootstrapParams params.Bootst
 		},
 		{
 			Name:  "RUNNER_WORKDIR",
-			Value: "/runner/_work/",
+			Value: "/tmp/_work/",
 		},
 		{
 			Name:  "GITHUB_URL",