Merge remote-tracking branch 'upstream/main' into stack9

Author: dimuon

CHANGELOG.md

@@ -1,6 +1,8 @@
 ## [Unreleased]
 
 - Support 8.15.5 in acc tests ([#963](https://github.com/elastic/terraform-provider-elasticstack/pull/963)).
+- Support 8.16.2 in acc tests ([#964](https://github.com/elastic/terraform-provider-elasticstack/pull/964)).
+- Support several ssl fields in `elasticstack_kibana_synthetics_monitor` ([#967](https://github.com/elastic/terraform-provider-elasticstack/pull/967))
 
 ## [0.11.12] - 2024-12-16
 

CONTRIBUTING.md

@@ -1,3 +1,7 @@
+# Typical development workflow
+
+Fork the repo, work on an issue
+
 ## Acceptance tests
 
 ```bash
@@ -6,5 +10,41 @@ make docker-testacc
 
 Run a single test with terraform debug enabled:
 ```bash
-make docker-testacc TF_LOG=DEBUG TESTARGS='-run ^TestAccResourceDataStreamLifecycle$$'
-```
+env TF_LOG=DEBUG make docker-testacc TESTARGS='-run ^TestAccResourceDataStreamLifecycle$$'
+```
+
+A way to forward debug logs to a file:
+```bash
+env TF_ACC_LOG_PATH=/tmp/tf.log TF_ACC_LOG=DEBUG TF_LOG=DEBUG make docker-testacc
+```
+
+
+## Update documentation
+
+Update documentation templates in `./templates` directory and re-generate docs via:
+```bash
+make docs-generate
+```
+
+## Update `./CHANGELOG.md`
+
+List of previous commits is a good example of what should be included in the changelog.
+
+
+## Pull request
+
+Format the code before pushing:
+```bash
+make fmt
+```
+
+Check if the linting:
+```bash
+make lint
+```
+
+Create a PR and check acceptance test matrix is green.
+
+## Run provider with local terraform
+
+TBD

docs/resources/kibana_synthetics_monitor.md

@@ -144,6 +144,10 @@ Optional:
 - `proxy_header` (String) Additional headers to send to proxies during CONNECT requests.. Raw JSON object, use `jsonencode` function to represent JSON
 - `proxy_url` (String) The URL of the proxy to use for this monitor.
 - `response` (String) Controls the indexing of the HTTP response body contents to the `http.response.body.contents` field.. Raw JSON object, use `jsonencode` function to represent JSON
+- `ssl_certificate` (String) Certificate.
+- `ssl_certificate_authorities` (List of String) The list of root certificates for verifications is required.
+- `ssl_key` (String, Sensitive) Certificate key.
+- `ssl_key_passphrase` (String, Sensitive) Key passphrase.
 - `ssl_supported_protocols` (List of String) List of allowed SSL/TLS versions.
 - `ssl_verification_mode` (String) Controls the verification of server certificates.
 - `username` (String) The username for authenticating with the server. The credentials are passed with the request.
@@ -174,6 +178,10 @@ Optional:
 - `check_send` (String) An optional payload string to send to the remote host.
 - `proxy_url` (String) The URL of the SOCKS5 proxy to use when connecting to the server. The value must be a URL with a scheme of `socks5://`. If the SOCKS5 proxy server requires client authentication, then a username and password can be embedded in the URL. When using a proxy, hostnames are resolved on the proxy server instead of on the client. You can change this behavior by setting the `proxy_use_local_resolver` option.
 - `proxy_use_local_resolver` (Boolean) A Boolean value that determines whether hostnames are resolved locally instead of being resolved on the proxy server. The default value is false, which means that name resolution occurs on the proxy server.
+- `ssl_certificate` (String) Certificate.
+- `ssl_certificate_authorities` (List of String) The list of root certificates for verifications is required.
+- `ssl_key` (String, Sensitive) Certificate key.
+- `ssl_key_passphrase` (String, Sensitive) Key passphrase.
 - `ssl_supported_protocols` (List of String) List of allowed SSL/TLS versions.
 - `ssl_verification_mode` (String) Controls the verification of server certificates.
 
@@ -183,9 +191,4 @@ Import is supported using the following syntax:
 
 ```shell
 terraform import elasticstack_kibana_synthetics_monitor.my_monitor <space id>/<monitor_id>
-```
-
-**NOTE:** Not all monitor fields are supported during the import due-to API limitation.
-Full field support could be implemented after this [kibana issue](https://github.com/elastic/kibana/issues/189906) is resolved.
-
-Currently not supported fields during the import:  `params`, `retest_on_failure`, `locations`, `http.proxy_header`, `http.username`, `http.password`, `http.check`, `http.response`, `tcp.check_send`, `tcp.check_receive` and monitor type `browser`
+```

go.mod

@@ -7,7 +7,7 @@ toolchain go1.23.3
 require (
 	github.com/disaster37/go-kibana-rest/v8 v8.5.0
 	github.com/elastic/elastic-transport-go/v8 v8.6.0
-	github.com/elastic/go-elasticsearch/v8 v8.16.0
+	github.com/elastic/go-elasticsearch/v8 v8.17.0
 	github.com/google/gofuzz v1.2.0
 	github.com/google/uuid v1.6.0
 	github.com/hashicorp/go-cty v1.4.1-0.20200723130312-85980079f637

go.sum

@@ -25,8 +25,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/elastic/elastic-transport-go/v8 v8.6.0 h1:Y2S/FBjx1LlCv5m6pWAF2kDJAHoSjSRSJCApolgfthA=
 github.com/elastic/elastic-transport-go/v8 v8.6.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
-github.com/elastic/go-elasticsearch/v8 v8.16.0 h1:f7bR+iBz8GTAVhwyFO3hm4ixsz2eMaEy0QroYnXV3jE=
-github.com/elastic/go-elasticsearch/v8 v8.16.0/go.mod h1:lGMlgKIbYoRvay3xWBeKahAiJOgmFDsjZC39nmO3H64=
+github.com/elastic/go-elasticsearch/v8 v8.17.0 h1:e9cWksE/Fr7urDRmGPGp47Nsp4/mvNOrU8As1l2HQQ0=
+github.com/elastic/go-elasticsearch/v8 v8.17.0/go.mod h1:lGMlgKIbYoRvay3xWBeKahAiJOgmFDsjZC39nmO3H64=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=