Merge pull request #36 from veertuinc/release/v1.5.0

v1.5.0

Author: NorseGaud

AGENT.md

@@ -0,0 +1,5 @@
+# Anka Cloud Gitlab Executor Agent Guidelines
+
+1. Keep code D.R.Y (Don't Repeat Yourself) to avoid code duplication and improve readability.
+2. Use meaningful variable names that can be read by a human easily.
+3. Prioritize adding logs and having the developer run the code locally to debug issues if you don't know the answer.

go.mod

@@ -5,10 +5,10 @@ go 1.24
 require (
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
-	golang.org/x/crypto v0.31.0
+	golang.org/x/crypto v0.35.0
 )
 
 require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
 )

go.sum

@@ -6,11 +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.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=
+golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
+golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
+golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
 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/api.go

@@ -5,9 +5,9 @@ const (
 )
 
 type response struct {
-	Status  string      `json:"status"`
-	Message string      `json:"message"`
-	Body    interface{} `json:"body,omitempty"`
+	Status  string `json:"status"`
+	Message string `json:"message"`
+	Body    any    `json:"body,omitempty"`
 }
 
 type StartupScriptCondition int

internal/ankacloud/client.go

@@ -8,6 +8,7 @@ import (
 	"io"
 	"net/http"
 	"net/url"
+	"strings"
 	"time"
 
 	"github.com/veertuinc/anka-cloud-gitlab-executor/internal/gitlab"
@@ -39,6 +40,30 @@ func (c *APIClient) parse(body []byte) (response, error) {
 	return r, nil
 }
 
+// readResponseBodyWithRetry reads the response body and retries once on unexpected EOF
+func (c *APIClient) readResponseBodyWithRetry(resp *http.Response, req *http.Request) ([]byte, *http.Response, error) {
+	bodyBytes, err := io.ReadAll(resp.Body)
+	if err != nil {
+		if strings.Contains(err.Error(), "unexpected EOF") {
+			time.Sleep(5 * time.Second)
+			// Retry once on unexpected EOF
+			retryResp, retryErr := c.HttpClient.Do(req)
+			if retryErr != nil {
+				return nil, nil, retryErr
+			}
+			defer retryResp.Body.Close()
+
+			bodyBytes, retryErr = io.ReadAll(retryResp.Body)
+			if retryErr != nil {
+				return nil, nil, fmt.Errorf("failed to read response body (retry): %w", retryErr)
+			}
+			return bodyBytes, retryResp, nil
+		}
+		return nil, nil, fmt.Errorf("failed to read response body: %w", err)
+	}
+	return bodyBytes, resp, nil
+}
+
 func toQueryParams(params map[string]string) url.Values {
 	query := url.Values{}
 	for k, v := range params {
@@ -75,9 +100,12 @@ func (c *APIClient) Post(ctx context.Context, endpoint string, payload interface
 	}
 	defer r.Body.Close()
 
-	bodyBytes, err := io.ReadAll(r.Body)
+	bodyBytes, r, err := c.readResponseBodyWithRetry(r, req)
 	if err != nil {
-		return nil, fmt.Errorf("failed to read response body: %w", err)
+		if e, ok := err.(*url.Error); ok && e.Timeout() {
+			return nil, gitlab.TransientError(fmt.Errorf("failed to send POST request to %s with payload %+v (retry): %w", endpointUrl, payload, e))
+		}
+		return nil, err
 	}
 
 	baseResponse, err := c.parse(bodyBytes)
@@ -121,9 +149,12 @@ func (c *APIClient) Delete(ctx context.Context, endpoint string, payload interfa
 	}
 	defer r.Body.Close()
 
-	bodyBytes, err := io.ReadAll(r.Body)
+	bodyBytes, r, err := c.readResponseBodyWithRetry(r, req)
 	if err != nil {
-		return nil, fmt.Errorf("failed to read response body: %w", err)
+		if e, ok := err.(*url.Error); ok && e.Timeout() {
+			return nil, gitlab.TransientError(fmt.Errorf("failed to send DELETE request to %s with payload %+v (retry): %w", endpointUrl, payload, e))
+		}
+		return nil, err
 	}
 
 	baseResponse, err := c.parse(bodyBytes)
@@ -164,9 +195,12 @@ func (c *APIClient) Get(ctx context.Context, endpoint string, queryParams map[st
 	}
 	defer r.Body.Close()
 
-	bodyBytes, err := io.ReadAll(r.Body)
+	bodyBytes, r, err := c.readResponseBodyWithRetry(r, req)
 	if err != nil {
-		return nil, fmt.Errorf("failed to read response body: %w", err)
+		if e, ok := err.(*url.Error); ok && e.Timeout() {
+			return nil, gitlab.TransientError(fmt.Errorf("failed to send GET request to %s (retry): %w", endpointUrl, e))
+		}
+		return nil, err
 	}
 
 	baseResponse, err := c.parse(bodyBytes)

internal/ankacloud/controller.go

@@ -35,7 +35,6 @@ const (
 	StateTerminating InstanceState = "Terminating"
 	StateTerminated  InstanceState = "Terminated"
 	StateError       InstanceState = "Error"
-	StatePushing     InstanceState = "Pushing"
 )
 
 type VM struct {
@@ -176,7 +175,7 @@ func (c *controller) GetAllInstances(ctx context.Context) ([]Instance, error) {
 
 	body, err := c.APIClient.Get(ctx, "/api/v1/vm", nil)
 	if err != nil {
-		return nil, fmt.Errorf("failed to get instances: %w", err)
+		return nil, fmt.Errorf("failed to get all instances: %w", err)
 	}
 
 	var response getAllInstancesResponse
@@ -185,6 +184,13 @@ func (c *controller) GetAllInstances(ctx context.Context) ([]Instance, error) {
 		return nil, fmt.Errorf("failed to parse response body %q: %w", string(body), err)
 	}
 
+	log.ConditionalColorf("got %d instances back from controller\n", len(response.Instances))
+	body, err = json.Marshal(response)
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal response body %q: %w", string(body), err)
+	}
+	log.ConditionalColorf("instances response: %s\n", string(body))
+
 	var instances []Instance
 	for _, instanceWrapper := range response.Instances {
 		instances = append(instances, *instanceWrapper.Instance)
@@ -195,17 +201,38 @@ func (c *controller) GetAllInstances(ctx context.Context) ([]Instance, error) {
 
 func (c *controller) GetInstanceByExternalId(ctx context.Context, externalId string) (*Instance, error) {
 	instances, err := c.GetAllInstances(ctx)
+
+	if len(instances) == 0 {
+		return nil, fmt.Errorf("no instances returned from controller: %w", err)
+	}
+
 	if err != nil {
-		return nil, fmt.Errorf("failed to get instances: %w", err)
+		return nil, fmt.Errorf("failed to get instance by external id %s: %w", externalId, err)
 	}
 
+	var matchingInstances []*Instance
 	for _, instance := range instances {
 		if instance.ExternalId == externalId {
-			return &instance, nil
+			matchingInstances = append(matchingInstances, &instance)
+		}
+	}
+
+	if len(matchingInstances) == 0 {
+		return nil, fmt.Errorf("instance with external id %s not found", externalId)
+	}
+
+	// If multiple instances with the same external ID exist, prioritize by state
+	// Return the first instance that is in a good state (Started, Scheduling, Pulling)
+	for _, instance := range matchingInstances {
+		switch instance.State {
+		case StateStarted, StateScheduling, StatePulling:
+			return instance, nil
 		}
 	}
 
-	return nil, fmt.Errorf("instance with external id %s not found", externalId)
+	// No instances in a usable state - fail explicitly instead of returning Error/Terminated instances
+	return nil, fmt.Errorf("instance with external id %s exists but is not in a usable state (found state: %s)",
+		externalId, matchingInstances[0].State)
 }
 
 func (c *controller) GetTemplateIdByName(ctx context.Context, templateName string) (string, error) {