From f5129bfa1a351fa38f0c770c29f886292d4eda35 Mon Sep 17 00:00:00 2001 From: Martin Angers Date: Mon, 8 Apr 2024 11:34:31 -0400 Subject: [PATCH] Fix the fix for tests --- cmd/fleetctl/apply_test.go | 6 +++--- cmd/fleetctl/get_test.go | 2 +- cmd/fleetctl/gitops_test.go | 4 ++-- ee/server/service/mdm_external_test.go | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/fleetctl/apply_test.go b/cmd/fleetctl/apply_test.go index 1210e5767b..a1e506fdb1 100644 --- a/cmd/fleetctl/apply_test.go +++ b/cmd/fleetctl/apply_test.go @@ -182,7 +182,7 @@ func TestApplyTeamSpecs(t *testing.T) { return map[string]uint{fleet.BuiltinMacOS14PlusLabelName: 1}, nil } - ds.NewMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) { + ds.SetOrUpdateMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) { declaration.DeclarationUUID = uuid.NewString() return declaration, nil } @@ -589,7 +589,7 @@ func TestApplyAppConfig(t *testing.T) { return map[string]uint{fleet.BuiltinMacOS14PlusLabelName: 1}, nil } - ds.NewMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) { + ds.SetOrUpdateMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) { declaration.DeclarationUUID = uuid.NewString() return declaration, nil } @@ -1173,7 +1173,7 @@ func TestApplyAsGitOps(t *testing.T) { require.ElementsMatch(t, labels, []string{fleet.BuiltinMacOS14PlusLabelName}) return map[string]uint{fleet.BuiltinMacOS14PlusLabelName: 1}, nil } - ds.NewMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) { + ds.SetOrUpdateMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) { declaration.DeclarationUUID = uuid.NewString() return declaration, nil } diff --git a/cmd/fleetctl/get_test.go b/cmd/fleetctl/get_test.go index b16662ceff..faf1831ecd 100644 --- a/cmd/fleetctl/get_test.go +++ b/cmd/fleetctl/get_test.go @@ -2224,7 +2224,7 @@ func TestGetTeamsYAMLAndApply(t *testing.T) { require.ElementsMatch(t, labels, []string{fleet.BuiltinMacOS14PlusLabelName}) return map[string]uint{fleet.BuiltinMacOS14PlusLabelName: 1}, nil } - ds.NewMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) { + ds.SetOrUpdateMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) { declaration.DeclarationUUID = uuid.NewString() return declaration, nil } diff --git a/cmd/fleetctl/gitops_test.go b/cmd/fleetctl/gitops_test.go index 0f9c8b75c7..5612bad113 100644 --- a/cmd/fleetctl/gitops_test.go +++ b/cmd/fleetctl/gitops_test.go @@ -179,7 +179,7 @@ func TestBasicTeamGitOps(t *testing.T) { require.ElementsMatch(t, labels, []string{fleet.BuiltinMacOS14PlusLabelName}) return map[string]uint{fleet.BuiltinMacOS14PlusLabelName: 1}, nil } - ds.NewMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) { + ds.SetOrUpdateMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) { declaration.DeclarationUUID = uuid.NewString() return declaration, nil } @@ -437,7 +437,7 @@ func TestFullTeamGitOps(t *testing.T) { require.ElementsMatch(t, labels, []string{fleet.BuiltinMacOS14PlusLabelName}) return map[string]uint{fleet.BuiltinMacOS14PlusLabelName: 1}, nil } - ds.NewMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) { + ds.SetOrUpdateMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) { declaration.DeclarationUUID = uuid.NewString() return declaration, nil } diff --git a/ee/server/service/mdm_external_test.go b/ee/server/service/mdm_external_test.go index 8f7fe8a072..16e932ade0 100644 --- a/ee/server/service/mdm_external_test.go +++ b/ee/server/service/mdm_external_test.go @@ -135,7 +135,7 @@ func TestGetOrCreatePreassignTeam(t *testing.T) { ds.GetMDMAppleSetupAssistantFuncInvoked = false ds.SetOrUpdateMDMAppleSetupAssistantFuncInvoked = false ds.LabelIDsByNameFuncInvoked = false - ds.NewMDMAppleDeclarationFuncInvoked = false + ds.SetOrUpdateMDMAppleDeclarationFuncInvoked = false ds.BulkSetPendingMDMHostProfilesFuncInvoked = false } setupDS := func(t *testing.T) { @@ -192,7 +192,7 @@ func TestGetOrCreatePreassignTeam(t *testing.T) { require.ElementsMatch(t, names, []string{fleet.BuiltinMacOS14PlusLabelName}) return map[string]uint{names[0]: 1}, nil } - ds.NewMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) { + ds.SetOrUpdateMDMAppleDeclarationFunc = func(ctx context.Context, declaration *fleet.MDMAppleDeclaration) (*fleet.MDMAppleDeclaration, error) { declaration.DeclarationUUID = uuid.NewString() return declaration, nil }