refactor: rename gh-auth module

Author: npalm

lambdas/functions/control-plane/src/gh-auth/gh-auth.test.ts renamed to lambdas/functions/control-plane/src/github/auth.test.ts

@@ -7,7 +7,7 @@ import { mocked } from 'jest-mock';
 import { MockProxy, mock } from 'jest-mock-extended';
 import nock from 'nock';
 
-import { createGithubAppAuth, createOctokitClient } from './gh-auth';
+import { createGithubAppAuth, createOctokitClient } from './auth';
 
 jest.mock('@terraform-aws-github-runner/aws-ssm-util');
 jest.mock('@octokit/auth-app');

lambdas/functions/control-plane/src/gh-auth/gh-auth.ts renamed to lambdas/functions/control-plane/src/github/auth.ts

@@ -1,6 +1,6 @@
 import { Octokit } from '@octokit/rest';
 import { ActionRequestMessage } from '../scale-runners/scale-up';
-import { getOctokit } from './gh-octokit';
+import { getOctokit } from './octokit';
 
 const mockOctokit = {
   apps: {
@@ -9,7 +9,7 @@ const mockOctokit = {
   },
 };
 
-jest.mock('../gh-auth/gh-auth', () => ({
+jest.mock('../github/auth', () => ({
   createGithubInstallationAuth: jest.fn().mockImplementation(async (installationId) => {
     return { token: 'token', type: 'installation', installationId: installationId };
   }),
@@ -21,7 +21,7 @@ jest.mock('@octokit/rest', () => ({
   Octokit: jest.fn().mockImplementation(() => mockOctokit),
 }));
 
-jest.mock('../gh-auth/gh-auth');
+jest.mock('../github/auth');
 
 describe('Test getOctokit', () => {
   const data = [

lambdas/functions/control-plane/src/gh-auth/gh-octokit.test.ts renamed to lambdas/functions/control-plane/src/github/octokit.test.ts

@@ -1,6 +1,6 @@
 import { Octokit } from '@octokit/rest';
 import { ActionRequestMessage } from '../scale-runners/scale-up';
-import { createGithubAppAuth, createGithubInstallationAuth, createOctokitClient } from './gh-auth';
+import { createGithubAppAuth, createGithubInstallationAuth, createOctokitClient } from './auth';
 
 export async function getInstallationId(
   ghesApiUrl: string,

lambdas/functions/control-plane/src/gh-auth/gh-octokit.ts renamed to lambdas/functions/control-plane/src/github/octokit.ts

@@ -4,7 +4,7 @@ import moment from 'moment-timezone';
 import nock from 'nock';
 
 import { listEC2Runners } from '../aws/runners';
-import * as ghAuth from '../gh-auth/gh-auth';
+import * as ghAuth from '../github/auth';
 import { createRunners } from '../scale-runners/scale-up';
 import { adjust } from './pool';
 
@@ -27,7 +27,7 @@ jest.mock('./../aws/runners', () => ({
   ...jest.requireActual('./../aws/runners'),
   listEC2Runners: jest.fn(),
 }));
-jest.mock('./../gh-auth/gh-auth');
+jest.mock('./../github/auth');
 jest.mock('./../scale-runners/scale-up');
 
 const mocktokit = Octokit as jest.MockedClass<typeof Octokit>;

lambdas/functions/control-plane/src/gh-auth/rate-limit.test.ts renamed to lambdas/functions/control-plane/src/github/rate-limit.test.ts

@@ -4,7 +4,7 @@ import yn from 'yn';
 
 import { bootTimeExceeded, listEC2Runners } from '../aws/runners';
 import { RunnerList } from '../aws/runners.d';
-import { createGithubAppAuth, createGithubInstallationAuth, createOctokitClient } from '../gh-auth/gh-auth';
+import { createGithubAppAuth, createGithubInstallationAuth, createOctokitClient } from '../github/auth';
 import { createRunners } from '../scale-runners/scale-up';
 
 const logger = createChildLogger('pool');

lambdas/functions/control-plane/src/gh-auth/rate-limit.ts renamed to lambdas/functions/control-plane/src/github/rate-limit.ts

@@ -1,7 +1,7 @@
 import { publishMessage } from '../aws/sqs';
 import { publishRetryMessage, checkAndRetryJob } from './job-retry';
 import { ActionRequestMessage, ActionRequestMessageRetry } from './scale-up';
-import { getOctokit } from '../gh-auth/gh-octokit';
+import { getOctokit } from '../github/octokit';
 import { Octokit } from '@octokit/rest';
 import { mocked } from 'jest-mock';
 import { createSingleMetric } from '@terraform-aws-github-runner/aws-powertools-util';
@@ -34,7 +34,7 @@ const mockOctokit = {
 jest.mock('@octokit/rest', () => ({
   Octokit: jest.fn().mockImplementation(() => mockOctokit),
 }));
-jest.mock('../gh-auth/gh-octokit');
+jest.mock('../github/octokit');
 
 const mockCreateOctokitClient = mocked(getOctokit, { shallow: false });
 mockCreateOctokitClient.mockResolvedValue(new (Octokit as jest.MockedClass<typeof Octokit>)());

lambdas/functions/control-plane/src/pool/pool.test.ts

@@ -5,7 +5,7 @@ import {
 } from '@terraform-aws-github-runner/aws-powertools-util';
 import { publishMessage } from '../aws/sqs';
 import { ActionRequestMessage, ActionRequestMessageRetry, getGitHubEnterpriseApiUrl, isJobQueued } from './scale-up';
-import { getOctokit } from '../gh-auth/gh-octokit';
+import { getOctokit } from '../github/octokit';
 import { MetricUnit } from '@aws-lambda-powertools/metrics';
 import yn from 'yn';
 

lambdas/functions/control-plane/src/pool/pool.ts

@@ -4,7 +4,7 @@ import moment from 'moment';
 import nock from 'nock';
 
 import { RunnerInfo, RunnerList } from '../aws/runners.d';
-import * as ghAuth from '../gh-auth/gh-auth';
+import * as ghAuth from '../github/auth';
 import { listEC2Runners, terminateRunner, tag } from './../aws/runners';
 import { githubCache } from './cache';
 import { newestFirstStrategy, oldestFirstStrategy, scaleDown } from './scale-down';
@@ -34,7 +34,7 @@ jest.mock('./../aws/runners', () => ({
   terminateRunner: jest.fn(),
   listEC2Runners: jest.fn(),
 }));
-jest.mock('./../gh-auth/gh-auth');
+jest.mock('./../github/auth');
 jest.mock('./cache');
 
 const mocktokit = Octokit as jest.MockedClass<typeof Octokit>;

lambdas/functions/control-plane/src/scale-runners/job-retry.test.ts

@@ -2,12 +2,12 @@ import { Octokit } from '@octokit/rest';
 import { createChildLogger } from '@terraform-aws-github-runner/aws-powertools-util';
 import moment from 'moment';
 
-import { createGithubAppAuth, createGithubInstallationAuth, createOctokitClient } from '../gh-auth/gh-auth';
+import { createGithubAppAuth, createGithubInstallationAuth, createOctokitClient } from '../github/auth';
 import { bootTimeExceeded, listEC2Runners, tag, terminateRunner } from './../aws/runners';
 import { RunnerInfo, RunnerList } from './../aws/runners.d';
 import { GhRunners, githubCache } from './cache';
 import { ScalingDownConfig, getEvictionStrategy, getIdleRunnerCount } from './scale-down-config';
-import { metricGitHubAppRateLimit } from '../gh-auth/rate-limit';
+import { metricGitHubAppRateLimit } from '../github/rate-limit';
 
 const logger = createChildLogger('scale-down');
 

lambdas/functions/control-plane/src/scale-runners/job-retry.ts

@@ -6,7 +6,7 @@ import { mocked } from 'jest-mock';
 import nock from 'nock';
 import { performance } from 'perf_hooks';
 
-import * as ghAuth from '../gh-auth/gh-auth';
+import * as ghAuth from '../github/auth';
 import { createRunner, listEC2Runners } from './../aws/runners';
 import { RunnerInputParameters } from './../aws/runners.d';
 import ScaleError from './ScaleError';
@@ -38,7 +38,7 @@ jest.mock('@octokit/rest', () => ({
 }));
 
 jest.mock('./../aws/runners');
-jest.mock('./../gh-auth/gh-auth');
+jest.mock('./../github/auth');
 
 jest.mock('@terraform-aws-github-runner/aws-ssm-util', () => ({
   ...jest.requireActual('@terraform-aws-github-runner/aws-ssm-util'),

lambdas/functions/control-plane/src/scale-runners/scale-down.test.ts

@@ -3,12 +3,12 @@ import { addPersistentContextToChildLogger, createChildLogger } from '@terraform
 import { getParameter, putParameter } from '@terraform-aws-github-runner/aws-ssm-util';
 import yn from 'yn';
 
-import { createGithubAppAuth, createGithubInstallationAuth, createOctokitClient } from '../gh-auth/gh-auth';
+import { createGithubAppAuth, createGithubInstallationAuth, createOctokitClient } from '../github/auth';
 import { createRunner, listEC2Runners } from './../aws/runners';
 import { RunnerInputParameters } from './../aws/runners.d';
 import ScaleError from './ScaleError';
 import { publishRetryMessage } from './job-retry';
-import { metricGitHubAppRateLimit } from '../gh-auth/rate-limit';
+import { metricGitHubAppRateLimit } from '../github/rate-limit';
 
 const logger = createChildLogger('scale-up');
 

lambdas/functions/control-plane/src/scale-runners/scale-down.ts

@@ -1,5 +1,5 @@
 import { PutParameterCommand, SSMClient, Tag } from '@aws-sdk/client-ssm';
-import { getTracedAWSV3Client, logger } from '@terraform-aws-github-runner/aws-powertools-util';
+import { getTracedAWSV3Client } from '@terraform-aws-github-runner/aws-powertools-util';
 import { SSMProvider } from '@aws-lambda-powertools/parameters/ssm';
 
 export async function getParameter(parameter_name: string): Promise<string> {