Skip to content

fix: Self Service state reading for Jamf Pro policies #937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ShocOne merged 1 commit into from
Dec 3, 2025
Merged

fix: Self Service state reading for Jamf Pro policies #937

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions internal/services/policy/resource_state_self_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import (

// stateSelfService Reads response and states self-service items and states only if non-default
func stateSelfService(d *schema.ResourceData, resp *jamfpro.ResourcePolicy, diags *diag.Diagnostics) {
policyName := resp.General.Name

defaults := map[string]any{
"use_for_self_service": false,
"self_service_display_name": "",
Expand All @@ -31,10 +33,22 @@ func stateSelfService(d *schema.ResourceData, resp *jamfpro.ResourcePolicy, diag
"feature_on_main_page": resp.SelfService.FeatureOnMainPage,
}

allDefault := false
allDefault := true
for key, value := range current {
// Special case: if self_service_display_name equals the policy name, Jamf Pro auto-populated it
// Treat it as a default value (empty string) since the user didn't explicitly set it
if key == "self_service_display_name" && value == policyName {
continue
}

// Special case: if install_button_text is empty, Jamf Pro returns empty string instead of default
// Treat it as the default "Install"
if key == "install_button_text" && value == "" {
continue
}

if value != defaults[key] {
allDefault = true
allDefault = false
break
}
}
Expand All @@ -49,6 +63,7 @@ func stateSelfService(d *schema.ResourceData, resp *jamfpro.ResourcePolicy, diag
out_ss[0]["use_for_self_service"] = resp.SelfService.UseForSelfService
out_ss[0]["self_service_display_name"] = resp.SelfService.SelfServiceDisplayName
out_ss[0]["install_button_text"] = resp.SelfService.InstallButtonText
out_ss[0]["reinstall_button_text"] = resp.SelfService.ReinstallButtonText
out_ss[0]["self_service_description"] = resp.SelfService.SelfServiceDescription
out_ss[0]["force_users_to_view_description"] = resp.SelfService.ForceUsersToViewDescription
out_ss[0]["feature_on_main_page"] = resp.SelfService.FeatureOnMainPage
Expand Down
Loading