Update azure tests

plugins/scaffolder-backend/src/scaffolder/stages/prepare/azure.test.ts

@@ -14,19 +14,12 @@
  * limitations under the License.
  */
 
-jest.doMock('fs-extra', () => ({
-  promises: {
-    mkdtemp: jest.fn(dir => `${dir}-static`),
-  },
-}));
-
+import fs from 'fs-extra';
 import { AzurePreparer } from './azure';
-import {
-  TemplateEntityV1alpha1,
-  LOCATION_ANNOTATION,
-} from '@backstage/catalog-model';
 import { getVoidLogger, Git } from '@backstage/backend-common';
 
+jest.mock('fs-extra');
+
 describe('AzurePreparer', () => {
   const mockGitClient = {
     clone: jest.fn(),
@@ -36,119 +29,69 @@ describe('AzurePreparer', () => {
 
   jest.spyOn(Git, 'fromAuth').mockReturnValue(mockGitClient as any);
 
-  let mockEntity: TemplateEntityV1alpha1;
-  beforeEach(() => {
-    jest.clearAllMocks();
-    mockEntity = {
-      apiVersion: 'backstage.io/v1alpha1',
-      kind: 'Template',
-      metadata: {
-        annotations: {
-          [LOCATION_ANNOTATION]:
-            'url:https://dev.azure.com/backstage-org/backstage-project/_git/template-repo?path=%2Ftemplate.yaml',
-        },
-        name: 'graphql-starter',
-        title: 'GraphQL Service',
-        description:
-          'A GraphQL starter template for backstage to get you up and running\nthe best pracices with GraphQL\n',
-        uid: '9cf16bad-16e0-4213-b314-c4eec773c50b',
-        etag: 'ZTkxMjUxMjUtYWY3Yi00MjU2LWFkYWMtZTZjNjU5ZjJhOWM2',
-        generation: 1,
-      },
-      spec: {
-        type: 'website',
-        templater: 'cookiecutter',
-        path: './template',
-        schema: {
-          $schema: 'http://json-schema.org/draft-07/schema#',
-          required: ['storePath', 'owner'],
-          properties: {
-            owner: {
-              type: 'string',
-              title: 'Owner',
-              description: 'Who is going to own this component',
-            },
-            storePath: {
-              type: 'string',
-              title: 'Store path',
-              description: 'GitHub store path in org/repo format',
-            },
-          },
-        },
-      },
-    };
-  });
-
   const preparer = AzurePreparer.fromConfig({
     host: 'dev.azure.com',
     token: 'fake-azure-token',
   });
 
-  // TODO(blam): Here's a test that will fail when the deprecation is complete
-  it('calls the clone command with deprecated token', async () => {
-    await preparer.prepare(mockEntity, { logger });
-
-    expect(Git.fromAuth).toHaveBeenCalledWith({
-      logger,
-      password: 'fake-azure-token',
-      username: 'notempty',
-    });
-  });
+  const prepareOptions = {
+    url:
+      'https://dev.azure.com/backstage-org/backstage-project/_git/template-repo',
+    workspacePath: '/tmp',
+    logger,
+  };
 
   it('calls the clone command with token from integrations config', async () => {
-    await preparer.prepare(mockEntity, { logger });
+    await preparer.prepare(prepareOptions);
 
     expect(Git.fromAuth).toHaveBeenCalledWith({
       logger,
       password: 'fake-azure-token',
       username: 'notempty',
     });
+    expect(fs.move).toHaveBeenCalledWith('/tmp/checkout', '/tmp/template');
+    expect(fs.rmdir).toHaveBeenCalledWith('/tmp/template/.git');
   });
 
   it('calls the clone command with the correct arguments for a repository', async () => {
-    await preparer.prepare(mockEntity, { logger: getVoidLogger() });
+    await preparer.prepare(prepareOptions);
 
     expect(mockGitClient.clone).toHaveBeenCalledWith({
       url:
         'https://dev.azure.com/backstage-org/backstage-project/_git/template-repo',
-      dir: expect.any(String),
+      dir: '/tmp/checkout',
     });
   });
 
   it('calls the clone command with the correct arguments for a repository when no path is provided', async () => {
-    delete mockEntity.spec.path;
-
-    await preparer.prepare(mockEntity, { logger: getVoidLogger() });
+    await preparer.prepare({
+      url:
+        'https://dev.azure.com/backstage-org/backstage-project/_git/template-repo',
+      workspacePath: '/tmp',
+      logger,
+    });
 
     expect(mockGitClient.clone).toHaveBeenCalledWith({
       url:
         'https://dev.azure.com/backstage-org/backstage-project/_git/template-repo',
-      dir: expect.any(String),
+      dir: '/tmp/checkout',
     });
+    expect(fs.move).toHaveBeenCalledWith('/tmp/checkout', '/tmp/template');
   });
 
-  it('return the temp directory with the path to the folder if it is specified', async () => {
-    mockEntity.spec.path = './template/test/1/2/3';
-
-    const response = await preparer.prepare(mockEntity, {
-      logger: getVoidLogger(),
+  it('moves the template from path if it is specified', async () => {
+    const path = './template/test/1/2/3';
+    await preparer.prepare({
+      url: `https://dev.azure.com/backstage-org/backstage-project/_git/template-repo?path=${encodeURIComponent(
+        path,
+      )}`,
+      logger,
+      workspacePath: '/tmp',
     });
 
-    expect(response.split('\\').join('/')).toMatch(
-      /\/template\/test\/1\/2\/3$/,
-    );
-  });
-
-  it('return the working directory with the path to the folder if it is specified', async () => {
-    mockEntity.spec.path = './template/test/1/2/3';
-
-    const response = await preparer.prepare(mockEntity, {
-      workingDirectory: '/workDir',
-      logger: getVoidLogger(),
-    });
-
-    expect(response.split('\\').join('/')).toMatch(
-      /\/workDir\/graphql-starter-static\/template\/test\/1\/2\/3$/,
+    expect(fs.move).toHaveBeenCalledWith(
+      '/tmp/checkout/template/test/1/2/3',
+      '/tmp/template',
     );
   });
 });

plugins/scaffolder-backend/src/scaffolder/stages/prepare/azure.ts

@@ -33,7 +33,7 @@ export class AzurePreparer implements PreparerBase {
     const targetPath = path.join(workspacePath, 'template');
     const fullPathToTemplate = path.resolve(
       checkoutPath,
-      parsedGitUrl.filepath,
+      parsedGitUrl.filepath ?? '',
     );
 
     // Username can be anything but the empty string according to: