package manager tests

owkin · Dec 1, 2023 · c7a75f7 · c7a75f7
1 parent e4eabb4
commit c7a75f7
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 9 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,5 +22,5 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ./
         with:
-          dockerfile: ./__tests__/data/Dockerfile
+          dockerfile: ./__tests__/data/Dockerfile.apk
           dependencies: ./__tests__/data/dependencies.json
diff --git a/__tests__/data/Dockerfile → __tests__/data/Dockerfile.apk b/__tests__/data/Dockerfile → __tests__/data/Dockerfile.apk
diff --git a/__tests__/data/Dockerfile.apt b/__tests__/data/Dockerfile.apt
@@ -0,0 +1 @@
+FROM ubuntu:latest
diff --git a/__tests__/dockerfile.test.ts b/__tests__/dockerfile.test.ts
@@ -3,11 +3,19 @@ import * as path from 'path'
 import {load} from '../src/dockerfile'
 
 test('load alpine dockerfile', async () => {
-  const dockerfilePath = path.join(__dirname, 'data', 'Dockerfile')
+  const dockerfilePath = path.join(__dirname, 'data', 'Dockerfile.apk')
   const dockerfile = await load(dockerfilePath)
+  expect(dockerfile.pkgManager).toBe('apk')
   expect(dockerfile.name).toBe('alpine:latest')
 })
 
+test('load ubuntu dockerfile', async () => {
+  const dockerfilePath = path.join(__dirname, 'data', 'Dockerfile.apt')
+  const dockerfile = await load(dockerfilePath)
+  expect(dockerfile.pkgManager).toBe('apt')
+  expect(dockerfile.name).toBe('ubuntu:latest')
+})
+
 test('load dockerfile with unsupported package manager', async () => {
   const dockerfilePath = path.join(__dirname, 'data', 'Dockerfile.unsupported')
   await expect(load(dockerfilePath)).rejects.toThrow(

diff --git a/__tests__/main.test.ts b/__tests__/main.test.ts
@@ -5,7 +5,11 @@ import {test} from '@jest/globals'
 
 // shows how the runner will run a javascript action with env / stdout protocol
 test('test runs', () => {
-  process.env['INPUT_DOCKERFILE'] = path.join(__dirname, 'data', 'Dockerfile')
+  process.env['INPUT_DOCKERFILE'] = path.join(
+    __dirname,
+    'data',
+    'Dockerfile.apk'
+  )
   process.env['INPUT_DEPENDENCIES'] = path.join(
     __dirname,
     'data',

diff --git a/dist/index.js b/dist/index.js
@@ -117,7 +117,7 @@ exports.Image = void 0;
 const docker_cli_js_1 = __nccwpck_require__(771);
 const packageManagers = [
     { command: 'apk --version', name: 'apk' },
-    { command: 'apt-get --version', name: 'apt-get' }
+    { command: 'apt-get --version', name: 'apt' }
 ];
 class Image {
     constructor(name) {
@@ -146,7 +146,7 @@ class Image {
             switch (this.pkgManager) {
                 case 'apk':
                     return this.get_latest_version_apk(installed_package);
-                case 'apt-get':
+                case 'apt':
                     return this.get_latest_version_apt(installed_package);
                 default:
                     throw Error('Unable to get package manager');

diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/image.ts b/src/image.ts
@@ -1,14 +1,14 @@
 import {Docker, Options} from 'docker-cli-js'
 import {Package} from './dependencies'
 
-export type PackageManager = 'apk' | 'apt-get'
+export type PackageManager = 'apk' | 'apt'
 
 const packageManagers: {
   command: string
   name: PackageManager
 }[] = [
   {command: 'apk --version', name: 'apk'},
-  {command: 'apt-get --version', name: 'apt-get'}
+  {command: 'apt-get --version', name: 'apt'}
 ]
 
 export class Image {
@@ -47,7 +47,7 @@ export class Image {
     switch (this.pkgManager) {
       case 'apk':
         return this.get_latest_version_apk(installed_package)
-      case 'apt-get':
+      case 'apt':
         return this.get_latest_version_apt(installed_package)
       default:
         throw Error('Unable to get package manager')