Skip to content

Commit 7c13814

Browse files
lpattelpatte
committed
review fix + remove deadcode + doc
1 parent f528c6f commit 7c13814

16 files changed

+29
-29
lines changed

Diff for: ‎ovh/data_cloud_project_database.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func dataSourceCloudProjectDatabase() *schema.Resource {
100100
},
101101
"kafka_rest_api": {
102102
Type: schema.TypeBool,
103-
Description: "Defines whether the REST API is enabled on a kafka cluster",
103+
Description: "Defines whether the REST API is enabled on a Kafka cluster",
104104
Computed: true,
105105
},
106106
"maintenance_time": {
@@ -139,7 +139,7 @@ func dataSourceCloudProjectDatabase() *schema.Resource {
139139
},
140140
"opensearch_acls_enabled": {
141141
Type: schema.TypeBool,
142-
Description: "Defines whether the acls are enabled on an Opensearch cluster",
142+
Description: "Defines whether the ACLs are enabled on an Opensearch cluster",
143143
Computed: true,
144144
},
145145
"plan": {

Diff for: ‎ovh/data_cloud_project_database_user.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func dataSourceCloudProjectDatabaseUser() *schema.Resource {
2222
Type: schema.TypeString,
2323
Description: "Name of the engine of the service",
2424
Required: true,
25-
ValidateFunc: helpers.ValidateEnum([]string{"cassandra", "mysql", "kafka", "kafkaConnect"}), //validateCloudProjectDatabaseUserEngineFunc,
25+
ValidateFunc: helpers.ValidateEnum([]string{"cassandra", "mysql", "kafka", "kafkaConnect"}),
2626
},
2727
"cluster_id": {
2828
Type: schema.TypeString,

Diff for: ‎ovh/resource_cloud_project_database.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func resourceCloudProjectDatabase() *schema.Resource {
5353
},
5454
"kafka_rest_api": {
5555
Type: schema.TypeBool,
56-
Description: "Defines whether the REST API is enabled on a kafka cluster",
56+
Description: "Defines whether the REST API is enabled on a Kafka cluster",
5757
Optional: true,
5858
DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
5959
return d.Get("engine").(string) != "kafka" || new == old
@@ -88,7 +88,7 @@ func resourceCloudProjectDatabase() *schema.Resource {
8888
},
8989
"opensearch_acls_enabled": {
9090
Type: schema.TypeBool,
91-
Description: "Defines whether the acls are enabled on an Opensearch cluster",
91+
Description: "Defines whether the ACLs are enabled on an Opensearch cluster",
9292
Optional: true,
9393
DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
9494
return d.Get("engine").(string) != "opensearch" || new == old

Diff for: ‎ovh/resource_cloud_project_database_user.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func resourceCloudProjectDatabaseUser() *schema.Resource {
3838
Description: "Name of the engine of the service",
3939
ForceNew: true,
4040
Required: true,
41-
ValidateFunc: helpers.ValidateEnum([]string{"cassandra", "mysql", "kafka", "kafkaConnect"}), //validateCloudProjectDatabaseUserEngineFunc,
41+
ValidateFunc: helpers.ValidateEnum([]string{"cassandra", "mysql", "kafka", "kafkaConnect"}),
4242
},
4343
"cluster_id": {
4444
Type: schema.TypeString,

Diff for: ‎ovh/types_cloud_project_database.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ func (opts *CloudProjectDatabaseUpdateOpts) FromResource(d *schema.ResourceData)
181181
opts.AclsEnabled = d.Get("opensearch_acls_enabled").(bool)
182182
}
183183
if engine == "kafka" {
184-
opts.AclsEnabled = d.Get("kafka_rest_api").(bool)
184+
opts.RestApi = d.Get("kafka_rest_api").(bool)
185185
}
186186

187187
opts.Description = d.Get("description").(string)

Diff for: ‎website/docs/d/cloud_project_database_capabilities.html.markdown

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ data "ovh_cloud_project_database_capabilities" "capabilities" {
1818
}
1919
2020
output "capabilities_engine_name" {
21-
value = data.ovh_cloud_project_database_capabilities.capabilities.engine.0.name
21+
value = tolist(data.ovh_cloud_project_database_capabilities.capabilities[*].engines)[0]
2222
}
2323
```
2424

@@ -52,7 +52,7 @@ the following attributes are exported:
5252
* `step_disk_size` - Flex disk size step in GB.
5353
* `upstream_end_of_life` - End of life of the upstream product.
5454
* `version` - Version name.
55-
* `engine` - Database engines available.
55+
* `engines` - Database engines available.
5656
* `default_version` - Default version used for the engine.
5757
* `description` - Description of the engine.
5858
* `name` - Engine name.

Diff for: ‎website/docs/d/cloud_project_database_database.html.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Use this data source to get information about a database of a database cluster a
1515
```hcl
1616
data "ovh_cloud_project_database_database" "database" {
1717
service_name = "XXX"
18-
engine = "YYY"
18+
engine = "YYY"
1919
cluster_id = "ZZZ"
2020
name = "UUU"
2121
}

Diff for: ‎website/docs/d/cloud_project_database_databases.html.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Use this data source to get the list of databases of a database cluster associat
1515
```hcl
1616
data "ovh_cloud_project_database_databases" "databases" {
1717
service_name = "XXXX"
18-
engine = "YYYY"
18+
engine = "YYYY"
1919
cluster_id = "ZZZ"
2020
}
2121

Diff for: ‎website/docs/d/cloud_project_database_m3db_namespace.html.markdown

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ layout: "ovh"
33
page_title: "OVH: cloud_project_database_m3db_namespace"
44
sidebar_current: "docs-ovh-datasource-cloud-project-database-m3db-namespace"
55
description: |-
6-
Get information about a namespace of a m3db cluster associated with a public cloud project.
6+
Get information about a namespace of a M3DB cluster associated with a public cloud project.
77
---
88

99
# ovh_cloud_project_database_m3db_namespace (Data Source)
1010

11-
Use this data source to get information about a namespace of a m3db cluster associated with a public cloud project.
11+
Use this data source to get information about a namespace of a M3DB cluster associated with a public cloud project.
1212

1313
## Example Usage
1414

@@ -49,4 +49,4 @@ The following attributes are exported:
4949
* `service_name` - See Argument Reference above.
5050
* `snapshot_enabled`- SDefines whether M3db will create snapshot files for this namespace.
5151
* `type` - Type of namespace.
52-
* `writes_to_commit_log_enabled` - Defines whether M3db will include writes to this namespace in the commit log.
52+
* `writes_to_commit_log_enabled` - Defines whether M3DB will include writes to this namespace in the commit log.

Diff for: ‎website/docs/d/cloud_project_database_m3db_namespaces.html.markdown

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ layout: "ovh"
33
page_title: "OVH: cloud_project_database_m3db_namespaces"
44
sidebar_current: "docs-ovh-datasource-cloud-project-database-m3db-namespaces"
55
description: |-
6-
Get the list of namespaces of a m3db cluster associated with a public cloud project.
6+
Get the list of namespaces of a M3DB cluster associated with a public cloud project.
77
---
88

99
# ovh_cloud_project_database_m3db_namespaces (Data Source)
1010

11-
Use this data source to get the list of namespaces of a m3db cluster associated with a public cloud project.
11+
Use this data source to get the list of namespaces of a M3DB cluster associated with a public cloud project.
1212

1313
## Example Usage
1414

Diff for: ‎website/docs/d/cloud_project_database_m3db_user.html.markdown

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ layout: "ovh"
33
page_title: "OVH: cloud_project_database_m3db_user"
44
sidebar_current: "docs-ovh-datasource-cloud-project-database-m3db-user"
55
description: |-
6-
Get information about a user of a m3db cluster associated with a public cloud project.
6+
Get information about a user of a M3DB cluster associated with a public cloud project.
77
---
88

99
# ovh_cloud_project_database_m3db_user (Data Source)
1010

11-
Use this data source to get information about a user of a m3db cluster associated with a public cloud project.
11+
Use this data source to get information about a user of a M3DB cluster associated with a public cloud project.
1212

1313
## Example Usage
1414

Diff for: ‎website/docs/index.html.markdown

+2
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ variables must also be set:
127127

128128
* `OVH_CLOUD_PROJECT_DATABASE_KAFKA_VERSION_TEST` - The version of the kafka to test. if not set `OVH_CLOUD_PROJECT_DATABASE_VERSION_TEST` is use.
129129

130+
* `OVH_CLOUD_PROJECT_DATABASE_M3DB_VERSION_TEST` - The version of the mongodb to test. if not set `OVH_CLOUD_PROJECT_DATABASE_VERSION_TEST` is use.
131+
130132
* `OVH_CLOUD_PROJECT_DATABASE_MONGODB_VERSION_TEST` - The version of the mongodb to test. if not set `OVH_CLOUD_PROJECT_DATABASE_VERSION_TEST` is use.
131133

132134
* `OVH_CLOUD_PROJECT_DATABASE_OPENSEARCH_VERSION_TEST` - The version of the opensearch to test. if not set `OVH_CLOUD_PROJECT_DATABASE_VERSION_TEST` is use.

Diff for: ‎website/docs/r/cloud_project_database_database.html.markdown

+1-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ The following arguments are supported:
3939
* `service_name` - (Required, Forces new resource) The id of the public cloud project. If omitted,
4040
the `OVH_CLOUD_PROJECT_SERVICE` environment variable is used.
4141

42-
* `engine` - (Required, Forces new resource) The engine of the database cluster you want to add. To get a full list of available engine visit :
43-
[public documentation](https://docs.ovh.com/gb/en/publiccloud/databases).\
42+
* `engine` - (Required, Forces new resource) The engine of the database cluster you want to add. You can find the complete list of available engine in the [public documentation](https://docs.ovh.com/gb/en/publiccloud/databases).
4443
Available engines for this resource (other have specific resource):
4544
* `mysql`
4645
* `postgresql`

Diff for: ‎website/docs/r/cloud_project_database_m3db_namespace.html.markdown

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ layout: "ovh"
33
page_title: "OVH: cloud_project_database_m3db_namespace"
44
sidebar_current: "docs-ovh-resource-cloud-project-database-m3db-namespace"
55
description: |-
6-
Creates a namespace for a m3db cluster associated with a public cloud project.
6+
Creates a namespace for a M3DB cluster associated with a public cloud project.
77
---
88

99
# ovh_cloud_project_database_m3db_namespace
1010

11-
Creates a namespace for a m3db cluster associated with a public cloud project.
11+
Creates a namespace for a M3DB cluster associated with a public cloud project.
1212

1313
## Example Usage
1414

@@ -50,7 +50,7 @@ The following arguments are supported:
5050

5151
* `retention_period_duration` - (Required) Controls the duration of time that M3DB will retain data for the namespace.
5252

53-
* `snapshot_enabled` - (Optional) Defines whether M3db will create snapshot files for this namespace.
53+
* `snapshot_enabled` - (Optional) Defines whether M3DB will create snapshot files for this namespace.
5454

5555
* `writes_to_commit_log_enabled` - (Optional) Defines whether M3db will include writes to this namespace in the commit log.
5656

@@ -91,7 +91,7 @@ resource "ovh_cloud_project_database_m3db_namespace" "namespace" {
9191

9292
## Import
9393

94-
OVHcloud Managed m3db clusters namespaces can be imported using the `service_name`, `cluster_id` and `id` of the namespace, separated by "/" E.g.,
94+
OVHcloud Managed M3DB clusters namespaces can be imported using the `service_name`, `cluster_id` and `id` of the namespace, separated by "/" E.g.,
9595

9696
```bash
9797
$ terraform import ovh_cloud_project_database_m3db_namespace.my_namespace service_name/cluster_id/id

Diff for: ‎website/docs/r/cloud_project_database_m3db_user.html.markdown

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ layout: "ovh"
33
page_title: "OVH: cloud_project_database_m3db_user"
44
sidebar_current: "docs-ovh-resource-cloud-project-database-m3db-user"
55
description: |-
6-
Creates an user for a m3db cluster associated with a public cloud project.
6+
Creates an user for a M3DB cluster associated with a public cloud project.
77
---
88

99
# ovh_cloud_project_database_m3db_user
1010

11-
Creates an user for a m3db cluster associated with a public cloud project.
11+
Creates an user for a M3DB cluster associated with a public cloud project.
1212

1313
## Example Usage
1414

@@ -72,7 +72,7 @@ resource "ovh_cloud_project_database_m3db_user" "user" {
7272

7373
## Import
7474

75-
OVHcloud Managed m3db clusters users can be imported using the `service_name`, `cluster_id` and `id` of the user, separated by "/" E.g.,
75+
OVHcloud Managed M3DB clusters users can be imported using the `service_name`, `cluster_id` and `id` of the user, separated by "/" E.g.,
7676

7777
```bash
7878
$ terraform import ovh_cloud_project_database_m3db_user.my_user service_name/cluster_id/id

Diff for: ‎website/docs/r/cloud_project_database_user.html.markdown

+1-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ The following arguments are supported:
4141
* `service_name` - (Required, Forces new resource) The id of the public cloud project. If omitted,
4242
the `OVH_CLOUD_PROJECT_SERVICE` environment variable is used.
4343

44-
* `engine` - (Required, Forces new resource) The engine of the database cluster you want to add. To get a full list of available engine visit :
45-
[public documentation](https://docs.ovh.com/gb/en/publiccloud/databases).\
44+
* `engine` - (Required, Forces new resource) The engine of the database cluster you want to add. You can find the complete list of available engine in the [public documentation](https://docs.ovh.com/gb/en/publiccloud/databases).
4645
Available engines for this resource (other have specific resource):
4746
* `cassandra`
4847
* `kafka`

0 commit comments

Comments
 (0)