Cherry pick PR #23857 into RC v4.60.0 (#23867)

Cherry pick PR #23857 into RC v4.60.0.
fleetdm · Nov 15, 2024 · db35c39 · db35c39
1 parent b805d95
commit db35c39
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/...ables/20241025141856_AddYaraRulesTable.go → ...ables/20241110152840_AddYaraRulesTable.go b/...ables/20241025141856_AddYaraRulesTable.go → ...ables/20241110152840_AddYaraRulesTable.go
@@ -6,10 +6,10 @@ import (
 )
 
 func init() {
-	MigrationClient.AddMigration(Up_20241016155452, Down_20241016155452)
+	MigrationClient.AddMigration(Up_20241110152840, Down_20241110152840)
 }
 
-func Up_20241016155452(tx *sql.Tx) error {
+func Up_20241110152840(tx *sql.Tx) error {
 	_, err := tx.Exec(`
 CREATE TABLE yara_rules (
 	id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -24,6 +24,6 @@ CREATE TABLE yara_rules (
 	return nil
 }
 
-func Down_20241016155452(tx *sql.Tx) error {
+func Down_20241110152840(tx *sql.Tx) error {
 	return nil
 }
diff --git a/...0102721_AddAllLabelsToMDMProfileLabels.go → ...0152841_AddAllLabelsToMDMProfileLabels.go b/...0102721_AddAllLabelsToMDMProfileLabels.go → ...0152841_AddAllLabelsToMDMProfileLabels.go
@@ -6,10 +6,10 @@ import (
 )
 
 func init() {
-	MigrationClient.AddMigration(Up_20241030102721, Down_20241030102721)
+	MigrationClient.AddMigration(Up_20241110152841, Down_20241110152841)
 }
 
-func Up_20241030102721(tx *sql.Tx) error {
+func Up_20241110152841(tx *sql.Tx) error {
 	// Add columns
 	_, err := tx.Exec(`ALTER TABLE mdm_configuration_profile_labels ADD COLUMN require_all BOOL NOT NULL DEFAULT false`)
 	if err != nil {
@@ -36,6 +36,6 @@ func Up_20241030102721(tx *sql.Tx) error {
 	return nil
 }
 
-func Down_20241030102721(tx *sql.Tx) error {
+func Down_20241110152841(tx *sql.Tx) error {
 	return nil
 }
diff --git a/...21_AddAllLabelsToMDMProfileLabels_test.go → ...41_AddAllLabelsToMDMProfileLabels_test.go b/...21_AddAllLabelsToMDMProfileLabels_test.go → ...41_AddAllLabelsToMDMProfileLabels_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestUp_20241030102721(t *testing.T) {
+func TestUp_20241110152841(t *testing.T) {
 	db := applyUpToPrev(t)
 
 	// insert 2 profiles and 2 declarations