Merge pull request #1132 from ovh/dev/aamstutz/deprecate-ip-mitigation

fix(ip_mitigation): Deprecate attribute 'permanent'

Author: amstuta

docs/data-sources/ip_mitigation.md

@@ -24,6 +24,6 @@ data "ovh_ip_mitigation" "mitigation_data" {
 
 * `ip` - The IP or the CIDR
 * `ip_on_mitigation` - IPv4 address
-* `permanent ` - Set on true if the IP is on permanent mitigation
+* `permanent ` - (Deprecated) Set on true if the IP is on permanent mitigation
 * `state` - Current state of the IP on mitigation
 * `auto` - Set on true if the IP is on auto-mitigation

docs/data-sources/okms_credential.md

@@ -22,7 +22,7 @@ data "ovh_okms_credential" "kms" {
 
 ## Attributes Reference
 
-- `certificate_type` (String) Type of the certificate (ECDSA or RSA)
+- `certificate_type` (String) Type of certificate key (`ECDSA` or `RSA`).
 - `certificate_pem` (String) PEM encoded certificate of the credential
 - `created_at` (String) Creation time of the credential
 - `description` (String) Description of the credential

docs/resources/ip_mitigation.md

@@ -19,12 +19,12 @@ resource "ovh_ip_mitigation" "mitigation" {
 
 * `ip` - (Required) The IP or the CIDR
 * `ip_on_mitigation` - (Required) IPv4 address
-* `permanent ` - Set on true if the IP is on permanent mitigation
+* `permanent ` - Deprecated, has no effect
 
 ## Attributes Reference
 
 * `ip` - The IP or the CIDR
 * `ip_on_mitigation` - IPv4 address
-* `permanent ` - Set on true if the IP is on permanent mitigation
+* `permanent ` - (Deprecated) Set on true if the IP is on permanent mitigation
 * `state` - Current state of the IP on mitigation
 * `auto` - Set on true if the IP is on auto-mitigation

docs/resources/okms_credential.md

@@ -40,7 +40,6 @@ resource "ovh_okms_credential" "cred_from_csr" {
   identity_urns = ["urn:v1:eu:identity:account:${data.ovh_me.current_account.nichandle}"]
   csr           = file("cred.csr")
   description   = "Credential from CSR"
-  certificate_type = "ECDSA"
 }
 ```
 
@@ -57,11 +56,11 @@ resource "ovh_okms_credential" "cred_from_csr" {
 - `csr` (String) Certificate Signing Request. The CSR should be encoded in the PEM format. If this argument is not set, the server will generate a CSR for this credential, and the corresponding private key will be returned in the `private_key_pem` attribute.
 - `description` (String) Description of the credential (max 200 characters)
 - `validity` (Number) Validity in days (default: 365 days, max: 365 days)
-- `certificate_type` (String) Type of the certificate key algorithm. Allowed values: `ECDSA`, `RSA`. Default to `ECDSA`. Changing forces a new credential.
+- `certificate_type` (String) Type of certificate key. Allowed values: `ECDSA`, `RSA`. Default to `ECDSA`. Changing forces a new credential.
 
 ## Attributes Reference
 
-- `certificate_type` (String) Type of the certificate key algorithm (`ECDSA` or `RSA`).
+- `certificate_type` (String) Type of certificate key (`ECDSA` or `RSA`).
 - `certificate_pem` (String) Certificate PEM of the credential.
 - `created_at` (String) Creation time of the credential
 - `expired_at` (String) Expiration time of the credential

ovh/data_ip_mitigation_gen.go

@@ -117,54 +117,7 @@ func (r *ipMitigationResource) Read(ctx context.Context, req resource.ReadReques
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
 }
 
-func (r *ipMitigationResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
-	var data, planData, responseData IpMitigationModel
-
-	// Read Terraform plan data into the model
-	resp.Diagnostics.Append(req.Plan.Get(ctx, &planData)...)
-	if resp.Diagnostics.HasError() {
-		return
-	}
-
-	// Read Terraform prior state data into the model
-	resp.Diagnostics.Append(req.State.Get(ctx, &data)...)
-	if resp.Diagnostics.HasError() {
-		return
-	}
-
-	// Update resource
-	endpoint := "/ip/" + url.PathEscape(data.Ip.ValueString()) + "/mitigation/" + url.PathEscape(data.IpOnMitigation.ValueString())
-	if err := r.config.OVHClient.Put(endpoint, planData.ToUpdate(), nil); err != nil {
-		resp.Diagnostics.AddError(
-			fmt.Sprintf("Error calling Put %s", endpoint),
-			err.Error(),
-		)
-		return
-	}
-
-	// Read updated resource
-	err := retry.RetryContext(ctx, 10*time.Minute, func() *retry.RetryError {
-		readErr := r.config.OVHClient.Get(endpoint, &responseData)
-		if readErr != nil {
-			return retry.NonRetryableError(readErr)
-		}
-
-		if responseData.State.ValueString() == "ok" {
-			return nil
-		}
-
-		return retry.RetryableError(errors.New("waiting for resource state to be ok"))
-	})
-
-	if err != nil {
-		resp.Diagnostics.AddError("error waiting status to be ok", err.Error())
-		return
-	}
-
-	responseData.MergeWith(&planData)
-
-	// Save updated data into Terraform state
-	resp.Diagnostics.Append(resp.State.Set(ctx, &responseData)...)
+func (r *ipMitigationResource) Update(_ context.Context, _ resource.UpdateRequest, _ *resource.UpdateResponse) {
 }
 
 func (r *ipMitigationResource) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) {

ovh/resource_ip_mitigation.go

@@ -23,6 +23,6 @@ Use this resource to retrieve information about an IP permanent mitigation.
 
 * `ip` - The IP or the CIDR
 * `ip_on_mitigation` - IPv4 address
-* `permanent ` - Set on true if the IP is on permanent mitigation
+* `permanent ` - (Deprecated) Set on true if the IP is on permanent mitigation
 * `state` - Current state of the IP on mitigation
 * `auto` - Set on true if the IP is on auto-mitigation

ovh/resource_ip_mitigation_gen.go

@@ -18,12 +18,12 @@ Use this resource to manage an IP permanent mitigation.
 
 * `ip` - (Required) The IP or the CIDR
 * `ip_on_mitigation` - (Required) IPv4 address
-* `permanent ` - Set on true if the IP is on permanent mitigation
+* `permanent ` - Deprecated, has no effect
 
 ## Attributes Reference
 
 * `ip` - The IP or the CIDR
 * `ip_on_mitigation` - IPv4 address
-* `permanent ` - Set on true if the IP is on permanent mitigation
+* `permanent ` - (Deprecated) Set on true if the IP is on permanent mitigation
 * `state` - Current state of the IP on mitigation
 * `auto` - Set on true if the IP is on auto-mitigation