From ca69d13fd8fe6d8410d44dfcf01f03570a3f5f39 Mon Sep 17 00:00:00 2001 From: ShocOne <62835948+ShocOne@users.noreply.github.com> Date: Thu, 26 Sep 2024 11:24:05 +0100 Subject: [PATCH 1/2] Update Jamf Pro provider version to 0.3.1 --- workload/terraform/jamfpro/buildings.tf | 54 +++++++++---------- workload/terraform/jamfpro/dock_items.tf | 30 +++++------ .../macos_configuration_profiles_plist.tf | 26 ++++----- workload/terraform/jamfpro/provider.tf | 2 +- 4 files changed, 56 insertions(+), 56 deletions(-) diff --git a/workload/terraform/jamfpro/buildings.tf b/workload/terraform/jamfpro/buildings.tf index bd8b20e0..c559c50d 100644 --- a/workload/terraform/jamfpro/buildings.tf +++ b/workload/terraform/jamfpro/buildings.tf @@ -1,30 +1,30 @@ -resource "jamfpro_building" "jamfpro_building_001" { - name = "tf-demo-Apple-Park" - street_address1 = "The McIntosh Tree" - street_address2 = "One Apple Park Way" - city = "Cupertino" - state_province = "California" - zip_postal_code = "95014" - country = "The United States of America" -} +# resource "jamfpro_building" "jamfpro_building_001" { +# name = "tf-demo-Apple-Park" +# street_address1 = "The McIntosh Tree" +# street_address2 = "One Apple Park Way" +# city = "Cupertino" +# state_province = "California" +# zip_postal_code = "95014" +# country = "The United States of America" +# } -resource "jamfpro_building" "jamfpro_building_002" { - name = "tf-demo-jamf-headquarters" - street_address1 = "100 Washington Ave S" - street_address2 = "Suite 1100" - city = "Minneapolis" - state_province = "Minnesota" - zip_postal_code = "55401" - country = "The United States of America" -} +# resource "jamfpro_building" "jamfpro_building_002" { +# name = "tf-demo-jamf-headquarters" +# street_address1 = "100 Washington Ave S" +# street_address2 = "Suite 1100" +# city = "Minneapolis" +# state_province = "Minnesota" +# zip_postal_code = "55401" +# country = "The United States of America" +# } -resource "jamfpro_building" "jamfpro_building_003" { - name = "tf-demo-Apple-Battersea" - street_address1 = "Ground Floor, Turbine Hall A, Circus Rd W, Nine Elms" - street_address2 = "Suite 1100" - city = "London" - state_province = "London" - zip_postal_code = "SW11 8AL" - country = "United Kingdom" -} \ No newline at end of file +# resource "jamfpro_building" "jamfpro_building_003" { +# name = "tf-demo-Apple-Battersea" +# street_address1 = "Ground Floor, Turbine Hall A, Circus Rd W, Nine Elms" +# street_address2 = "Suite 1100" +# city = "London" +# state_province = "London" +# zip_postal_code = "SW11 8AL" +# country = "United Kingdom" +# } \ No newline at end of file diff --git a/workload/terraform/jamfpro/dock_items.tf b/workload/terraform/jamfpro/dock_items.tf index 95bc04c3..6d3fa326 100644 --- a/workload/terraform/jamfpro/dock_items.tf +++ b/workload/terraform/jamfpro/dock_items.tf @@ -1,18 +1,18 @@ -resource "jamfpro_dock_item" "jamfpro_dock_item_001" { - name = "tf-demo-dockItem-app-iTunes" - type = "App" - path = "file://localhost/Applications/iTunes.app/" -} +# resource "jamfpro_dock_item" "jamfpro_dock_item_001" { +# name = "tf-demo-dockItem-app-iTunes" +# type = "App" +# path = "file://localhost/Applications/iTunes.app/" +# } -resource "jamfpro_dock_item" "jamfpro_dock_item_002" { - name = "tf-demo-dockItem-file-hosts" - type = "File" // App / File / Folder - path = "/etc/hosts" -} +# resource "jamfpro_dock_item" "jamfpro_dock_item_002" { +# name = "tf-demo-dockItem-file-hosts" +# type = "File" // App / File / Folder +# path = "/etc/hosts" +# } -resource "jamfpro_dock_item" "jamfpro_dock_item_003" { - name = "tf-demo-dockItem-folder-downloadsFolder" - type = "Folder" // App / File / Folder - path = "~/Downloads" -} \ No newline at end of file +# resource "jamfpro_dock_item" "jamfpro_dock_item_003" { +# name = "tf-demo-dockItem-folder-downloadsFolder" +# type = "Folder" // App / File / Folder +# path = "~/Downloads" +# } \ No newline at end of file diff --git a/workload/terraform/jamfpro/macos_configuration_profiles_plist.tf b/workload/terraform/jamfpro/macos_configuration_profiles_plist.tf index 69f07553..2cec4da3 100644 --- a/workload/terraform/jamfpro/macos_configuration_profiles_plist.tf +++ b/workload/terraform/jamfpro/macos_configuration_profiles_plist.tf @@ -1,17 +1,17 @@ -resource "jamfpro_macos_configuration_profile_plist" "jamfpro_macos_configuration_profile_001" { - name = "tf-demo-mcp-accessibility_hearing_base-prod-v0.0.1" - distribution_method = "Install Automatically" - payloads = file("${path.module}/support_files/configuration_profiles/dt-mcp-accessibility_hearing_base-prod-v0.0.1.mobileconfig") - category_id = -1 - user_removable = false - level = "System" - redeploy_on_update = "Newly Assigned" - scope { - all_computers = true - all_jss_users = true - } -} +# resource "jamfpro_macos_configuration_profile_plist" "jamfpro_macos_configuration_profile_001" { +# name = "tf-demo-mcp-accessibility_hearing_base-prod-v0.0.1" +# distribution_method = "Install Automatically" +# payloads = file("${path.module}/support_files/configuration_profiles/dt-mcp-accessibility_hearing_base-prod-v0.0.1.mobileconfig") +# category_id = -1 +# user_removable = false +# level = "System" +# redeploy_on_update = "Newly Assigned" +# scope { +# all_computers = true +# all_jss_users = true +# } +# } # resource "jamfpro_macos_configuration_profile_plist" "jamfpro_macos_configuration_profile_002" { # name = "tf-demo-mcp-accessibility_seeing_base-prod-v0.0.1" diff --git a/workload/terraform/jamfpro/provider.tf b/workload/terraform/jamfpro/provider.tf index c5ab3a98..701f3afe 100644 --- a/workload/terraform/jamfpro/provider.tf +++ b/workload/terraform/jamfpro/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { jamfpro = { source = "deploymenttheory/jamfpro" - version = "~> 0.2.0" + version = "~> 0.3.1" } } } From a8a1071f0ea44853959ff1785b59595b5207e300 Mon Sep 17 00:00:00 2001 From: ShocOne <62835948+ShocOne@users.noreply.github.com> Date: Thu, 26 Sep 2024 11:33:49 +0100 Subject: [PATCH 2/2] Refactor jamfpro_script_001 in scripts.tf --- workload/terraform/jamfpro/scripts.tf | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/workload/terraform/jamfpro/scripts.tf b/workload/terraform/jamfpro/scripts.tf index f3c24489..42486ae8 100644 --- 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"