fix: ensure given docker-compose file(s) are valid and at least one i…

…s provided

Signed-off-by: Emilien Escalle <emilien.escalle@escemi.com>

src/runner.test.ts

@@ -17,22 +17,20 @@ const runMock = jest.spyOn(runner, "run");
 
 // Mock the external libraries and services used by the action
 let debugMock: jest.SpiedFunction<typeof LoggerService.prototype.debug>;
-let warnMock: jest.SpiedFunction<typeof LoggerService.prototype.warn>;
 let setFailedMock: jest.SpiedFunction<typeof core.setFailed>;
 let getInputsMock: jest.SpiedFunction<typeof InputService.prototype.getInputs>;
 describe("run", () => {
   beforeEach(() => {
     jest.clearAllMocks();
 
     debugMock = jest.spyOn(LoggerService.prototype, "debug").mockImplementation();
-    warnMock = jest.spyOn(LoggerService.prototype, "warn").mockImplementation();
     setFailedMock = jest.spyOn(core, "setFailed").mockImplementation();
     getInputsMock = jest.spyOn(InputService.prototype, "getInputs");
   });
 
-  it("should return and warns when composeFile is empty", async () => {
+  it("should call given callback when inputs are valid", async () => {
     getInputsMock.mockImplementation(() => ({
-      composeFiles: [],
+      composeFiles: ["docker-compose.yml"],
       services: [],
       composeFlags: [],
       upFlags: [],
@@ -41,17 +39,30 @@ describe("run", () => {
     }));
 
     const callbackMock = jest.fn();
+    callbackMock.mockResolvedValueOnce(null);
 
     await runner.run(callbackMock);
     expect(runMock).toHaveReturned();
 
     // Verify that all of the functions were called correctly
     expect(debugMock).toHaveBeenNthCalledWith(
       1,
-      'inputs: {"composeFiles":[],"services":[],"composeFlags":[],"upFlags":[],"downFlags":[],"cwd":"/current/working/dir"}'
+      'inputs: {"composeFiles":["docker-compose.yml"],"services":[],"composeFlags":[],"upFlags":[],"downFlags":[],"cwd":"/current/working/dir"}'
     );
-    expect(warnMock).toHaveBeenNthCalledWith(1, "no compose files found");
-    expect(callbackMock).not.toHaveBeenCalled();
+
+    expect(callbackMock).toHaveBeenCalledWith(
+      {
+        composeFiles: ["docker-compose.yml"],
+        services: [],
+        composeFlags: [],
+        upFlags: [],
+        downFlags: [],
+        cwd: "/current/working/dir",
+      },
+      expect.any(LoggerService),
+      expect.any(DockerComposeService)
+    );
+
     expect(setFailedMock).not.toHaveBeenCalled();
   });
 
@@ -75,42 +86,4 @@ describe("run", () => {
     expect(callbackMock).toHaveBeenCalled();
     expect(setFailedMock).toHaveBeenNthCalledWith(1, "Error: unkown error");
   });
-
-  it("should call callback when some compose files are provided", async () => {
-    getInputsMock.mockImplementation(() => ({
-      composeFiles: ["docker-compose.yml"],
-      services: [],
-      composeFlags: [],
-      upFlags: [],
-      downFlags: [],
-      cwd: "/current/working/dir",
-    }));
-
-    const callbackMock = jest.fn();
-    callbackMock.mockResolvedValueOnce(null);
-
-    await runner.run(callbackMock);
-    expect(runMock).toHaveReturned();
-
-    // Verify that all of the functions were called correctly
-    expect(debugMock).toHaveBeenNthCalledWith(
-      1,
-      'inputs: {"composeFiles":["docker-compose.yml"],"services":[],"composeFlags":[],"upFlags":[],"downFlags":[],"cwd":"/current/working/dir"}'
-    );
-
-    expect(callbackMock).toHaveBeenCalledWith(
-      {
-        composeFiles: ["docker-compose.yml"],
-        services: [],
-        composeFlags: [],
-        upFlags: [],
-        downFlags: [],
-        cwd: "/current/working/dir",
-      },
-      expect.any(LoggerService),
-      expect.any(DockerComposeService)
-    );
-
-    expect(setFailedMock).not.toHaveBeenCalled();
-  });
 });

src/runner.ts

@@ -16,17 +16,12 @@ export type RunCallback = (
 export async function run(callback: RunCallback): Promise<void> {
   try {
     const loggerService = new LoggerService();
-    const inputService = new InputService(loggerService);
+    const inputService = new InputService();
     const dockerComposeService = new DockerComposeService();
 
     const inputs = inputService.getInputs();
     loggerService.debug(`inputs: ${JSON.stringify(inputs)}`);
 
-    if (!inputs.composeFiles.length) {
-      loggerService.warn("no compose files found");
-      return;
-    }
-
     await callback(inputs, loggerService, dockerComposeService);
   } catch (error) {
     setFailed(`${error instanceof Error ? error : JSON.stringify(error)}`);