diff --git a/server/fleet/apple_mdm.go b/server/fleet/apple_mdm.go index 22bd82d6d4..1ee60cb3b9 100644 --- a/server/fleet/apple_mdm.go +++ b/server/fleet/apple_mdm.go @@ -597,7 +597,7 @@ func (r *MDMAppleRawDeclaration) ValidateUserProvided() error { // Check against types we don't allow if r.Type == `com.apple.configuration.softwareupdate.enforcement.specific` { - return NewInvalidArgumentError(r.Type, "Declaration profile can’t include OS updates settings. To control these settings, go to OS updates.") + return NewInvalidArgumentError(r.Type, "Declaration profile can’t include OS updates settings. OS updates coming soon!") } if _, forbidden := ForbiddenDeclTypes[r.Type]; forbidden { diff --git a/server/service/integration_ddm_test.go b/server/service/integration_ddm_test.go index 67d316ea59..43a9e798ff 100644 --- a/server/service/integration_ddm_test.go +++ b/server/service/integration_ddm_test.go @@ -62,7 +62,7 @@ func (s *integrationMDMTestSuite) TestAppleDDMBatchUpload() { }}, http.StatusUnprocessableEntity) errMsg = extractServerErrorText(res.Body) - require.Contains(t, errMsg, "Declaration profile can’t include OS updates settings. To control these settings, go to OS updates.") + require.Contains(t, errMsg, "Declaration profile can’t include OS updates settings. OS updates coming soon!") // Types from our list of forbidden types should fail for ft := range fleet.ForbiddenDeclTypes { diff --git a/server/service/integration_mdm_test.go b/server/service/integration_mdm_test.go index 7e9d9e6a5f..92c1053185 100644 --- a/server/service/integration_mdm_test.go +++ b/server/service/integration_mdm_test.go @@ -10919,7 +10919,7 @@ func (s *integrationMDMTestSuite) TestBatchSetMDMProfiles() { {Name: "N4", Contents: declarationForTestWithType("D1", "com.apple.configuration.softwareupdate.enforcement.specific")}, }}, http.StatusUnprocessableEntity, "team_id", strconv.Itoa(int(tm.ID))) errMsg := extractServerErrorText(res.Body) - require.Contains(t, errMsg, "Declaration profile can’t include OS updates settings. To control these settings, go to OS updates.") + require.Contains(t, errMsg, "Declaration profile can’t include OS updates settings. OS updates coming soon!") // invalid JSON res = s.Do("POST", "/api/v1/fleet/mdm/profiles/batch", batchSetMDMProfilesRequest{Profiles: []fleet.MDMProfileBatchPayload{