Merge remote-tracking branch 'origin/main' into transforms-system-tests

Author: jsoriano

Makefile

@@ -73,10 +73,10 @@ test-stack-command-86:
 	./scripts/test-stack-command.sh 8.6.2
 
 test-stack-command-8x:
-	./scripts/test-stack-command.sh 8.17.0-af3fc043-SNAPSHOT
+	./scripts/test-stack-command.sh 8.17.0-8ac6e7f5-SNAPSHOT
 
 test-stack-command-9x:
-	./scripts/test-stack-command.sh 9.0.0-54984c5a-SNAPSHOT
+	./scripts/test-stack-command.sh 9.0.0-2a832de0-SNAPSHOT
 
 test-stack-command-with-apm-server:
 	APM_SERVER_ENABLED=true ./scripts/test-stack-command.sh

go.mod

@@ -6,7 +6,7 @@ toolchain go1.23.1
 
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.7
-	github.com/Masterminds/semver/v3 v3.3.0
+	github.com/Masterminds/semver/v3 v3.3.1
 	github.com/ProtonMail/gopenpgp/v2 v2.8.0
 	github.com/aymerick/raymond v2.0.2+incompatible
 	github.com/boumenot/gocover-cobertura v1.3.0

go.sum

@@ -12,8 +12,8 @@ github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ
 github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
 github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
 github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
-github.com/Masterminds/semver/v3 v3.3.0 h1:B8LGeaivUe71a5qox1ICM/JLl0NqZSW5CHyL+hmvYS0=
-github.com/Masterminds/semver/v3 v3.3.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
+github.com/Masterminds/semver/v3 v3.3.1 h1:QtNSWtVZ3nBfk8mAOu/B6v7FMJ+NHTIgUPi7rj+4nv4=
+github.com/Masterminds/semver/v3 v3.3.1/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
 github.com/Masterminds/sprig/v3 v3.3.0 h1:mQh0Yrg1XPo6vjYXgtf5OtijNAKJRNcTdOOGZe3tPhs=
 github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSCzdgBfDb35Lz0=
 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=

internal/agentdeployer/kubernetes.go

@@ -221,11 +221,12 @@ func readCACertBase64(profile *profile.Profile) (string, error) {
 	return base64.StdEncoding.EncodeToString(d), nil
 }
 
-// getTokenPolicyName function returns the policy name for the 8.x Elastic stack. The agent's policy
-// is predefined in the Kibana configuration file. The logic is not present in older stacks.
+// getTokenPolicyName function returns the policy name for the >= 8.x Elastic stacks. The agent's policy
+// is predefined in the Kibana configuration file. The logic is not present in older stacks and it uses
+// the default policy in Kibana (empty string).
 func getTokenPolicyName(stackVersion, policyName string) string {
-	if strings.HasPrefix(stackVersion, "8.") {
-		return policyName
+	if strings.HasPrefix(stackVersion, "7.") {
+		return ""
 	}
-	return ""
+	return policyName
 }

internal/kibana/agents.go

@@ -59,22 +59,36 @@ func (c *Client) ListAgents(ctx context.Context) ([]Agent, error) {
 	}
 
 	var resp struct {
-		List []Agent `json:"list"`
+		List  []Agent `json:"list"`
+		Items []Agent `json:"items"`
 	}
 
 	if err := json.Unmarshal(respBody, &resp); err != nil {
 		return nil, fmt.Errorf("could not convert list agents (response) to JSON: %w", err)
 	}
 
-	return resp.List, nil
+	switch {
+	case c.semver.Major() < 9:
+		return resp.List, nil
+	default:
+		return resp.Items, nil
+	}
 }
 
 // AssignPolicyToAgent assigns the given Policy to the given Agent.
 func (c *Client) AssignPolicyToAgent(ctx context.Context, a Agent, p Policy) error {
 	reqBody := `{ "policy_id": "` + p.ID + `" }`
-
 	path := fmt.Sprintf("%s/agents/%s/reassign", FleetAPI, a.ID)
-	statusCode, respBody, err := c.put(ctx, path, []byte(reqBody))
+
+	var statusCode int
+	var err error
+	var respBody []byte
+	switch {
+	case c.semver.Major() < 9:
+		statusCode, respBody, err = c.put(ctx, path, []byte(reqBody))
+	default:
+		statusCode, respBody, err = c.post(ctx, path, []byte(reqBody))
+	}
 	if err != nil {
 		return fmt.Errorf("could not assign policy to agent: %w", err)
 	}