Merge branch '8.x' into dependabot/github_actions/dot-github/workflow…

…s/8.x/updatecli/updatecli-action-2.77.0
elastic · Feb 12, 2025 · 3283bca · 3283bca
2 parents c1bbe5f + 58d6717
commit 3283bca
Show file tree

Hide file tree

Showing 8 changed files with 1,067 additions and 382 deletions.
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.23.5
+1.23.6
diff --git a/bin/.go-1.23.5.pkg → bin/.go-1.23.6.pkg b/bin/.go-1.23.5.pkg → bin/.go-1.23.6.pkg
diff --git a/bin/go b/bin/go
@@ -1 +1 @@
-.go-1.23.5.pkg
+.go-1.23.6.pkg
diff --git a/bin/gofmt b/bin/gofmt
@@ -1 +1 @@
-.go-1.23.5.pkg
+.go-1.23.6.pkg
diff --git a/docs/version.asciidoc b/docs/version.asciidoc
@@ -1,6 +1,6 @@
 // doc-branch can be: master, 8.1, 8.2, etc.
 :doc-branch: master
-:go-version: 1.23.5
+:go-version: 1.23.6
 :python: 3.7
 :docker: 1.12
 :docker-compose: 1.11
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/tests/integrations_setup/install_cspm_gcp_integration.py b/tests/integrations_setup/install_cspm_gcp_integration.py
@@ -69,11 +69,22 @@
         INTEGRATION_INPUT["vars"] = {
             "gcp.account_type": "single-account",
         }
+
+        json_path = Path(__file__).parent / cnfg.gcp_dm_config.credentials_file
         if cnfg.gcp_dm_config.service_account_json_path:
             logger.info("Using service account credentials json")
             json_path = Path(__file__).parent / cnfg.gcp_dm_config.service_account_json_path
-            service_account_json = read_json(json_path)
-            INTEGRATION_INPUT["vars"]["gcp.credentials.json"] = json.dumps(service_account_json)
+
+        service_account_json = read_json(json_path)
+        INTEGRATION_INPUT["vars"]["gcp.credentials.json"] = json.dumps(service_account_json)
+
+        if version.parse(package_version) > version.parse("1.12"):
+            INTEGRATION_INPUT["vars"].update(
+                {
+                    "gcp.project_id": cnfg.gcp_dm_config.project_id,
+                    "gcp.credentials.type": "credentials-json",
+                },
+            )
 
     logger.info(f"Starting installation of {INTEGRATION_NAME} integration.")
     agent_data, package_data = load_data(