From ea59a2b363b32fe42d1d096608ceea90dc827c0e Mon Sep 17 00:00:00 2001
From: Alan Crosswell <alan@columbia.edu>
Date: Sat, 23 Jan 2021 17:42:26 -0500
Subject: [PATCH] Azure branch support

---
 .../src/scaffolder/stages/prepare/azure.test.ts               | 4 +++-
 .../scaffolder-backend/src/scaffolder/stages/prepare/azure.ts | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/prepare/azure.test.ts b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/azure.test.ts
index 8dd72c35e9..89ca8e2f8f 100644
--- a/plugins/scaffolder-backend/src/scaffolder/stages/prepare/azure.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/azure.test.ts
@@ -45,7 +45,7 @@ describe('AzurePreparer', () => {
       metadata: {
         annotations: {
           [LOCATION_ANNOTATION]:
-            'url:https://dev.azure.com/backstage-org/backstage-project/_git/template-repo?path=%2Ftemplate.yaml',
+            'url:https://dev.azure.com/backstage-org/backstage-project/_git/template-repo?path=%2Ftemplate.yaml&version=GBmaster',
         },
         name: 'graphql-starter',
         title: 'GraphQL Service',
@@ -112,6 +112,7 @@ describe('AzurePreparer', () => {
       url:
         'https://dev.azure.com/backstage-org/backstage-project/_git/template-repo',
       dir: expect.any(String),
+      ref: 'master',
     });
   });
 
@@ -124,6 +125,7 @@ describe('AzurePreparer', () => {
       url:
         'https://dev.azure.com/backstage-org/backstage-project/_git/template-repo',
       dir: expect.any(String),
+      ref: 'master',
     });
   });
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/prepare/azure.ts b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/azure.ts
index 8b204fa799..67f089965d 100644
--- a/plugins/scaffolder-backend/src/scaffolder/stages/prepare/azure.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/stages/prepare/azure.ts
@@ -42,6 +42,7 @@ export class AzurePreparer implements PreparerBase {
 
     const parsedGitLocation = parseGitUrl(location);
     const repositoryCheckoutUrl = parsedGitLocation.toString('https');
+    const ref = parsedGitLocation.ref;
     const tempDir = await fs.promises.mkdtemp(
       path.join(workingDirectory, templateId),
     );
@@ -63,6 +64,7 @@ export class AzurePreparer implements PreparerBase {
 
     await git.clone({
       url: repositoryCheckoutUrl,
+      ref: ref,
       dir: tempDir,
     });