Fix merge issues.

fleetdm · May 23, 2024 · 10dfd37 · 10dfd37
1 parent b91f345
commit 10dfd37
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 14 deletions.
diff --git a/ee/server/service/software_installers.go b/ee/server/service/software_installers.go
@@ -67,12 +67,13 @@ func (svc *Service) UploadSoftwareInstaller(ctx context.Context, payload *fleet.
 	}
 
 	// Create activity
-	if err := svc.ds.NewActivity(ctx, vc.User, fleet.ActivityTypeAddedSoftware{
-		SoftwareTitle:   payload.Title,
-		SoftwarePackage: payload.Filename,
-		TeamName:        teamName,
-		TeamID:          payload.TeamID,
-	}); err != nil {
+	if err := svc.NewActivity(
+		ctx, vc.User, fleet.ActivityTypeAddedSoftware{
+			SoftwareTitle:   payload.Title,
+			SoftwarePackage: payload.Filename,
+			TeamName:        teamName,
+			TeamID:          payload.TeamID,
+		}); err != nil {
 		return ctxerr.Wrap(ctx, err, "creating activity for added software")
 	}
 
@@ -111,12 +112,13 @@ func (svc *Service) DeleteSoftwareInstaller(ctx context.Context, titleID uint, t
 		teamName = &t.Name
 	}
 
-	if err := svc.ds.NewActivity(ctx, vc.User, fleet.ActivityTypeDeletedSoftware{
-		SoftwareTitle:   meta.SoftwareTitle,
-		SoftwarePackage: meta.Name,
-		TeamName:        teamName,
-		TeamID:          meta.TeamID,
-	}); err != nil {
+	if err := svc.NewActivity(
+		ctx, vc.User, fleet.ActivityTypeDeletedSoftware{
+			SoftwareTitle:   meta.SoftwareTitle,
+			SoftwarePackage: meta.Name,
+			TeamName:        teamName,
+			TeamID:          meta.TeamID,
+		}); err != nil {
 		return ctxerr.Wrap(ctx, err, "creating activity for deleted software")
 	}
 

diff --git a/server/service/orbit.go b/server/service/orbit.go
@@ -917,7 +917,7 @@ func (svc *Service) SaveHostSoftwareInstallResult(ctx context.Context, result *f
 			}
 		}
 
-		if err := svc.ds.NewActivity(
+		if err := svc.NewActivity(
 			ctx,
 			user,
 			fleet.ActivityTypeInstalledSoftware{

diff --git a/server/service/software_installers_test.go b/server/service/software_installers_test.go
@@ -68,7 +68,12 @@ func TestSoftwareInstallersAuth(t *testing.T) {
 				return nil
 			}
 
-			ds.NewActivityFunc = func(ctx context.Context, user *fleet.User, activity fleet.ActivityDetails) error {
+			ds.AppConfigFunc = func(ctx context.Context) (*fleet.AppConfig, error) {
+				return &fleet.AppConfig{}, nil
+			}
+			ds.NewActivityFunc = func(
+				ctx context.Context, user *fleet.User, activity fleet.ActivityDetails, details []byte, createdAt time.Time,
+			) error {
 				return nil
 			}