Merge pull request #422 from achieve-3000/dist

Update deps
achieve-3000 · May 10, 2023 · a4e10fd · a4e10fd
2 parents 53fa7ed + 52a6174
commit a4e10fd
Show file tree

Hide file tree

Showing 11 changed files with 8,315 additions and 12,144 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,16 +12,16 @@ on:
 jobs:
   check:
     name: Check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     -
       name: Checkout code
       uses: actions/checkout@v3
     -
-      name: Set Node.js 14.x
+      name: Set Node.js 19.x
       uses: actions/setup-node@v3
       with:
-        node-version: 14.x
+        node-version: 19.x
     -
       name: Cache dependencies
       uses: actions/cache@v3
@@ -37,16 +37,16 @@ jobs:
 
   dist:
     name: Dist
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     -
       name: Checkout code
       uses: actions/checkout@v3
     -
-      name: Set Node.js 14.x
+      name: Set Node.js 19.x
       uses: actions/setup-node@v3
       with:
-        node-version: 14.x
+        node-version: 19.x
     -
       name: Cache dependencies
       uses: actions/cache@v3

diff --git a/.github/workflows/diff.yml b/.github/workflows/diff.yml
@@ -9,7 +9,7 @@ jobs:
   # Run action
   diff:
     name: Diff
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     outputs:
       modules: ${{ steps.run.outputs.modules }}
       changed: ${{ steps.run.outputs.changed }}
@@ -40,7 +40,7 @@ jobs:
   print-all:
     needs: [diff]
     name: Print all
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: ${{ fromJson(needs.diff.outputs.changed) }}
     strategy:
       fail-fast: false
@@ -61,7 +61,7 @@ jobs:
   print-changes:
     needs: [diff]
     name: Print changes
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: ${{ fromJson(needs.diff.outputs.changed) }}
     strategy:
       fail-fast: false
@@ -81,7 +81,7 @@ jobs:
   print-ts:
     needs: [diff]
     name: Print ts
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: ${{ fromJson(needs.diff.outputs.tags).ts.changed }}
     strategy:
       fail-fast: false
@@ -101,7 +101,7 @@ jobs:
   print-js:
     needs: [diff]
     name: Print js
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: ${{ fromJson(needs.diff.outputs.tags).js.changed }}
     strategy:
       fail-fast: false

diff --git a/__tests__/github.test.ts b/__tests__/github.test.ts
@@ -1,8 +1,17 @@
-import {expect, test} from '@jest/globals'
+import {expect, test, jest} from '@jest/globals'
+
 import {randomUUID} from 'crypto'
 import {Params} from '../src/models'
 import {GithubAdapter} from '../src/github'
