Release: Create cherrypick task work for enterprise repo (#19424)

packages/grafana-toolkit/src/cli/index.ts

@@ -68,9 +68,10 @@ export const run = (includeInternalScripts = false) => {
 
 
     program
     program
       .command('cherrypick')
       .command('cherrypick')
+      .option('-e, --enterprise', 'Run task for grafana-enterprise')
       .description('Helps find commits to cherry pick')
       .description('Helps find commits to cherry pick')
       .action(async cmd => {
       .action(async cmd => {
-        await execTask(cherryPickTask)({});
+        await execTask(cherryPickTask)({ enterprise: !!cmd.enterprise });
       });
       });
 
 
     program
     program

packages/grafana-toolkit/src/cli/tasks/cherrypick.ts

 import { Task, TaskRunner } from './task';
 import { Task, TaskRunner } from './task';
 import GithubClient from '../utils/githubClient';
 import GithubClient from '../utils/githubClient';
 
 
-interface CherryPickOptions {}
+interface CherryPickOptions {
+  enterprise: boolean;
+}
 
 
-const cherryPickRunner: TaskRunner<CherryPickOptions> = async () => {
-  const githubClient = new GithubClient();
+const cherryPickRunner: TaskRunner<CherryPickOptions> = async ({ enterprise }) => {
+  const githubClient = new GithubClient({ enterprise });
   const client = githubClient.client;
   const client = githubClient.client;
 
 
   const res = await client.get('/issues', {
   const res = await client.get('/issues', {

packages/grafana-toolkit/src/cli/tasks/closeMilestone.ts

@@ -6,7 +6,7 @@ interface CloseMilestoneOptions {
 }
 }
 
 
 const closeMilestoneTaskRunner: TaskRunner<CloseMilestoneOptions> = async ({ milestone }) => {
 const closeMilestoneTaskRunner: TaskRunner<CloseMilestoneOptions> = async ({ milestone }) => {
-  const githubClient = new GithubClient(true);
+  const githubClient = new GithubClient({ required: true });
 
 
   const cherryPickLabel = 'cherry-pick needed';
   const cherryPickLabel = 'cherry-pick needed';
   const client = githubClient.client;
   const client = githubClient.client;

packages/grafana-toolkit/src/cli/utils/githubClient.test.ts

@@ -15,11 +15,13 @@ afterEach(() => {
 describe('GithubClient', () => {
 describe('GithubClient', () => {
   it('should initialise a GithubClient', () => {
   it('should initialise a GithubClient', () => {
     const github = new GithubClient();
     const github = new GithubClient();
+    const githubEnterprise = new GithubClient({ enterprise: true });
     expect(github).toBeInstanceOf(GithubClient);
     expect(github).toBeInstanceOf(GithubClient);
+    expect(githubEnterprise).toBeInstanceOf(GithubClient);
   });
   });
 
 
   describe('#client', () => {
   describe('#client', () => {
-    it('it should contain a client', () => {
+    it('it should contain a grafana client', () => {
       // @ts-ignore
       // @ts-ignore
       const spy = jest.spyOn(GithubClient.prototype, 'createClient').mockImplementation(() => fakeClient);
       const spy = jest.spyOn(GithubClient.prototype, 'createClient').mockImplementation(() => fakeClient);
 
 
@@ -33,6 +35,20 @@ describe('GithubClient', () => {
       expect(client).toEqual(fakeClient);
       expect(client).toEqual(fakeClient);
     });
     });
 
 
+    it('it should contain a grafana enterprise client', () => {
+      // @ts-ignore
+      const spy = jest.spyOn(GithubClient.prototype, 'createClient').mockImplementation(() => fakeClient);
+
+      const github = new GithubClient({ enterprise: true });
+      const client = github.client;
+
+      expect(spy).toHaveBeenCalledWith({
+        baseURL: 'https://api.github.com/repos/grafana/grafana-enterprise',
+        timeout: 10000,
+      });
+      expect(client).toEqual(fakeClient);
+    });
+
     describe('when the credentials are required', () => {
     describe('when the credentials are required', () => {
       it('should create the client when the credentials are defined', () => {
       it('should create the client when the credentials are defined', () => {
         const username = 'grafana';
         const username = 'grafana';
@@ -44,7 +60,7 @@ describe('GithubClient', () => {
         // @ts-ignore
         // @ts-ignore
         const spy = jest.spyOn(GithubClient.prototype, 'createClient').mockImplementation(() => fakeClient);
         const spy = jest.spyOn(GithubClient.prototype, 'createClient').mockImplementation(() => fakeClient);
 
 
-        const github = new GithubClient(true);
+        const github = new GithubClient({ required: true });
         const client = github.client;
         const client = github.client;
 
 
         expect(spy).toHaveBeenCalledWith({
         expect(spy).toHaveBeenCalledWith({
@@ -56,11 +72,33 @@ describe('GithubClient', () => {
         expect(client).toEqual(fakeClient);
         expect(client).toEqual(fakeClient);
       });
       });
 
 
+      it('should create the enterprise client when the credentials are defined', () => {
+        const username = 'grafana';
+        const token = 'averysecureaccesstoken';
+
+        process.env.GITHUB_USERNAME = username;
+        process.env.GITHUB_ACCESS_TOKEN = token;
+
+        // @ts-ignore
+        const spy = jest.spyOn(GithubClient.prototype, 'createClient').mockImplementation(() => fakeClient);
+
+        const github = new GithubClient({ required: true, enterprise: true });
+        const client = github.client;
+
+        expect(spy).toHaveBeenCalledWith({
+          baseURL: 'https://api.github.com/repos/grafana/grafana-enterprise',
+          timeout: 10000,
+          auth: { username, password: token },
+        });
+
+        expect(client).toEqual(fakeClient);
+      });
+
       describe('when the credentials are not defined', () => {
       describe('when the credentials are not defined', () => {
         it('should throw an error', () => {
         it('should throw an error', () => {
           expect(() => {
           expect(() => {
             // tslint:disable-next-line
             // tslint:disable-next-line
-            new GithubClient(true);
+            new GithubClient({ required: true });
           }).toThrow(/operation needs a GITHUB_USERNAME and GITHUB_ACCESS_TOKEN environment variables/);
           }).toThrow(/operation needs a GITHUB_USERNAME and GITHUB_ACCESS_TOKEN environment variables/);
         });
         });
       });
       });

packages/grafana-toolkit/src/cli/utils/githubClient.ts

 import axios, { AxiosInstance, AxiosRequestConfig } from 'axios';
 import axios, { AxiosInstance, AxiosRequestConfig } from 'axios';
 
 
-const baseURL = 'https://api.github.com/repos/grafana/grafana';
+const grafanaURL = 'https://api.github.com/repos/grafana/grafana';
+const enterpriseURL = 'https://api.github.com/repos/grafana/grafana-enterprise';
 
 
 // Encapsulates the creation of a client for the Github API
 // Encapsulates the creation of a client for the Github API
 //
 //
@@ -10,15 +11,20 @@ const baseURL = 'https://api.github.com/repos/grafana/grafana';
 // they're not required - the library will use them. This allows us to overcome
 // they're not required - the library will use them. This allows us to overcome
 // any API rate limiting imposed without authentication.
 // any API rate limiting imposed without authentication.
 
 
+interface GithubClientProps {
+  required?: boolean;
+  enterprise?: boolean;
+}
+
 class GithubClient {
 class GithubClient {
   client: AxiosInstance;
   client: AxiosInstance;
 
 
-  constructor(required = false) {
+  constructor({ required = false, enterprise = false }: GithubClientProps = {}) {
     const username = process.env.GITHUB_USERNAME;
     const username = process.env.GITHUB_USERNAME;
     const token = process.env.GITHUB_ACCESS_TOKEN;
     const token = process.env.GITHUB_ACCESS_TOKEN;
 
 
     const clientConfig: AxiosRequestConfig = {
     const clientConfig: AxiosRequestConfig = {
-      baseURL: baseURL,
+      baseURL: enterprise ? enterpriseURL : grafanaURL,
       timeout: 10000,
       timeout: 10000,
     };
     };