🔄 Terraform changes from feat-scripts (#532)

* Refactor jamfpro policy scripts and update provider version * Clean up whitespace in jamfpro policy scripts * Uncomment jamfpro_script resource definition for application permissions * Fix typo in user interaction settings for jamfpro policy script * Comment out jamfpro_policy_script_002 resource definition in policy_scripts.tf * Comment out user interaction settings in jamfpro policy script and update jamfpro provider version to 0.6.1 * Update jamfpro provider version to 0.5.1 and adjust user interaction settings in policy script --------- Co-authored-by: ShocOne <[email protected]>
deploymenttheory · Dec 11, 2024 · 1b5f139 · 1b5f139
1 parent 89ff4af
commit 1b5f139
Show file tree

Hide file tree

Showing 3 changed files with 84 additions and 64 deletions.
diff --git a/workload/terraform/jamfpro/policy_scripts.tf b/workload/terraform/jamfpro/policy_scripts.tf
@@ -1,57 +1,76 @@
-# resource "jamfpro_policy" "jamfpro_policy_script_001" {
-#   name                          = "tf-demo-policy-script-correct-application-permissions"
-#   enabled                       = true
-#   trigger_checkin               = false
-#   trigger_enrollment_complete   = false
-#   trigger_login                 = false
-#   trigger_network_state_changed = false
-#   trigger_startup               = false
-#   trigger_other                 = "EVENT" // "USER_INITIATED" for self service trigger , "EVENT" for an event trigger
-#   frequency                     = "Once per computer"
-#   retry_event                   = "none"
-#   retry_attempts                = -1
-#   notify_on_each_failed_retry   = false
-#   target_drive                  = "/"
-#   offline                       = false
-#   category_id                   = -1
-#   site_id                       = -1
-
-#   network_limitations {
-#     minimum_network_connection = "No Minimum"
-#     any_ip_address             = false
-#   }
-
-#   scope {
-#     all_computers = false
-#     all_jss_users = false
-#   }
-
-#   self_service {
-#     use_for_self_service            = true
-#     self_service_display_name       = ""
-#     install_button_text             = "Install"
-#     self_service_description        = ""
-#     force_users_to_view_description = false
-
-#     feature_on_main_page = false
-#   }
-
-#   payloads {
-#     scripts {
-#       id          = jamfpro_script.jamfpro_script_001.id
-#       priority    = "After"
-#       parameter4  = ""
-#       parameter5  = ""
-#       parameter6  = ""
-#       parameter7  = ""
-#       parameter8  = ""
-#       parameter9  = ""
-#       parameter10 = ""
-#       parameter11 = ""
-
-#     }
-#   }
-# }
+resource "jamfpro_policy" "jamfpro_policy_script_001" {
+  name                          = "tf-demo-policy-script-correct-application-permissions"
+  enabled                       = true
+  trigger_checkin               = false
+  trigger_enrollment_complete   = false
+  trigger_login                 = false
+  trigger_network_state_changed = false
+  trigger_startup               = false
+  trigger_other                 = "EVENT" // "USER_INITIATED" for self service trigger , "EVENT" for an event trigger
+  frequency                     = "Once per computer"
+  retry_event                   = "none"
+  retry_attempts                = -1
+  notify_on_each_failed_retry   = false
+  target_drive                  = "/"
+  offline                       = false
+  category_id                   = -1
+  site_id                       = -1
+
+  network_limitations {
+    minimum_network_connection = "No Minimum"
+    any_ip_address             = false
+  }
+
+  scope {
+    all_computers = false
+    all_jss_users = false
+  }
+
+  self_service {
+    use_for_self_service            = true
+    self_service_display_name       = ""
+    install_button_text             = "Install"
+    reinstall_button_text           = "Reinstall"
+    self_service_description        = ""
+    force_users_to_view_description = false
+
+    feature_on_main_page = false
+  }
+
+
+
+  payloads {
+    scripts {
+      id          = jamfpro_script.jamfpro_script_001.id
+      priority    = "After"
+      parameter4  = ""
+      parameter5  = ""
+      parameter6  = ""
+      parameter7  = ""
+      parameter8  = ""
+      parameter9  = ""
+      parameter10 = ""
+      parameter11 = ""
+
+    }
+
+    user_interaction {
+      message_start            = "Policy is about to run."
+      allow_user_to_defer      = true
+      allow_deferral_until_utc = "2024-12-31T23:59:59Z"
+      allow_deferral_minutes   = 1440
+      message_finish           = "Policy has completed."
+    }
+
+    # user_interaction {
+    #   message_start            = "Policy is about to run."
+    #   allow_users_to_defer     = true
+    #   allow_deferral_until_utc = "2024-12-31T23:59:59Z"
+    #   allow_deferral_minutes   = 1440
+    #   message_finish           = "Policy has completed."
+    # }
+  }
+}
 
 # resource "jamfpro_policy" "jamfpro_policy_script_002" {
 #   name                          = "tf-demo-policy-script-reset_safari"

diff --git a/workload/terraform/jamfpro/provider.tf b/workload/terraform/jamfpro/provider.tf
@@ -2,7 +2,8 @@ terraform {
   required_providers {
     jamfpro = {
       source  = "deploymenttheory/jamfpro"
-      version = "~> 0.6.1"
+      version = "0.5.1" // "~> 0.6.1"
+
     }
   }
 }

diff --git a/workload/terraform/jamfpro/scripts.tf b/workload/terraform/jamfpro/scripts.tf
@@ -1,12 +1,12 @@
-# resource "jamfpro_script" "jamfpro_script_001" {
-#   name            = "tf-demo-correct-application-permissions-v1.0"
-#   script_contents = file("${path.module}/support_files/scripts/Correct Application Permissions.sh")
-#   os_requirements = "13"
-#   priority        = "BEFORE"
-#   info            = "Adds target user or group to specified group membership, or removes said membership."
-#   notes           = "Jamf Pro script parameters: 4 -> 7"
-#   parameter4      = "Google Chrome" // targetApplication
-# }
+resource "jamfpro_script" "jamfpro_script_001" {
+  name            = "tf-demo-correct-application-permissions-v1.0"
+  script_contents = file("${path.module}/support_files/scripts/Correct Application Permissions.sh")
+  os_requirements = "13"
+  priority        = "BEFORE"
+  info            = "Adds target user or group to specified group membership, or removes said membership."
+  notes           = "Jamf Pro script parameters: 4 -> 7"
+  parameter4      = "Google Chrome" // targetApplication
+}
 
 # resource "jamfpro_script" "jamfpro_script_002" {
 #   name            = "tf-demo-encrypt-apfs-volume-v5.0.1"