Merge pull request #52 from agilize/bug/change-mfa-enforcement-delay-period

Bug: Change mfa enforcement delay period argument

Author: ferreirafa

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v0.1.12 (2025-07-09)
+
+* Initial release
+
+## v0.1.10 (2025-06-12)
+
+* Initial release
+
 ## v0.1.9 (2025-05-09)
 
 * Initial release

jumpcloud/users/users_directory/resource_user.go

@@ -53,9 +53,9 @@ type SSHKey struct {
 
 // MFAConfig represents a user's MFA configuration
 type MFAConfig struct {
-	Exclusion      bool   `json:"exclusion,omitempty"`
-	ExclusionUntil string `json:"exclusionUntil,omitempty"`
-	Configured     bool   `json:"configured,omitempty"`
+	Exclusion     bool `json:"exclusion,omitempty"`
+	ExclusionDays int  `json:"exclusionDays,omitempty"`
+	Configured    bool `json:"configured,omitempty"`
 }
 
 // MFAEnrollment represents a user's MFA enrollment status
@@ -543,26 +543,29 @@ func ResourceUser() *schema.Resource {
 			"mfa": {
 				Type:     schema.TypeList,
 				Optional: true,
-				Computed: true,
 				MaxItems: 1,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"exclusion": {
-							Type:     schema.TypeBool,
-							Optional: true,
-							Default:  false,
+							Type:        schema.TypeBool,
+							Optional:    true,
+							Default:     false,
+							Description: "Whether the user is excluded from MFA requirements",
 						},
-						"exclusion_until": {
-							Type:     schema.TypeString,
-							Optional: true,
-							Computed: true,
+						"exclusion_days": {
+							Type:        schema.TypeInt,
+							Optional:    true,
+							Description: "Number of days the user is excluded from MFA requirements",
 						},
 						"configured": {
-							Type:     schema.TypeBool,
-							Computed: true,
+							Type:        schema.TypeBool,
+							Optional:    true,
+							Computed:    true,
+							Description: "Whether MFA is configured for the user",
 						},
 					},
 				},
+				Description: "MFA configuration for the user",
 			},
 			"state": {
 				Type:        schema.TypeString,
@@ -834,8 +837,8 @@ func resourceUserCreate(ctx context.Context, d *schema.ResourceData, meta any) d
 		if len(mfaList) > 0 {
 			mfaMap := mfaList[0].(map[string]any)
 			user.MFA = MFAConfig{
-				Exclusion:      mfaMap["exclusion"].(bool),
-				ExclusionUntil: mfaMap["exclusion_until"].(string),
+				Exclusion:     mfaMap["exclusion"].(bool),
+				ExclusionDays: mfaMap["exclusion_days"].(int),
 			}
 		}
 	}
@@ -1327,9 +1330,9 @@ func resourceUserRead(ctx context.Context, d *schema.ResourceData, meta any) dia
 	if user.MFA.Configured || user.MFA.Exclusion {
 		mfaConfig := []map[string]any{
 			{
-				"exclusion":       user.MFA.Exclusion,
-				"exclusion_until": user.MFA.ExclusionUntil,
-				"configured":      user.MFA.Configured,
+				"exclusion":      user.MFA.Exclusion,
+				"exclusion_days": user.MFA.ExclusionDays,
+				"configured":     user.MFA.Configured,
 			},
 		}
 		if err := d.Set("mfa", mfaConfig); err != nil {
@@ -1570,8 +1573,8 @@ func resourceUserUpdate(ctx context.Context, d *schema.ResourceData, meta any) d
 		if len(mfaList) > 0 {
 			mfaMap := mfaList[0].(map[string]any)
 			user.MFA = MFAConfig{
-				Exclusion:      mfaMap["exclusion"].(bool),
-				ExclusionUntil: mfaMap["exclusion_until"].(string),
+				Exclusion:     mfaMap["exclusion"].(bool),
+				ExclusionDays: mfaMap["exclusion_days"].(int),
 			}
 		}
 	}