-import nock from 'nock'
+
+import {components} from '@octokit/openapi-types/types'
+
+/* eslint-disable import/named */
+import {RestEndpointMethodTypes} from '@octokit/plugin-rest-endpoint-methods'
+/* eslint-enable import/named */
+
+type CompareCommitsWithBaseheadResponse = RestEndpointMethodTypes['repos']['compareCommitsWithBasehead']['response']
+type CompareCommitsWithBaseheadDataDiff = CompareCommitsWithBaseheadResponse['data']['files']
 
 function createParams(): Params {
   return {
@@ -48,51 +57,53 @@ function createParams(): Params {
   }
 }
 
-function mockCompareResponse(params: Params, body: object) {
-  const host = 'https://api.github.com'
-  const path = `/repos/${params.repo_owner}/${params.repo_name}/compare/${params.base_ref}...${params.head_ref}`
+function createMockResponse(files: object[]): Promise<CompareCommitsWithBaseheadDataDiff> {
+  return Promise.resolve(files.map(o => o as components['schemas']['diff-entry']))
+}
+
+function createGithubAdapter(params: Params, files: object[]) {
+  const adapter = new GithubAdapter(params)
+  const result = createMockResponse(files)
+
+  jest.spyOn(adapter, 'compareCommits').mockImplementation(() => result)
 
-  nock(host).persist().get(path).reply(200, body)
+  return adapter
 }
 
 test('compare commits', async () => {
   const params = createParams()
-  const response = {
-    files: [
-      {
-        filename: 'infra/terraform/added.txt',
-        status: 'added'
-      },
-      {
-        filename: 'infra/terraform/modified.txt',
-        status: 'modified'
-      },
-      {
-        filename: 'infra/terraform/renamed.txt',
-        status: 'renamed'
-      },
-      {
-        filename: 'infra/terraform/removed.txt',
-        status: 'removed'
-      },
-      {
-        filename: 'module1/added.txt',
-        status: 'added'
-      },
-      {
-        filename: 'module1/modified.txt',
-        status: 'modified'
-      },
-      {
-        filename: 'module2/modified.txt',
-        status: 'added'
-      }
-    ]
-  }
-
-  mockCompareResponse(params, response)
+  const response = [
+    {
+      filename: 'infra/terraform/added.txt',
+      status: 'added'
+    },
+    {
+      filename: 'infra/terraform/modified.txt',
+      status: 'modified'
+    },
+    {
+      filename: 'infra/terraform/renamed.txt',
+      status: 'renamed'
+    },
+    {
+      filename: 'infra/terraform/removed.txt',
+      status: 'removed'
+    },
+    {
+      filename: 'module1/added.txt',
+      status: 'added'
+    },
+    {
+      filename: 'module1/modified.txt',
+      status: 'modified'
+    },
+    {
+      filename: 'module2/modified.txt',
+      status: 'added'
+    }
+  ]
 
-  const adapter = new GithubAdapter(params)
+  const adapter = createGithubAdapter(params, response)
   const result = await adapter.compare()
 
   expect(Array.from(result.modules.keys())).toEqual(
@@ -151,46 +162,42 @@ test('compare commits', async () => {
 
 test('map diff tags', async () => {
   const params = createParams()
-  const response = {
-    files: [
-      {
-        filename: 'infra/terraform/added.txt',
-        status: 'added'
-      },
-      {
-        filename: 'infra/terraform/modified.txt',
-        status: 'modified'
-      },
-      {
-        filename: 'infra/terraform/renamed.txt',
-        status: 'renamed'
-      },
-      {
-        filename: 'infra/terraform/removed.txt',
-        status: 'removed'
-      },
-      {
-        filename: 'infra/kubernetes/added.txt',
-        status: 'added'
-      },
-      {
-        filename: 'module1/added.txt',
-        status: 'added'
-      },
-      {
-        filename: 'module1/modified.txt',
-        status: 'modified'
-      },
-      {
-        filename: 'module2/modified.txt',
-        status: 'added'
-      }
-    ]
-  }
-
-  mockCompareResponse(params, response)
+  const response = [
+    {
+      filename: 'infra/terraform/added.txt',
+      status: 'added'
+    },
+    {
+      filename: 'infra/terraform/modified.txt',
+      status: 'modified'
+    },
+    {
+      filename: 'infra/terraform/renamed.txt',
+      status: 'renamed'
+    },
+    {
+      filename: 'infra/terraform/removed.txt',
+      status: 'removed'
+    },
+    {
+      filename: 'infra/kubernetes/added.txt',
+      status: 'added'
+    },
+    {
+      filename: 'module1/added.txt',
+      status: 'added'
+    },
+    {
+      filename: 'module1/modified.txt',
+      status: 'modified'
+    },
+    {
+      filename: 'module2/modified.txt',
+      status: 'added'
+    }
+  ]
 
-  const adapter = new GithubAdapter(params)
+  const adapter = createGithubAdapter(params, response)
   const result = await adapter.compare()
 
   expect(Array.from(result.modules.keys())).toEqual(
@@ -215,26 +222,22 @@ test('map diff tags', async () => {
 
 test('compare commits on subpath', async () => {
   const params = createParams()
-  const response = {
-    files: [
-      {
-        filename: 'infra/terraform/config/dev/config.yaml',
-        status: 'modified'
-      },
-      {
-        filename: 'infra/terraform/config/qa/config.yaml',
-        status: 'modified'
-      },
-      {
-        filename: 'module1/src/main/resources/log4j.properties',
-        status: 'modified'
-      }
-    ]
-  }
-
-  mockCompareResponse(params, response)
+  const response = [
+    {
+      filename: 'infra/terraform/config/dev/config.yaml',
+      status: 'modified'
+    },
+    {
+      filename: 'infra/terraform/config/qa/config.yaml',
+      status: 'modified'
+    },
+    {
+      filename: 'module1/src/main/resources/log4j.properties',
+      status: 'modified'
+    }
+  ]
 
-  const adapter = new GithubAdapter(params)
+  const adapter = createGithubAdapter(params, response)
   const result = await adapter.compare()
 
   expect(result.changed).toBeTruthy()

diff --git a/action.yml b/action.yml
@@ -26,5 +26,5 @@ inputs:
     required: false
     description: 'YAML file containing modules to track'
 runs:
-  using: 'node12'
+  using: 'node16'
   main: 'dist/index.js'