Merge branch 'main' into copilot/fix-7855e918-4f89-4206-9e30-02dc9febbc48

Author: tobio

.buildkite/hooks/pre-command

@@ -2,6 +2,11 @@
 
 set -euo pipefail
 
+if [[ "${BUILDKITE_PIPELINE_SLUG}" != "terraform-provider-elasticstack-release" ]]; then
+  echo "Skipping pre-command hook for non-release pipeline"
+  exit 0
+fi
+
 RELEASE_VAULT_PATH=kv/ci-shared/terraform-providers
 
 if [[ "$BUILDKITE_PIPELINE_SLUG" == "terraform-provider-elasticstack-release" ]]; then

.buildkite/release.yml

@@ -1,7 +1,7 @@
 steps:
   - label: Release
     agents:
-      image: "golang:1.25.1@sha256:d7098379b7da665ab25b99795465ec320b1ca9d4addb9f77409c4827dc904211"
+      image: "golang:1.25.3@sha256:bce1e7ec780444d85d041889e7a0e542b0be7b272a7f46a5fb947f0f484b9736"
       cpu: "16"
       memory: "24G"
       ephemeralStorage: "20G"

.buildkite/scripts/update-kibana-client.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source /etc/profile.d/go.sh
+
+echo "--- Regenerating the Kibana client"
+make -C generated/kbapi all
+
+echo "--- Building the provider"
+make build
+
+echo "--- Starting Stack containers"
+make docker-fleet
+docker ps 
+sleep 30
+
+echo "--- Collecting docker info"
+docker ps 
+docker logs terraform-elasticstack-kb 2>&1 > kibana.log
+docker logs terraform-elasticstack-es 2>&1 > es.log
+docker logs terraform-elasticstack-fleet 2>&1 > fleet.log
+
+buildkite-agent artifact upload kibana.log
+buildkite-agent artifact upload es.log
+buildkite-agent artifact upload fleet.log
+
+echo "--- Running acceptance tests"
+ELASTICSEARCH_ENDPOINTS=http://localhost:9200 KIBANA_ENDPOINT=http://localhost:5601 ELASTICSEARCH_USERNAME=elastic ELASTICSEARCH_PASSWORD=password make testacc

.buildkite/update-kibana-client.yml

@@ -0,0 +1,8 @@
+agents:
+  provider: "gcp"
+  machineType: "n1-standard-4"
+  image: family/terraform-provider-elasticstack-ubuntu-2204
+steps:
+  - label: Regenerate Kibana client and build provider
+    command:
+      - ".buildkite/scripts/update-kibana-client.sh"

.github/workflows/test.yml

@@ -50,7 +50,7 @@ jobs:
   test:
     name: Matrix Acceptance Test
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner == 'ubuntu-22.04' && 'ubuntu-22.04' || 'ubuntu-latest' }}
     env:
       ELASTIC_PASSWORD: password
       KIBANA_SYSTEM_USERNAME: kibana_system
@@ -108,11 +108,6 @@ jobs:
       matrix:
         version:
           - '7.17.13'
-          - '8.0.1'
-          - '8.1.3'
-          - '8.2.3'
-          - '8.3.3'
-          - '8.4.3'
           - '8.5.3'
           - '8.6.2'
           - '8.7.1'
@@ -130,6 +125,17 @@ jobs:
           - '8.19.3'
           - '9.0.7'
           - '9.1.3'
+        include:
+          - version: '8.0.1'
+            runner: ubuntu-22.04
+          - version: '8.1.3'
+            runner: ubuntu-22.04
+          - version: '8.2.3'
+            runner: ubuntu-22.04
+          - version: '8.3.3'
+            runner: ubuntu-22.04
+          - version: '8.4.3'
+            runner: ubuntu-22.04
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
       - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6

CHANGELOG.md

@@ -1,7 +1,7 @@
 .DEFAULT_GOAL = help
 SHELL := /bin/bash
 
-VERSION ?= 0.11.17
+VERSION ?= 0.12.0
 
 NAME = elasticstack
 BINARY = terraform-provider-${NAME}
@@ -54,7 +54,7 @@ build: lint build-ci ## build the terraform provider
 
 .PHONY: testacc
 testacc: ## Run acceptance tests
-	TF_ACC=1 go test -v ./... -count $(ACCTEST_COUNT) -parallel $(ACCTEST_PARALLELISM) $(TESTARGS) -timeout $(ACCTEST_TIMEOUT)
+	TF_ACC=1 go tool gotestsum --format testname --rerun-fails=3 --packages="-v ./..." -- -count $(ACCTEST_COUNT) -parallel $(ACCTEST_PARALLELISM) $(TESTARGS) -timeout $(ACCTEST_TIMEOUT)
 
 .PHONY: test
 test: ## Run unit tests

Makefile

@@ -35,3 +35,42 @@ spec:
           access_level: MANAGE_BUILD_AND_READ
         everyone:
           access_level: READ_ONLY
+
+---
+# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/e57ee3bed7a6f73077a3f55a38e76e40ec87a7cf/rre.schema.json
+apiVersion: backstage.io/v1alpha1
+kind: Resource
+metadata:
+  name: buildkite-pipeline-tf-provider-elasticstack-update-kibana
+  description: Buildkite Pipeline for updating Kibana client in Terraform provider Elasticstack
+  links:
+    - title: Pipeline
+      url: https://buildkite.com/elastic/terraform-provider-elasticstack-update-kibana-client
+
+spec:
+  type: buildkite-pipeline
+  owner: group:control-plane-hosted-applications
+  system: buildkite
+  implementation:
+    apiVersion: buildkite.elastic.dev/v1
+    kind: Pipeline
+    metadata:
+      name: terraform-provider-elasticstack / Update Kibana client
+      description: Terraform provider Elasticstack - update Kibana client
+    spec:
+      repository: elastic/terraform-provider-elasticstack
+      pipeline_file: ".buildkite/update-kibana-client.yml"
+      provider_settings:
+        build_branches: false
+        build_pull_requests: false
+        build_pull_request_labels_changed: false
+        build_pull_request_ready_for_review: false
+        build_pull_request_forks: false
+        build_tags: false
+      teams:
+        control-plane-hosted-applications:
+          access_level: MANAGE_BUILD_AND_READ
+        serverless-core:
+          access_level: MANAGE_BUILD_AND_READ
+        everyone:
+          access_level: READ_ONLY