Skip to content

Commit 1b4d0e1

Browse files
authored
Merge pull request #251 from NetApp/250-bug-error-on-cifs-service-setup
250 bug error on cifs service setup
2 parents a323e8e + 38aa4a7 commit 1b4d0e1

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
## 1.1.3
22

33
BUG FIXES:
4+
5+
* **netapp-ontap_protocols_cifs_service_resource**: fixed on attribute checking ([#250](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/250))
46
* **netapp-ontap_protocols_san_igroups_resource**: fixed bug nil pointer dereference ([#247](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/247))
57

68

docs/resources/protocols_cifs_service_resource.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,10 @@ Optional:
119119

120120
Optional:
121121

122-
- `advertised_kdc_encryptions` (Set of String) List of advertised KDC encryptions
122+
- `advertised_kdc_encryptions` (Set of String) List of advertised KDC encryptions (9.12)
123123
- `aes_netlogon_enabled` (Boolean) An AES session key is enabled for the Netlogon channel (9.10)
124124
- `encrypt_dc_connection` (Boolean) Encryption is required for domain controller connections (9.8)
125-
- `kdc_encryption` (Boolean) Specifies whether AES-128 and AES-256 encryption is enabled for all Kerberos-based communication with the Active Directory KDC
125+
- `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.
126126
- `ldap_referral_enabled` (Boolean) Specifies if LDAP referral chasing is enabled for AD LDAP connections (9.10)
127127
- `lm_compatibility_level` (String) CIFS server minimum security level
128128
- `restrict_anonymous` (String) Specifies what level of access an anonymous user is granted

internal/provider/protocols_cifs_service_resource.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"fmt"
66
"strings"
77

8-
"github.com/hashicorp/terraform-plugin-framework-validators/boolvalidator"
98
"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
109
"github.com/hashicorp/terraform-plugin-framework/attr"
1110
"github.com/hashicorp/terraform-plugin-framework/diag"
@@ -255,12 +254,7 @@ func (r *CifsServiceResource) Schema(ctx context.Context, req resource.SchemaReq
255254
PlanModifiers: []planmodifier.Bool{
256255
boolplanmodifier.UseStateForUnknown(),
257256
},
258-
Validators: []validator.Bool{
259-
boolvalidator.ConflictsWith(path.Expressions{
260-
path.MatchRoot("advertised_kdc_encryptions"),
261-
}...),
262-
},
263-
MarkdownDescription: "Specifies whether AES-128 and AES-256 encryption is enabled for all Kerberos-based communication with the Active Directory KDC",
257+
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.",
264258
},
265259
"lm_compatibility_level": schema.StringAttribute{
266260
Optional: true,
@@ -338,7 +332,7 @@ func (r *CifsServiceResource) Schema(ctx context.Context, req resource.SchemaReq
338332
PlanModifiers: []planmodifier.Set{
339333
setplanmodifier.UseStateForUnknown(),
340334
},
341-
MarkdownDescription: "List of advertised KDC encryptions",
335+
MarkdownDescription: "List of advertised KDC encryptions (9.12)",
342336
ElementType: types.StringType,
343337
},
344338
},

0 commit comments

Comments
 (0)