Add --base-url option to aio app init --repo

README.md

@@ -514,7 +514,7 @@ Create a new Adobe I/O App
 USAGE
   $ aio app init [PATH] [-v] [--version] [--install] [-y] [--login] [-e <value> | -t <value> | --repo <value>]
     [--standalone-app |  | ] [-w <value> | -i <value>] [--confirm-new-workspace] [--use-jwt] [--github-pat <value> ]
-    [--linter none|basic|adobe-recommended]
+    [--repo-base-url <value> ] [--linter none|basic|adobe-recommended]
 
 ARGUMENTS
   PATH  [default: .] Path to the app directory
@@ -534,6 +534,9 @@ FLAGS
                                 <options: none|basic|adobe-recommended>
   --[no-]login                  Login using your Adobe ID for interacting with Adobe I/O Developer Console
   --repo=<value>                Init from gh quick-start repo. Expected to be of the form <owner>/<repo>/<path>
+  --repo-base-url=<value>       When using with GitHub Enterprise Server, set to the root URL of the API. For example,
+                                if your GitHub Enterprise Server's hostname is `github.acme-inc.com`, then set
+                                `base-url` to `https://github.acme-inc.com/api/v3`
   --standalone-app              Create a stand-alone application
   --use-jwt                     if the config has both jwt and OAuth Server to Server Credentials (while migrating),
                                 prefer the JWT credentials

src/commands/app/init.js

@@ -104,7 +104,7 @@ class InitCommand extends TemplatesCommand {
     }
 
     if (flags.repo) {
-      await this.withQuickstart(flags.repo, flags['github-pat'])
+      await this.withQuickstart(flags.repo, flags['github-pat'], flags['repo-base-url'])
     } else {
       // 2. prompt for templates to be installed
       const templates = await this.getTemplatesForFlags(flags)
@@ -134,7 +134,7 @@ class InitCommand extends TemplatesCommand {
 
   async initWithLogin (flags) {
     if (flags.repo) {
-      await this.withQuickstart(flags.repo, flags['github-pat'])
+      await this.withQuickstart(flags.repo, flags['github-pat'], flags['repo-base-url'])
     }
     // this will trigger a login
     const consoleCLI = await this.getLibConsoleCLI()
@@ -368,13 +368,14 @@ class InitCommand extends TemplatesCommand {
     )
   }
 
-  async withQuickstart (fullRepo, githubPat) {
+  async withQuickstart (fullRepo, githubPat, baseUrl) {
     // telemetry hook for quickstart installs
     await this.config.runHook('telemetry', { data: `installQuickstart:${fullRepo}` })
 
     const octokit = new Octokit({
       auth: githubPat ?? '',
-      userAgent: 'ADP App Builder v1'
+      userAgent: 'ADP App Builder v1',
+      ...(baseUrl && { baseUrl })
     })
     const spinner = ora('Downloading quickstart repo').start()
     /** @private */
@@ -489,6 +490,10 @@ InitCommand.flags = {
     description: 'github personal access token to use for downloading private quickstart repos',
     dependsOn: ['repo']
   }),
+  'repo-base-url': Flags.string({
+    description: 'When using with GitHub Enterprise Server, set to the root URL of the API. For example, if your GitHub Enterprise Server\'s hostname is `github.acme-inc.com`, then set `base-url` to `https://github.acme-inc.com/api/v3`',
+    dependsOn: ['repo']
+  }),
   linter: Flags.string({
     description: 'Specify the linter to use for the project',
     options: ['none', 'basic', 'adobe-recommended'],

test/commands/app/init.test.js

@@ -407,6 +407,28 @@ describe('--no-login', () => {
     expect(importHelperLib.importConfigJson).not.toHaveBeenCalled()
   })
 
+  test('--repo --github-pat', async () => {
+    Octokit.mockImplementation(() => ({ repos: { getContent: () => Promise.resolve({ data: [] }) } }))
+
+    const pat = 'mytoken'
+    command.argv = ['--repo=adobe/appbuilder-quickstarts/dne', '--github-pat', pat]
+
+    await command.run()
+
+    expect(Octokit).toHaveBeenCalledWith(expect.objectContaining({ auth: pat }))
+  })
+
+  test('--repo --repo-base-url', async () => {
+    Octokit.mockImplementation(() => ({ repos: { getContent: () => Promise.resolve({ data: [] }) } }))
+
+    const baseUrl = 'https://github.acme-inc.com/api/v3'
+    command.argv = ['--repo=org/repo', '--repo-base-url', baseUrl]
+
+    await command.run()
+
+    expect(Octokit).toHaveBeenCalledWith(expect.objectContaining({ baseUrl }))
+  })
+
   test('--yes --no-install, select excshell', async () => {
     const installOptions = {
       useDefaultValues: true,