Merge pull request #42 from Ouest-France/FixRegression

Fix regression on datasource ldap_user where name was set as required
Ouest-France · Mar 3, 2022 · 1f0a252 · 1f0a252
2 parents 61d79fd + dd38d09
commit 1f0a252
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/ldap/data_source_resource_ldap_user.go b/ldap/data_source_resource_ldap_user.go
@@ -25,24 +25,27 @@ func dataSourceLDAPUser() *schema.Resource {
 				Required:    true,
 			},
 			"name": {
-				Description: "The name of the LDAP user.",
-				Type:        schema.TypeString,
-				Required:    true,
+				Description:  "The name of the LDAP user.",
+				Type:         schema.TypeString,
+				Optional:     true,
+				AtLeastOneOf: []string{"name", "sam_account_name", "user_principal_name"},
 			},
 			"sam_account_name": {
-				Description: "The sAMAccountName of the LDAP user.",
-				Type:        schema.TypeString,
-				Optional:    true,
+				Description:  "The sAMAccountName of the LDAP user.",
+				Type:         schema.TypeString,
+				Optional:     true,
+				AtLeastOneOf: []string{"name", "sam_account_name", "user_principal_name"},
 			},
 			"user_principal_name": {
-				Description: "The userPrincipalName of the LDAP user",
-				Type:        schema.TypeString,
-				Optional:    true,
+				Description:  "The userPrincipalName of the LDAP user",
+				Type:         schema.TypeString,
+				Optional:     true,
+				AtLeastOneOf: []string{"name", "sam_account_name", "user_principal_name"},
 			},
 			"description": {
 				Description: "Description attribute for the LDAP user.",
 				Type:        schema.TypeString,
-				Optional:    true,
+				Computed:    true,
 			},
 		},
 	}