Merge branch 'elastic:main' into main

Zyther · web-flow · commit 2d213990e08e · 2025-04-10T13:33:14.000-04:00
diff --git a/.buildkite/release.yml b/.buildkite/release.yml
@@ -1,7 +1,7 @@
 steps:
   - label: Release
     agents:
-      image: "golang:1.24.2@sha256:991aa6a6e4431f2f01e869a812934bd60fbc87fb939e4a1ea54b8494ab9d2fc6"
+      image: "golang:1.24.2@sha256:18a1f2d1e1d3c49f27c904e9182375169615c65852ace724987929b910195b2c"
       cpu: "16"
       memory: "24G"
       ephemeralStorage: "20G"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -19,7 +19,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
+      - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
         with:
           go-version-file: 'go.mod'
           cache: true
@@ -35,7 +35,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
+      - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
         with:
           go-version-file: 'tools/go.mod'
           cache: true
@@ -129,7 +129,7 @@ jobs:
           - '9.0.0-SNAPSHOT'
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
+      - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
         with:
           go-version-file: 'go.mod'
           cache: true
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,4 +1,20 @@
-# increase the default timeout for slow CI needs
-run:
-  timeout: 300s
-  concurrency: 0
+version: "2"
+linters:
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
diff --git a/Makefile b/Makefile
@@ -245,14 +245,18 @@ install: build ## Install built provider into the local terraform cache
 
 
 .PHONY: tools
-tools: $(GOBIN) ## Install useful tools for linting, docs generation and development
+tools: $(GOBIN) tools-golangci-lint ## Install useful tools for linting, docs generation and development
 	@ cd tools && go install github.com/client9/misspell/cmd/misspell
 	@ cd tools && go install github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs
-	@ cd tools && go install github.com/golangci/golangci-lint/cmd/golangci-lint
 	@ cd tools && go install github.com/goreleaser/goreleaser/v2
 	@ cd tools && go install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen
 	@ cd tools && go install go.uber.org/mock/mockgen
 
+.PHONY: tools-golangci-lint
+tools-golangci-lint: ## Download golangci-lint locally if necessary.
+	@[[ -f $(GOBIN)/golangci-lint ]] || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) v2.0.2
+
+
 .PHONY: misspell
 misspell:
 	@ $(GOBIN)/misspell -error -source go ./internal/
diff --git a/go.mod b/go.mod
@@ -2,15 +2,15 @@ module github.com/elastic/terraform-provider-elasticstack
 
 go 1.23.0
 
