Bump migrations that conflict with v4.87 (#48002)
<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves migration failure dsicussed here: https://fleetdm.slack.com/archives/C019WG4GH0A/p1782131309693279 20260610172952_AddHasACMEPayloadToHostMDMAppleProfiles.go was backported to v4.87 but had a newer timestamp so would have conflicted with migrations merged in the frist few days of v4.89 development # Checklist for submitter If some of the following don't apply, delete the relevant line. No changes file as this is ultimately an `unreleased-bug` - [ ] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. See [Changes files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/guides/committing-changes.md#changes-files) for more information. ## Testing - [x] QA'd all new/changed functionality manually ## Database migrations - [x] Checked schema for all modified table for columns that will auto-update timestamps during migration. - [x] Confirmed that updating the timestamps is acceptable, and will not cause unwanted side effects. - [x] Ensured the correct collation is explicitly set for character columns (`COLLATE utf8mb4_unicode_ci`). <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Added support for policy gating in setup workflows. * Added support for BYOD fleet and enrollment tracking capabilities. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
+3
-3
@@ -6,10 +6,10 @@ import (
|
||||
)
|
||||
|
||||
func init() {
|
||||
MigrationClient.AddMigration(Up_20260609081645, Down_20260609081645)
|
||||
MigrationClient.AddMigration(Up_20260622124714, Down_20260622124714)
|
||||
}
|
||||
|
||||
func Up_20260609081645(tx *sql.Tx) error {
|
||||
func Up_20260622124714(tx *sql.Tx) error {
|
||||
// policy_gated marks a Windows/Linux setup-experience software item whose installer has at least one team policy with an
|
||||
// install-software automation pointing at it. Such an item is gated: it is skipped only if every in-scope gating policy
|
||||
// passes, and installed if any fails. The set of gating policies is derived from the installer at decision time, so this is
|
||||
@@ -25,6 +25,6 @@ ALTER TABLE setup_experience_status_results
|
||||
return nil
|
||||
}
|
||||
|
||||
func Down_20260609081645(tx *sql.Tx) error {
|
||||
func Down_20260622124714(tx *sql.Tx) error {
|
||||
return nil
|
||||
}
|
||||
+3
-3
@@ -8,10 +8,10 @@ import (
|
||||
)
|
||||
|
||||
func init() {
|
||||
MigrationClient.AddMigration(Up_20260609104220, Down_20260609104220)
|
||||
MigrationClient.AddMigration(Up_20260622124734, Down_20260622124734)
|
||||
}
|
||||
|
||||
func Up_20260609104220(tx *sql.Tx) error {
|
||||
func Up_20260622124734(tx *sql.Tx) error {
|
||||
// First we modify the abm_tokens table to add the column for BYOD default team id, and a unique token for ADUE enrollments
|
||||
_, err := tx.Exec(`ALTER TABLE abm_tokens
|
||||
ADD COLUMN byod_default_team_id INT UNSIGNED NULL,
|
||||
@@ -93,6 +93,6 @@ func Up_20260609104220(tx *sql.Tx) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func Down_20260609104220(tx *sql.Tx) error {
|
||||
func Down_20260622124734(tx *sql.Tx) error {
|
||||
return nil
|
||||
}
|
||||
+1
-1
@@ -7,7 +7,7 @@ import (
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestUp_20260609104220(t *testing.T) {
|
||||
func TestUp_20260622124734(t *testing.T) {
|
||||
db := applyUpToPrev(t)
|
||||
|
||||
// Insert two abm_tokens
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user