Merge pull request #248 from BurMachine/spark_job_pr

version 1.11.6

.gitignore

@@ -28,4 +28,7 @@ terraform-provider-sbercloud
 
 sbercloud/services/rds_new
 #sbercloud/acceptance/dcs
-sbercloud/acceptance/rds
+sbercloud/acceptance/rds
+
+*.pem
+test.txt

CHANGELOG.md

@@ -1,3 +1,20 @@
+## 1.11.6 (November 20, 2023)
+
+FEATURES:
+
+* **Updated Resource:** `sbercloud_dli_spark_job` 
+
+ENHANCEMENTS:
+
+* Changed test flavour in sbercloud_cdm_cluster
+* Upgrade to terraform-provider-huaweicloud `v1.57.0`
+* Updated dependencies
+* Updated elb_monitor
+* Added new parameters in sbercloud_dli_spark_job
+* Updated ges_graph test
+
+
+
 ## 1.11.5 (September 15, 2023)
 
 FEATURES:

docs/resources/dli_spark_job.md

@@ -44,6 +44,7 @@ The following arguments are supported:
   The OBS paths are allowed, for example, `obs://<bucket name>/<package name>`.
   Changing this parameter will submit a new spark job.
 
+
 * `feature` - (Optional, String, ForceNew) Specifies the feature name for the Spark Job.
   Required for Spark 3. Known values: `basic`, `ai`, `custom`.
   Changing this parameter will submit a new spark job.

docs/resources/elb_monitor.md

@@ -4,19 +4,23 @@ subcategory: "Dedicated Load Balance (Dedicated ELB)"
 
 # sbercloud_elb_monitor
 
-Manages an ELB monitor resource within SberCloud.
+Manages an ELB monitor resource within Cloud.ru.
 
 ## Example Usage
 
 ```hcl
+variable "pool_id" {}
+
 resource "sbercloud_elb_monitor" "monitor_1" {
-  protocol    = "HTTP"
+  pool_id     = var.pool_id
+  protocol    = "HTTPS"
   interval    = 30
-  timeout     = 15
-  max_retries = 10
-  url_path    = "/api"
+  timeout     = 20
+  max_retries = 8
+  url_path    = "/bb"
+  domain_name = "www.bb.com"
   port        = 8888
-  pool_id     = sbercloud_elb_pool.test.id
+  status_code = "200,301,404-500,504"
 }
 ```
 
@@ -27,36 +31,59 @@ The following arguments are supported:
 * `region` - (Optional, String, ForceNew) The region in which to create the ELB monitor resource. If omitted, the
   provider-level region will be used. Changing this creates a new monitor.
 
-* `pool_id` - (Required, String, ForceNew) The id of the pool that this monitor will be assigned to.
+* `pool_id` - (Required, String, ForceNew) Specifies the ID of the backend server group for which the health check is
+  configured. Changing this creates a new monitor.
+
+* `protocol` - (Required, String) Specifies the health check protocol. Value options: **TCP**, **UDP_CONNECT**,
+  **HTTP**, or **HTTPS**.
+  + If the protocol of the backend server is **QUIC**, the value can only be **UDP_CONNECT**.
+  + If the protocol of the backend server is **UDP**, the value can only be **UDP_CONNECT**.
+  + If the protocol of the backend server is **TCP**, the value can only be **TCP**, **HTTP**, or **HTTPS**.
+  + If the protocol of the backend server is **HTTP**, the value can only be **TCP**, **HTTP**, or **HTTPS**.
+  + If the protocol of the backend server is **HTTPS**, the value can only be **TCP**, **HTTP**, or **HTTPS**.
+
+* `interval` - (Required, Int) Specifies the interval between health checks, in seconds.
+  Value ranges from **1** to **50**.
 
-* `protocol` - (Required, String, ForceNew) The type of probe, which is TCP, HTTP, or HTTPS, that is sent by the load
-  balancer to verify the member state. Changing this creates a new monitor.
+* `timeout` - (Required, Int) Specifies the maximum time required for waiting for a response from the health check,
+  in seconds. Value ranges from **1** to **50**. It is recommended that you set the value less than that of
+  parameter `interval`.
 
