Merge branch 'refactor/actor-resolution' into feat/delete-actor

Author: DaveHanns

src/tools/actors/actor_helpers.ts

@@ -56,12 +56,20 @@ export type TargetActor = {
     actor: Actor | undefined;
 };
 
+/** Throws `UserInputError` when the Actor the API returned lives in another account than the caller's. */
+function validateActorOwner(actor: Actor, username: string, bareName: string): void {
+    if (actor.username.toLowerCase() === username.toLowerCase()) return;
+    throw new UserInputError(
+        `This tool works only with Actors of your own account (${username}); Actor ${bareName} belongs to ${actor.username}.`,
+    );
+}
+
 /**
  * Looks up the caller's username and the Actor. A `username/` or `username~` prefix must name the caller's
  * own account. A bare value that no Actor is named after and that has the shape of an Actor ID, the value
  * the build and run tools hand out, is looked up once as an ID and must be the caller's Actor. `actor` is
- * undefined when nothing matches: `push-actor` then creates an Actor of that name, the other tools that
- * write an Actor report it as not found; an ID never creates one.
+ * undefined when nothing matches: `push-actor` then creates an Actor of that name, the other tools report
+ * it as not found; an ID never creates one.
  */
 export async function resolveTargetActor(
     client: ApifyClient,
@@ -75,14 +83,12 @@ export async function resolveTargetActor(
     }
     const actorClient = client.actor(formatActorFullName(username, bareName));
     const actor = await actorClient.get();
+    // The platform resolves the old `username~name` of an Actor moved to another account to that Actor.
+    if (actor) validateActorOwner(actor, username, bareName);
     const canBeId = actor === undefined && ownerPrefix === undefined && ACTOR_ID_SHAPE_REGEX.test(bareName);
     if (!canBeId) return { actorClient, username, bareName, actor };
     const actorById = await client.actor(bareName).get();
     if (!actorById) return { actorClient, username, bareName, actor: undefined };
-    if (actorById.username.toLowerCase() !== username.toLowerCase()) {
-        throw new UserInputError(
-            `This tool works only with Actors of your own account (${username}); Actor ${bareName} belongs to ${actorById.username}.`,
-        );
-    }
+    validateActorOwner(actorById, username, bareName);
     return { actorClient: client.actor(actorById.id), username, bareName: actorById.name, actor: actorById };
 }

tests/unit/tools.push_actor.test.ts

@@ -420,6 +420,18 @@ describe('push-actor', () => {
             expect(actorGetMock).not.toHaveBeenCalled();
             expectNoWrite();
         });
+
+        it('refuses a name the platform resolves to an Actor moved to another account before any write', async () => {
+            actorGetMock.mockResolvedValue({ ...mockActor(), username: 'jane' });
+
+            const { text } = await callToolExpectingUserError({ actor: 'my-actor', files: [MAIN_JS] });
+
+            expect(text).toBe(
+                'This tool works only with Actors of your own account (john); Actor my-actor belongs to jane.',
+            );
+            expect(actorMock).toHaveBeenCalledTimes(1);
+            expectNoWrite();
+        });
     });
 
     describe('source archive', () => {
@@ -1161,6 +1173,7 @@ describe('push-actor', () => {
 
             it('accepts a username prefix with a dot in the tilde form', async () => {
                 userGetMock.mockResolvedValue({ username: 'john.doe', id: 'user-secret' });
+                actorGetMock.mockResolvedValue({ ...mockActor(), username: 'john.doe' });
 
                 const { structuredContent } = await callTool({
                     actor: 'john.doe~my-actor',