code review fixes

fleetdm · Oct 9, 2023 · e344e54 · e344e54
1 parent 50115e0
commit e344e54
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/ee/server/service/scripts.go b/ee/server/service/scripts.go
@@ -415,7 +415,6 @@ func (svc *Service) BatchSetScripts(ctx context.Context, maybeTmID *uint, maybeT
 		}
 
 		if byName[script.Name] {
-			// TODO: check error message
 			return ctxerr.Wrap(ctx,
 				fleet.NewInvalidArgumentError(fmt.Sprintf("scripts[%d]", i), fmt.Sprintf("Couldn’t edit scripts. More than one script has the same file name: %q", script.Name)),
 				"duplicate script by name")

diff --git a/server/datastore/mysql/scripts.go b/server/datastore/mysql/scripts.go
@@ -368,7 +368,7 @@ ON DUPLICATE KEY UPDATE
 	// existing ones if there's a match and no change
 	incomingNames := make([]string, len(scripts))
 	// at the same time, index the incoming scripts keyed by name for ease
-	// or processing
+	// of processing
 	incomingScripts := make(map[string]*fleet.Script, len(scripts))
 	for i, p := range scripts {
 		incomingNames[i] = p.Name

diff --git a/server/datastore/mysql/scripts_test.go b/server/datastore/mysql/scripts_test.go
@@ -534,14 +534,14 @@ func testBatchSetScripts(t *testing.T, ds *Datastore) {
 
 		// compare only the fields we care about
 		m := make(map[string]uint)
-		for _, gotp := range got {
-			m[gotp.Name] = gotp.ID
-			if gotp.TeamID != nil && *gotp.TeamID == 0 {
-				gotp.TeamID = nil
+		for _, gotScript := range got {
+			m[gotScript.Name] = gotScript.ID
+			if gotScript.TeamID != nil && *gotScript.TeamID == 0 {
+				gotScript.TeamID = nil
 			}
-			gotp.ID = 0
-			gotp.CreatedAt = time.Time{}
-			gotp.UpdatedAt = time.Time{}
+			gotScript.ID = 0
+			gotScript.CreatedAt = time.Time{}
+			gotScript.UpdatedAt = time.Time{}
 		}
 		// order is not guaranteed
 		require.ElementsMatch(t, want, got)

diff --git a/server/service/integration_enterprise_test.go b/server/service/integration_enterprise_test.go
@@ -4922,7 +4922,7 @@ func (s *integrationEnterpriseTestSuite) TestBatchApplyScriptsEndpoints() {
 			teamActivity = fmt.Sprintf(`{"team_id": %d, "team_name": %q}`, team.ID, team.Name)
 		}
 
-		// create an check activities
+		// create and check activities
 		s.Do("POST", "/api/v1/fleet/scripts/batch", batchSetScriptsRequest{Scripts: scripts}, http.StatusNoContent, "team_id", teamIDStr)
 		s.lastActivityMatches(
 			fleet.ActivityTypeEditedScript{}.ActivityName(),