-* `domain_name` - (Optional, String) The Domain Name of the Monitor.
+* `max_retries` - (Required, Int) Specifies the number of consecutive health checks when the health check result of
+  a backend server changes from OFFLINE to ONLINE. Value ranges from **1** to **50**.
 
-* `port` - (Optional, Int) Specifies the health check port. The value ranges from 1 to 65535.
+* `domain_name` - (Optional, String) Specifies the domain name that HTTP requests are sent to during the health check.
+  The domain name consists of 1 to 100 characters, can contain only digits, letters, hyphens (-), and periods (.) and
+  must start with a digit or letter. The value is left blank by default, indicating that the virtual IP address of the
+  load balancer is used as the destination address of HTTP requests. This parameter is available only when `protocol`
+  is set to **HTTP** or **HTTPS**.
 
-* `interval` - (Required, Int) The time, in seconds, between sending probes to members.
+* `port` - (Optional, Int) Specifies the port used for the health check. If this parameter is left blank, a port of
+  the backend server will be used by default.  Value ranges from **1** to **65535**.
 
-* `timeout` - (Required, Int) Maximum number of seconds for a monitor to wait for a ping reply before it times out. The
-  value must be less than the delay value.
+* `url_path` - (Optional, String) Specifies the HTTP request path for the health check. The value must start with a
+  slash (/), can contain letters, digits, hyphens (-), slash (/), periods (.), percent signs (%), hashes(#), and(&)
+  and the special characters: `~!()*[]@$^:',+`, and the default value is **/**. This parameter is available only when
+  `protocol` is set to **HTTP** or **HTTPS**.
 
-* `max_retries` - (Required, Int) Number of permissible ping failures before changing the member's status to INACTIVE.
-  Must be a number between 1 and 10.
+* `status_code` - (Optional, String) Specifies the expected HTTP status code. This parameter will take effect only when
+  `protocol` is set to **HTTP** or **HTTPS**. Value options are as follows:
+  + A specific value, for example: **200**.
+  + A list of values that are separated with commas (,), for example: **200,202**.
+  + A value range, for example: **200-204**.
 
-* `url_path` - (Optional, String) Required for HTTP(S) types. URI path that will be accessed if monitor type is HTTP or
-  HTTPS.
+  Defaults to **200**.
 
-## Attributes Reference
+## Attribute Reference
 
 In addition to all arguments above, the following attributes are exported:
 
 * `id` - The unique ID for the monitor.
 
 ## Import
 
-ELB monitor can be imported using the monitor ID, e.g.
+ELB monitor can be imported using the monitor `id`, e.g.
 
+```bash
+$ terraform import sbercloud_elb_monitor.test <id>
 ```
-$ terraform import sbercloud_elb_monitor.monitor_1 5c20fdad-7288-11eb-b817-0255ac10158b
-```

go.mod

@@ -3,11 +3,11 @@ module github.com/sbercloud-terraform/terraform-provider-sbercloud
 go 1.18
 
 require (
-	github.com/chnsz/golangsdk v0.0.0-20230531061124-d429dbae2745
+	github.com/chnsz/golangsdk v0.0.0-20231027080141-c5721e2542e4
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.0
-	github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.1.20
-	github.com/huaweicloud/terraform-provider-huaweicloud v1.49.0
+	github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.1.62
+	github.com/huaweicloud/terraform-provider-huaweicloud v1.57.0
 )
 
 require (
@@ -17,7 +17,7 @@ require (
 	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fatih/color v1.13.0 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
@@ -52,18 +52,20 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/oklog/run v1.0.0 // indirect
+	github.com/tjfoc/gmsm v1.4.1 // indirect
 	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
 	github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
 	github.com/vmihailenco/tagparser v0.1.1 // indirect
 	github.com/zclconf/go-cty v1.11.0 // indirect
-	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
-	golang.org/x/net v0.7.0 // indirect
-	golang.org/x/sys v0.5.0 // indirect
-	golang.org/x/text v0.7.0 // indirect
+	go.mongodb.org/mongo-driver v1.12.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
-	google.golang.org/grpc v1.53.0 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
-	gopkg.in/ini.v1 v1.66.6 // indirect
+	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
+	google.golang.org/grpc v1.56.3 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )