Merge pull request #696 from rawmind0/adtls

Added new argument rancher2_auth_config_activedirectory.start_tls

Author: rawmind0

CHANGELOG.md

@@ -3,6 +3,7 @@
 FEATURES:
 
 * **New Argument:** `rancher2_auth_config_keycloak.entity_id` - (Optional/Computed) KeyCloak Client ID field (string)
+* **New Argument:** `rancher2_auth_config_activedirectory.start_tls` - (Optional/Computed) Enable start TLS connection (bool)
 * **New Argument:** `rancher2_node_pool.drain_before_delete` - (Optional) Drain nodes before delete (bool)
 
 ENHANCEMENTS:

docs/resources/auth_config_activedirectory.md

@@ -49,14 +49,15 @@ The following arguments are supported:
 * `group_search_filter` - (Optional/Computed) Group search filter (string)
 * `nested_group_membership_enabled` - (Optional/Computed) Nested group membership enable. Default `false` (bool)
 * `port` - (Optional) ActiveDirectory port. Default `389` (int)
+* `start_tls` - (Optional/Computed) Enable start TLS connection (bool)
+* `tls` - (Optional/Computed) Enable TLS connection (bool)
 * `user_disabled_bit_mask` - (Optional) User disabled bit mask. Default `2` (int)
 * `user_enabled_attribute` - (Optional/Computed) User enable attribute (string)
 * `user_login_attribute` - (Optional/Computed) User login attribute. Default `sAMAccountName` (string)
 * `user_name_attribute` - (Optional/Computed) User name attribute. Default `name` (string)
 * `user_object_class` - (Optional/Computed) User object class. Default `person` (string)
 * `user_search_attribute` - (Optional/Computed) User search attribute. Default `sAMAccountName|sn|givenName` (string)
 * `user_search_filter` - (Optional/Computed) User search filter (string)
-* `tls` - (Optional/Computed) Enable TLS connection (bool)
 * `annotations` - (Optional/Computed) Annotations of the resource (map)
 * `labels` - (Optional/Computed) Labels of the resource (map)
 

rancher2/schema_auth_config_activedirectory.go

@@ -105,6 +105,16 @@ func authConfigActiveDirectoryFields() map[string]*schema.Schema {
 			Optional: true,
 			Default:  389,
 		},
+		"start_tls": {
+			Type:     schema.TypeBool,
+			Optional: true,
+			Computed: true,
+		},
+		"tls": {
+			Type:     schema.TypeBool,
+			Optional: true,
+			Computed: true,
+		},
 		"user_disabled_bit_mask": {
 			Type:     schema.TypeInt,
 			Optional: true,
@@ -140,11 +150,6 @@ func authConfigActiveDirectoryFields() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
-		"tls": {
-			Type:     schema.TypeBool,
-			Optional: true,
-			Computed: true,
-		},
 	}
 
 	for k, v := range authConfigFields() {

rancher2/structure_auth_config_activedirectory.go

@@ -49,6 +49,7 @@ func flattenAuthConfigActiveDirectory(d *schema.ResourceData, in *managementClie
 	d.Set("group_search_filter", in.GroupSearchFilter)
 	d.Set("nested_group_membership_enabled", *in.NestedGroupMembershipEnabled)
 	d.Set("port", int(in.Port))
+	d.Set("start_tls", in.StartTLS)
 	d.Set("tls", in.TLS)
 	d.Set("user_disabled_bit_mask", int(in.UserDisabledBitMask))
 	d.Set("user_enabled_attribute", in.UserEnabledAttribute)
@@ -164,6 +165,10 @@ func expandAuthConfigActiveDirectory(in *schema.ResourceData) (*managementClient
 		obj.Port = int64(v)
 	}
 
+	if v, ok := in.Get("start_tls").(bool); ok {
+		obj.StartTLS = v
+	}
+
 	if v, ok := in.Get("tls").(bool); ok {
 		obj.TLS = v
 	}

rancher2/structure_auth_config_activedirectory_test.go

@@ -36,6 +36,7 @@ func init() {
 		GroupSearchFilter:            "group_search_filter",
 		NestedGroupMembershipEnabled: newTrue(),
 		Port:                         389,
+		StartTLS:                     true,
 		TLS:                          true,
 		UserDisabledBitMask:          0,
 		UserEnabledAttribute:         "user_enabled_attribute",
@@ -67,6 +68,7 @@ func init() {
 		"group_search_filter":             "group_search_filter",
 		"nested_group_membership_enabled": true,
 		"port":                            389,
+		"start_tls":                       true,
 		"tls":                             true,
 		"user_disabled_bit_mask":          0,
 		"user_enabled_attribute":          "user_enabled_attribute",