Update ST V3 to machine identity

backend/src/routes/v2/organizations.ts

@@ -55,11 +55,11 @@ router.delete(
 );
 
 router.get(
-  "/:organizationId/service-memberships",
+  "/:organizationId/machine-memberships",
   requireAuth({
     acceptedAuthModes: [AuthMode.JWT]
   }),
-  organizationsController.getOrganizationServiceMemberships
+  organizationsController.getOrganizationMachineMemberships
 );
 
 export default router;

backend/src/routes/v2/serviceTokenData.ts

@@ -6,7 +6,7 @@ import {
 import { AuthMode } from "../../variables";
 import { serviceTokenDataController } from "../../controllers/v2";
 
-router.get( // TODO: deprecate (moving to ST V3)
+router.get( // TODO: deprecate (moving to machine identity)
   "/",
   requireAuth({
     acceptedAuthModes: [AuthMode.SERVICE_TOKEN]
@@ -14,7 +14,7 @@ router.get( // TODO: deprecate (moving to ST V3)
   serviceTokenDataController.getServiceTokenData
 );
 
-router.post( // TODO: deprecate (moving to ST V3)
+router.post( // TODO: deprecate (moving to machine identity)
   "/",
   requireAuth({
     acceptedAuthModes: [AuthMode.JWT]
@@ -22,7 +22,7 @@ router.post( // TODO: deprecate (moving to ST V3)
   serviceTokenDataController.createServiceTokenData
 );
 
-router.delete( // TODO: deprecate (moving to ST V3)
+router.delete( // TODO: deprecate (moving to machine identity)
   "/:serviceTokenDataId",
   requireAuth({
     acceptedAuthModes: [AuthMode.JWT]

backend/src/routes/v2/workspace.ts

@@ -93,29 +93,28 @@ router.patch(
   workspaceController.toggleAutoCapitalization
 );
 
-// TODO: consider endpoint restructuring
 router.post(
-  "/:workspaceId/service-memberships",
+  "/:workspaceId/machine-memberships/:machineId",
   requireAuth({
     acceptedAuthModes: [AuthMode.JWT, AuthMode.API_KEY]
   }),
-  workspaceController.addWorkspaceServiceMembership
+  workspaceController.addMachineToWorkspace
 );
 
 router.delete(
-  "/:workspaceId/service-memberships/:serviceId",
+  "/:workspaceId/machine-memberships/:machineId",
   requireAuth({
     acceptedAuthModes: [AuthMode.JWT, AuthMode.API_KEY]
   }),
-  workspaceController.deleteWorkspaceServiceMembership
+  workspaceController.deleteMachineFromWorkspace
 );
 
 router.get(
-  "/:workspaceId/service-memberships",
+  "/:workspaceId/machine-memberships",
   requireAuth({
     acceptedAuthModes: [AuthMode.JWT]
   }),
-  workspaceController.getWorkspaceServiceMemberships
+  workspaceController.getWorkspaceMachineMemberships
 );
 
 export default router;