Merge pull request #251 from NetApp/250-bug-error-on-cifs-service-setup

250 bug error on cifs service setup
NetApp · Aug 1, 2024 · 1b4d0e1 · 1b4d0e1
2 parents a323e8e + 38aa4a7
commit 1b4d0e1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 ## 1.1.3
 
 BUG FIXES:
+
+* **netapp-ontap_protocols_cifs_service_resource**: fixed on attribute checking ([#250](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/250))
 * **netapp-ontap_protocols_san_igroups_resource**: fixed bug nil pointer dereference ([#247](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/247))
 
 

diff --git a/docs/resources/protocols_cifs_service_resource.md b/docs/resources/protocols_cifs_service_resource.md
@@ -119,10 +119,10 @@ Optional:
 
 Optional:
 
-- `advertised_kdc_encryptions` (Set of String) List of advertised KDC encryptions
+- `advertised_kdc_encryptions` (Set of String) List of advertised KDC encryptions (9.12)
 - `aes_netlogon_enabled` (Boolean) An AES session key is enabled for the Netlogon channel (9.10)
 - `encrypt_dc_connection` (Boolean) Encryption is required for domain controller connections (9.8)
-- `kdc_encryption` (Boolean) Specifies whether AES-128 and AES-256 encryption is enabled for all Kerberos-based communication with the Active Directory KDC
+- `kdc_encryption` (Boolean) Specifies whether AES-128 and AES-256 encryption is enabled for all Kerberos-based communication with the Active Directory KDC. Deprecated in 9.12. Use 'advertised_kdc_encryptions' instead.
 - `ldap_referral_enabled` (Boolean) Specifies if LDAP referral chasing is enabled for AD LDAP connections (9.10)
 - `lm_compatibility_level` (String) CIFS server minimum security level
 - `restrict_anonymous` (String) Specifies what level of access an anonymous user is granted

diff --git a/internal/provider/protocols_cifs_service_resource.go b/internal/provider/protocols_cifs_service_resource.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/terraform-plugin-framework-validators/boolvalidator"
 	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
 	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
@@ -255,12 +254,7 @@ func (r *CifsServiceResource) Schema(ctx context.Context, req resource.SchemaReq
 						PlanModifiers: []planmodifier.Bool{
 							boolplanmodifier.UseStateForUnknown(),
 						},
-						Validators: []validator.Bool{
-							boolvalidator.ConflictsWith(path.Expressions{
-								path.MatchRoot("advertised_kdc_encryptions"),
-							}...),
-						},
-						MarkdownDescription: "Specifies whether AES-128 and AES-256 encryption is enabled for all Kerberos-based communication with the Active Directory KDC",
+						MarkdownDescription: "Specifies whether AES-128 and AES-256 encryption is enabled for all Kerberos-based communication with the Active Directory KDC. Deprecated in 9.12. Use 'advertised_kdc_encryptions' instead.",
 					},
 					"lm_compatibility_level": schema.StringAttribute{
 						Optional:            true,
@@ -338,7 +332,7 @@ func (r *CifsServiceResource) Schema(ctx context.Context, req resource.SchemaReq
 						PlanModifiers: []planmodifier.Set{
 							setplanmodifier.UseStateForUnknown(),
 						},
-						MarkdownDescription: "List of advertised KDC encryptions",
+						MarkdownDescription: "List of advertised KDC encryptions (9.12)",
 						ElementType:         types.StringType,
 					},
 				},