feat: add os_showcase option to computer prestage enrollment resource (Jamf Pro 11.21)

docs/resources/computer_prestage_enrollment.md

@@ -50,6 +50,7 @@ resource "jamfpro_computer_prestage_enrollment" "minimum_example" {
     enable_lockdown_mode = false
     welcome              = false
     wallpaper            = false
+    os_showcase          = false
   }
   location_information {
     username      = ""
@@ -147,6 +148,7 @@ resource "jamfpro_computer_prestage_enrollment" "configured_example_1" {
     enable_lockdown_mode = false
     welcome              = false
     wallpaper            = false
+    os_showcase          = true
   }
   location_information {
     username      = ""
@@ -348,6 +350,7 @@ Required:
 - `icloud_storage` (Boolean) Skip iCloud Storage setup.
 - `intelligence` (Boolean) Skip Apple Intelligence setup.
 - `location` (Boolean) Skip Location setup.
+- `os_showcase` (Boolean) Skip OS showcase setup.
 - `payment` (Boolean) Skip Payment setup.
 - `privacy` (Boolean) Skip Privacy setup.
 - `registration` (Boolean) Skip Registration setup.

examples/resources/jamfpro_computer_prestage_enrollment/resource.tf

@@ -39,6 +39,7 @@ resource "jamfpro_computer_prestage_enrollment" "minimum_example" {
     enable_lockdown_mode = false
     welcome              = false
     wallpaper            = false
+    os_showcase          = false
   }
   location_information {
     username      = ""
@@ -136,6 +137,7 @@ resource "jamfpro_computer_prestage_enrollment" "configured_example_1" {
     enable_lockdown_mode = false
     welcome              = false
     wallpaper            = false
+    os_showcase          = true
   }
   location_information {
     username      = ""
@@ -192,4 +194,4 @@ resource "jamfpro_computer_prestage_enrollment" "configured_example_1" {
     prefill_account_user_name                    = "firstname.lastname"
     prevent_prefill_info_from_modification       = false
   }
-}
+}

internal/services/computer_prestage_enrollment/resource_constructor.go

@@ -144,6 +144,7 @@
 		Wallpaper:                 jamfpro.BoolPtr(data["wallpaper"].(bool)),
 		SoftwareUpdate:            jamfpro.BoolPtr(data["software_update"].(bool)),
 		AdditionalPrivacySettings: jamfpro.BoolPtr(data["additional_privacy_settings"].(bool)),
+		OSShowcase:                jamfpro.BoolPtr(data["os_showcase"].(bool)),
 	}
 }
 

internal/services/computer_prestage_enrollment/resource_schema.go

@@ -242,6 +242,11 @@ func ResourceJamfProComputerPrestageEnrollment() *schema.Resource {
 							Required:    true,
 							Description: "Skip additional privacy settings setup.",
 						},
+						"os_showcase": {
+							Type:        schema.TypeBool,
+							Required:    true,
+							Description: "Skip OS showcase setup.",
+						},
 					},
 				},
 			},

internal/services/computer_prestage_enrollment/resource_state.go

@@ -48,25 +48,6 @@
 		"site_id":                                 resp.SiteId,
 		"platform_sso_enabled":                    resp.PssoEnabled,
 		"platform_sso_app_bundle_id":              resp.PlatformSsoAppBundleId,
-		// "enabled":                                 resp.Enabled,
-		// "sso_for_enrollment_enabled":              resp.SsoForEnrollmentEnabled,
-		// "sso_bypass_allowed":                      resp.SsoBypassAllowed,
-		// "sso_enabled":                             resp.SsoEnabled,
-		// "sso_for_mac_os_self_service_enabled":     resp.SsoForMacOsSelfServiceEnabled,
-		// "token_expiration_disabled":               resp.TokenExpirationDisabled,
-		// "user_attribute_enabled":                  resp.UserAttributeEnabled,
-		// "user_attribute_name":                     resp.UserAttributeName,
-		// "user_mapping":                            resp.UserMapping,
-		// "enrollment_sso_for_account_driven_enrollment_enabled": resp.EnrollmentSsoForAccountDrivenEnrollmentEnabled,
-		// "group_enrollment_access_enabled":                      resp.GroupEnrollmentAccessEnabled,
-		// "group_attribute_name":                                 resp.GroupAttributeName,
-		// "group_rdn_key":                                        resp.GroupRdnKey,
-		// "group_enrollment_access_name":                         resp.GroupEnrollmentAccessName,
-		// "idp_provider_type":                                    resp.IdpProviderType,
-		// "other_provider_type_name":                             resp.OtherProviderTypeName,
-		// "metadata_source":                                      resp.MetadataSource,
-		// "session_timeout":                                      resp.SessionTimeout,
-		// "device_type":                                          resp.DeviceType,
 	}
 
 	if locationInformation := resp.LocationInformation; locationInformation != (jamfpro.ComputerPrestageSubsetLocationInformation{}) {
@@ -177,6 +158,7 @@
 		"wallpaper":                   *skipSetupItems.Wallpaper,
 		"software_update":             *skipSetupItems.SoftwareUpdate,
 		"additional_privacy_settings": *skipSetupItems.AdditionalPrivacySettings,
+		"os_showcase":                 *skipSetupItems.OSShowcase,
 	}
 }
 

testing/payloads/jamfpro_computer_prestage_enrollment/computer_prestage_enrollment.tf

@@ -1,5 +1,5 @@
 resource "jamfpro_computer_prestage_enrollment" "minimum_example" {
-  display_name                          = "jamfpro-sdk-example-computerPrestageMinimum-config"
+  display_name                          = "tf-testing-${var.testing_id}-${random_id.rng.hex}"
   mandatory                             = true
   mdm_removable                         = true
   support_phone_number                  = "111-222-3333"
@@ -41,6 +41,7 @@ resource "jamfpro_computer_prestage_enrollment" "minimum_example" {
     wallpaper                   = false
     software_update             = false
     additional_privacy_settings = true
+    os_showcase                 = true
   }
   location_information {
     username      = ""