-toolchain go1.24.1
+toolchain go1.24.2
 
 require (
 	github.com/disaster37/go-kibana-rest/v8 v8.5.0
 	github.com/elastic/elastic-transport-go/v8 v8.6.1
 	github.com/elastic/go-elasticsearch/v8 v8.17.1
 	github.com/google/gofuzz v1.2.0
 	github.com/google/uuid v1.6.0
-	github.com/hashicorp/go-cty v1.4.1
+	github.com/hashicorp/go-cty v1.5.0
 	github.com/hashicorp/go-version v1.7.0
 	github.com/hashicorp/terraform-plugin-framework v1.14.1
 	github.com/hashicorp/terraform-plugin-framework-jsontypes v0.2.0
@@ -23,7 +23,7 @@ require (
 	github.com/oapi-codegen/oapi-codegen/v2 v2.4.1
 	github.com/oapi-codegen/runtime v1.1.1
 	github.com/stretchr/testify v1.10.0
-	go.uber.org/mock v0.5.0
+	go.uber.org/mock v0.5.1
 )
 
 require (
diff --git a/go.sum b/go.sum
@@ -70,8 +70,8 @@ github.com/hashicorp/go-checkpoint v0.5.0/go.mod h1:7nfLNL10NsxqO4iWuW6tWW0HjZuD
 github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
-github.com/hashicorp/go-cty v1.4.1 h1:T4i4kbEKuyMoe4Ujh52Ud07VXr05dnP/Si9JiVDpx3Y=
-github.com/hashicorp/go-cty v1.4.1/go.mod h1:EiZBMaudVLy8fmjf9Npq1dq9RalhveqZG5w/yz3mHWs=
+github.com/hashicorp/go-cty v1.5.0 h1:EkQ/v+dDNUqnuVpmS5fPqyY71NXVgT5gf32+57xY8g0=
+github.com/hashicorp/go-cty v1.5.0/go.mod h1:lFUCG5kd8exDobgSfyj4ONE/dc822kiYMguVKdHGMLM=
 github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k=
 github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
@@ -203,8 +203,8 @@ go.opentelemetry.io/otel/sdk/metric v1.31.0 h1:i9hxxLJF/9kkvfHppyLL55aW7iIJz4Jjx
 go.opentelemetry.io/otel/sdk/metric v1.31.0/go.mod h1:CRInTMVvNhUKgSAMbKyTMxqOBC0zgyxzW55lZzX43Y8=
 go.opentelemetry.io/otel/trace v1.31.0 h1:ffjsj1aRouKewfr85U2aGagJ46+MvodynlQ1HYdmJys=
 go.opentelemetry.io/otel/trace v1.31.0/go.mod h1:TXZkRk7SM2ZQLtR6eoAWQFIHPvzQ06FJAsO1tJg480A=
-go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU=
-go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
+go.uber.org/mock v0.5.1 h1:ASgazW/qBmR+A32MYFDB6E2POoTgOwT509VP0CT/fjs=
+go.uber.org/mock v0.5.1/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
@@ -243,7 +243,6 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX
 golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
 golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
diff --git a/internal/clients/api_client.go b/internal/clients/api_client.go
@@ -440,7 +440,7 @@ func buildEsClient(cfg config.Client) (*elasticsearch.Client, error) {
 
 	es, err := elasticsearch.NewClient(*cfg.Elasticsearch)
 	if err != nil {
-		return nil, fmt.Errorf("Unable to create Elasticsearch client: %w", err)
+		return nil, fmt.Errorf("unable to create Elasticsearch client: %w", err)
 	}
 
 	return es, nil
@@ -475,7 +475,7 @@ func buildKibanaClient(cfg config.Client) (*kibana.Client, error) {
 func buildKibanaOapiClient(cfg config.Client) (*kibana_oapi.Client, error) {
 	client, err := kibana_oapi.NewClient(*cfg.KibanaOapi)
 	if err != nil {
-		return nil, fmt.Errorf("Unable to create KibanaOapi client: %w", err)
+		return nil, fmt.Errorf("unable to create KibanaOapi client: %w", err)
 	}
 
 	return client, nil
@@ -539,7 +539,7 @@ func buildSloClient(cfg config.Client, httpClient *http.Client) *slo.APIClient {
 func buildFleetClient(cfg config.Client) (*fleet.Client, error) {
 	client, err := fleet.NewClient(*cfg.Fleet)
 	if err != nil {
-		return nil, fmt.Errorf("Unable to create Fleet client: %w", err)
+		return nil, fmt.Errorf("unable to create Fleet client: %w", err)
 	}
 
 	return client, nil
diff --git a/internal/clients/elasticsearch/enrich.go b/internal/clients/elasticsearch/enrich.go
@@ -36,7 +36,7 @@ func getPolicyType(m map[string]enrichPolicyResponse) (string, error) {
 			return policyType, nil
 		}
 	}
-	return "", fmt.Errorf("Did not find expected policy type.")
+	return "", fmt.Errorf("did not find expected policy type")
 }
 
 func GetEnrichPolicy(ctx context.Context, apiClient *clients.ApiClient, policyName string) (*models.EnrichPolicy, diag.Diagnostics) {
diff --git a/internal/elasticsearch/cluster/snapshot_repository.go b/internal/elasticsearch/cluster/snapshot_repository.go
@@ -431,13 +431,13 @@ func flattenRepoSettings(r *models.SnapshotRepository, s map[string]*schema.Sche
 			case schema.TypeInt, schema.TypeFloat:
 				i, err := strconv.Atoi(v.(string))
 				if err != nil {
-					return nil, fmt.Errorf(`Failed to parse value = "%v" for setting = "%s"`, v, k)
+					return nil, fmt.Errorf(`failed to parse value = "%v" for setting = "%s"`, v, k)
 				}
 				settings[k] = i
 			case schema.TypeBool:
 				b, err := strconv.ParseBool(v.(string))
 				if err != nil {
-					return nil, fmt.Errorf(`Failed to parse value = "%v" for setting = "%s"`, v, k)
+					return nil, fmt.Errorf(`failed to parse value = "%v" for setting = "%s"`, v, k)
 				}
 				settings[k] = b
 			default:
diff --git a/internal/elasticsearch/index/index/models.go b/internal/elasticsearch/index/index/models.go
@@ -444,7 +444,7 @@ func (model tfModel) getFieldValueByTagValue(tagName string, t reflect.Type) (at
 }
 
 func convertSettingsKeyToTFFieldKey(settingKey string) string {
-	return strings.Replace(settingKey, ".", "_", -1)
+	return strings.ReplaceAll(settingKey, ".", "_")
 }
 
 func (model aliasTfModel) toAPIModel() (models.IndexAlias, diag.Diagnostics) {
diff --git a/internal/elasticsearch/security/user_test.go b/internal/elasticsearch/security/user_test.go
@@ -134,7 +134,7 @@ func TestAccImportedUserDoesNotResetPassword(t *testing.T) {
 					}
 					body := fmt.Sprintf("{\"password\": \"%s\"}", userUpdatedPassword)
 
-					req := esClient.API.Security.ChangePassword.WithUsername(username)
+					req := esClient.Security.ChangePassword.WithUsername(username)
 					resp, err := esClient.Security.ChangePassword(strings.NewReader(body), req)
 					if err != nil {
 						return false, nil
@@ -175,7 +175,7 @@ func checkUserCanAuthenticate(username string, password string) func(*terraform.
 		credentials := fmt.Sprintf("%s:%s", username, password)
 		authHeader := fmt.Sprintf("Basic %s", base64.StdEncoding.EncodeToString([]byte(credentials)))
 
-		req := esClient.API.Security.Authenticate.WithHeader(map[string]string{"Authorization": authHeader})
+		req := esClient.Security.Authenticate.WithHeader(map[string]string{"Authorization": authHeader})
 		resp, err := esClient.Security.Authenticate(req)
 		if err != nil {
 			return err
diff --git a/internal/kibana/slo_test.go b/internal/kibana/slo_test.go
@@ -294,7 +294,7 @@ func TestAccResourceSloErrors(t *testing.T) {
 	}`
 
 	budgetingMethodFailConfig := getSLOConfig(sloVars{name: "budgetingmethodfail", indicatorType: "apm_latency_indicator"})
-	budgetingMethodFailConfig = strings.Replace(budgetingMethodFailConfig, "budgeting_method = \"timeslices\"", "budgeting_method = \"supdawg\"", -1)
+	budgetingMethodFailConfig = strings.ReplaceAll(budgetingMethodFailConfig, "budgeting_method = \"timeslices\"", "budgeting_method = \"supdawg\"")
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
diff --git a/internal/kibana/synthetics/schema.go b/internal/kibana/synthetics/schema.go
@@ -4,6 +4,8 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"strconv"
+
 	"github.com/disaster37/go-kibana-rest/v8/kbapi"
 	"github.com/elastic/terraform-provider-elasticstack/internal/clients"
 	"github.com/elastic/terraform-provider-elasticstack/internal/utils"
@@ -25,7 +27,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/tfsdk"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
-	"strconv"
 )
 
 const (
@@ -857,7 +858,7 @@ func (v *tfModelV0) toMonitorFields(ctx context.Context) (kbapi.MonitorFields, d
 
 func toTFAlertConfig(ctx context.Context, v basetypes.ObjectValue) *kbapi.MonitorAlertConfig {
 	var alert *kbapi.MonitorAlertConfig
-	if !(v.IsNull() || v.IsUnknown()) {
+	if !v.IsNull() && !v.IsUnknown() {
 		tfAlert := tfAlertConfigV0{}
 		tfsdk.ValueAs(ctx, v, &tfAlert)
 		alert = tfAlert.toTfAlertConfigV0()
@@ -899,7 +900,7 @@ func tfInt64ToString(v types.Int64) string {
 func toSSLConfig(ctx context.Context, dg diag.Diagnostics, v tfSSLConfig, p string) (*kbapi.SSLConfig, diag.Diagnostics) {
 
 	var ssl *kbapi.SSLConfig
-	if !(v.SslSupportedProtocols.IsNull() || v.SslSupportedProtocols.IsUnknown()) {
+	if !v.SslSupportedProtocols.IsNull() && !v.SslSupportedProtocols.IsUnknown() {
 		sslSupportedProtocols := utils.ListTypeToSlice_String(ctx, v.SslSupportedProtocols, path.Root(p).AtName("ssl_supported_protocols"), &dg)
 		if dg.HasError() {
 			return nil, dg
@@ -908,7 +909,7 @@ func toSSLConfig(ctx context.Context, dg diag.Diagnostics, v tfSSLConfig, p stri
 		ssl.SupportedProtocols = sslSupportedProtocols
 	}
 
-	if !(v.SslVerificationMode.IsNull() || v.SslVerificationMode.IsUnknown()) {
+	if !v.SslVerificationMode.IsNull() && !v.SslVerificationMode.IsUnknown() {
 		if ssl == nil {
 			ssl = &kbapi.SSLConfig{}
 		}
@@ -923,21 +924,21 @@ func toSSLConfig(ctx context.Context, dg diag.Diagnostics, v tfSSLConfig, p stri
 		ssl.CertificateAuthorities = certAuths
 	}
 
-	if !(v.SslCertificate.IsUnknown() || v.SslCertificate.IsNull()) {
+	if !v.SslCertificate.IsUnknown() && !v.SslCertificate.IsNull() {
 		if ssl == nil {
 			ssl = &kbapi.SSLConfig{}
 		}
 		ssl.Certificate = v.SslCertificate.ValueString()
 	}
 
-	if !(v.SslKey.IsUnknown() || v.SslKey.IsNull()) {
+	if !v.SslKey.IsUnknown() && !v.SslKey.IsNull() {
 		if ssl == nil {
 			ssl = &kbapi.SSLConfig{}
 		}
 		ssl.Key = v.SslKey.ValueString()
 	}
 
-	if !(v.SslKeyPassphrase.IsUnknown() || v.SslKeyPassphrase.IsNull()) {
+	if !v.SslKeyPassphrase.IsUnknown() && !v.SslKeyPassphrase.IsNull() {
 		if ssl == nil {
 			ssl = &kbapi.SSLConfig{}
 		}
diff --git a/internal/utils/utils.go b/internal/utils/utils.go
@@ -10,7 +10,6 @@ import (
 	"time"
 
 	providerSchema "github.com/elastic/terraform-provider-elasticstack/internal/schema"
-	"github.com/hashicorp/terraform-plugin-framework/diag"
 	fwdiag "github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
@@ -146,7 +145,7 @@ func ExpandIndividuallyDefinedSettings(ctx context.Context, d *schema.ResourceDa
 }
 
 func ConvertSettingsKeyToTFFieldKey(settingKey string) string {
-	return strings.Replace(settingKey, ".", "_", -1)
+	return strings.ReplaceAll(settingKey, ".", "_")
 }
 
 func Pointer[T any](value T) *T {
@@ -232,7 +231,7 @@ func ConvertToAttrDiags(diags fwdiag.Diagnostics, path path.Path) fwdiag.Diagnos
 	for _, d := range diags {
 		if d.Severity() == fwdiag.SeverityError {
 			nd.AddAttributeError(path, d.Summary(), d.Detail())
-		} else if d.Severity() == diag.SeverityWarning {
+		} else if d.Severity() == fwdiag.SeverityWarning {
 			nd.AddAttributeWarning(path, d.Summary(), d.Detail())
 		} else {
 			nd.Append(d)
diff --git a/libs/go-kibana-rest/.github/workflows/workflow.yml b/libs/go-kibana-rest/.github/workflows/workflow.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - name: Setup Go
-        uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
+        uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
         with:
           go-version: "1.22"
       - name: Setup Elasticsearch / Kibana
@@ -36,7 +36,7 @@ jobs:
           until $(curl --output /dev/null --silent --head --fail -u elastic:changeme http://localhost:5601); do sleep 5; done
           sleep 10
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6
+        uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # v7
         with:
           version: latest
           args: --timeout 600s
diff --git a/libs/go-kibana-rest/docker-compose.yml b/libs/go-kibana-rest/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.17.3@sha256:224c75e346bd745ce908f06a1cbad7bf10988961dcdcdfccb22556b3f856b3f0
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.17.4@sha256:413d8df69823e9f41f6008f025fcbaf31a5849ab9c74894731d7ded65543cd56
     environment:
       cluster.name: test
       discovery.type: single-node
@@ -11,7 +11,7 @@ services:
     ports:
       - "9200:9200/tcp"
   set-kibana-password:
-    image: docker.elastic.co/kibana/kibana:8.17.3@sha256:7dfee7a14cf7de9f22285d9e9db3bf423c36f3f4a82c0dce7294b0fb1532c863
+    image: docker.elastic.co/kibana/kibana:8.17.4@sha256:45859e3220fa73a338d59810eb1c5b16e2478ca928654fe994f4fcca9f639b4f
     restart: on-failure
     links:
       - elasticsearch
@@ -22,7 +22,7 @@ services:
       elasticsearch:
         condition: service_started
   kibana:
-    image: docker.elastic.co/kibana/kibana:8.17.3@sha256:7dfee7a14cf7de9f22285d9e9db3bf423c36f3f4a82c0dce7294b0fb1532c863
+    image: docker.elastic.co/kibana/kibana:8.17.4@sha256:45859e3220fa73a338d59810eb1c5b16e2478ca928654fe994f4fcca9f639b4f
     environment:
       SERVER_NAME: kibana
       ELASTICSEARCH_HOSTS: http://es:9200
diff --git a/libs/go-kibana-rest/go.mod b/libs/go-kibana-rest/go.mod
@@ -2,7 +2,7 @@ module github.com/disaster37/go-kibana-rest/v8
 
 go 1.23.0
 
-toolchain go1.24.1
+toolchain go1.24.2
 
 require (
 	github.com/go-resty/resty/v2 v2.16.5
diff --git a/renovate.json b/renovate.json
@@ -2,5 +2,9 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "local>elastic/renovate-config"
-  ]
+  ],
+  "automerge": true,
+  "automergeStrategy": "squash",
+  "automergeType": "branch",
+  "rebaseWhen": "auto"
 }
diff --git a/tools/go.mod b/tools/go.mod
diff --git a/tools/go.sum b/tools/go.sum
diff --git a/tools/tools.go b/tools/tools.go

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func getPolicyType(m map[string]enrichPolicyResponse) (string, error) {`
`36`	`36`	`return policyType, nil`
`37`	`37`	`}`
`38`	`38`	`}`
`39`		`- return "", fmt.Errorf("Did not find expected policy type.")`
	`39`	`+ return "", fmt.Errorf("did not find expected policy type")`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`func GetEnrichPolicy(ctx context.Context, apiClient clients.ApiClient, policyName string) (models.EnrichPolicy, diag.Diagnostics) {`
Original file line number	Diff line number	Diff line change
`@@ -444,7 +444,7 @@ func (model tfModel) getFieldValueByTagValue(tagName string, t reflect.Type) (at`
`444`	`444`	`}`
`445`	`445`
`446`	`446`	`func convertSettingsKeyToTFFieldKey(settingKey string) string {`
`447`		`- return strings.Replace(settingKey, ".", "_", -1)`
	`447`	`+ return strings.ReplaceAll(settingKey, ".", "_")`
`448`	`448`	`}`
`449`	`449`
`450`	`450`	`func (model aliasTfModel) toAPIModel() (models.IndexAlias, diag.Diagnostics) {`