ci: run github check integration optionally

.github/workflows/cloud-runner-ci-pipeline.yml

@@ -226,6 +226,6 @@ jobs:
           node-version: 20
           cache: 'yarn'
       - run: yarn install --frozen-lockfile
-      - run: yarn test cloud-runner-github-checks-integration-test --detectOpenHandles --forceExit --runInBand
+      - run: yarn test cloud-runner-github-checks.integration --detectOpenHandles --forceExit --runInBand
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

action.yml

@@ -194,10 +194,6 @@ inputs:
     description:
       '[CloudRunner] Either local, k8s or aws can be used to run builds on a remote cluster. Additional parameters must
       be configured.'
-  providerPackage:
-    default: ''
-    required: false
-    description: '[CloudRunner] Override the provider package name used to load the provider'
   containerCpu:
     default: ''
     required: false

dist/index.js

@@ -327,7 +327,6 @@ class BuildParameters {
             containerRegistryRepository: input_1.default.containerRegistryRepository,
             containerRegistryImageVersion: input_1.default.containerRegistryImageVersion,
             providerStrategy: cloud_runner_options_1.default.providerStrategy,
-            providerPackage: cloud_runner_options_1.default.providerPackage,
             buildPlatform: cloud_runner_options_1.default.buildPlatform,
             kubeConfig: cloud_runner_options_1.default.kubeConfig,
             containerMemory: cloud_runner_options_1.default.containerMemory,
@@ -752,7 +751,6 @@ const core = __importStar(__nccwpck_require__(42186));
 const test_1 = __importDefault(__nccwpck_require__(63007));
 const local_1 = __importDefault(__nccwpck_require__(66575));
 const docker_1 = __importDefault(__nccwpck_require__(42802));
-const provider_loader_1 = __importDefault(__nccwpck_require__(45788));
 const github_1 = __importDefault(__nccwpck_require__(83654));
 const shared_workspace_locking_1 = __importDefault(__nccwpck_require__(71372));
 const follow_log_stream_service_1 = __nccwpck_require__(40266);
@@ -771,7 +769,7 @@ class CloudRunner {
         if (CloudRunner.buildParameters.githubCheckId === ``) {
             CloudRunner.buildParameters.githubCheckId = await github_1.default.createGitHubCheck(CloudRunner.buildParameters.buildGuid);
         }
-        await CloudRunner.setupSelectedBuildPlatform();
+        CloudRunner.setupSelectedBuildPlatform();
         CloudRunner.defaultSecrets = task_parameter_serializer_1.TaskParameterSerializer.readDefaultSecrets();
         CloudRunner.cloudRunnerEnvironmentVariables =
             task_parameter_serializer_1.TaskParameterSerializer.createCloudRunnerEnvironmentVariables(buildParameters);
@@ -789,7 +787,7 @@ class CloudRunner {
         }
         follow_log_stream_service_1.FollowLogStreamService.Reset();
     }
-    static async setupSelectedBuildPlatform() {
+    static setupSelectedBuildPlatform() {
         cloud_runner_logger_1.default.log(`Cloud Runner platform selected ${CloudRunner.buildParameters.providerStrategy}`);
         switch (CloudRunner.buildParameters.providerStrategy) {
             case 'k8s':
@@ -807,10 +805,6 @@ class CloudRunner {
             case 'local-system':
                 CloudRunner.Provider = new local_1.default();
                 break;
-            default:
-                if (CloudRunner.buildParameters.providerStrategy !== 'local') {
-                    CloudRunner.Provider = await (0, provider_loader_1.default)(CloudRunner.buildParameters.providerPackage, CloudRunner.buildParameters);
-                }
         }
     }
     static async run(buildParameters, baseImage) {
@@ -1220,9 +1214,6 @@ class CloudRunnerOptions {
         }
         return provider || 'local';
     }
-    static get providerPackage() {
-        return (CloudRunnerOptions.getInput('providerPackage') || `unity-builder-provider-${CloudRunnerOptions.providerStrategy}`);
-    }
     static get containerCpu() {
         return CloudRunnerOptions.getInput('containerCpu') || `1024`;
     }
@@ -4223,78 +4214,6 @@ class LocalCloudRunner {
 exports["default"] = LocalCloudRunner;
 
 
-/***/ }),
-
-/***/ 45788:
-/***/ (function(__unused_webpack_module, exports) {
-
-"use strict";
-
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-/**
- * Dynamically load a provider package by name.
- * @param providerName Name of the provider package to load
- * @param buildParameters Build parameters passed to the provider constructor
- * @throws Error when the provider cannot be loaded or does not implement ProviderInterface
- */
-async function loadProvider(providerName, buildParameters) {
-    let importedModule;
-    try {
-        importedModule = await Promise.resolve().then(() => __importStar(require(providerName)));
-    }
-    catch (error) {
-        throw new Error(`Failed to load provider package '${providerName}': ${error.message}`);
-    }
-    const Provider = importedModule.default || importedModule;
-    let instance;
-    try {
-        instance = new Provider(buildParameters);
-    }
-    catch (error) {
-        throw new Error(`Failed to instantiate provider '${providerName}': ${error.message}`);
-    }
-    const requiredMethods = [
-        'cleanupWorkflow',
-        'setupWorkflow',
-        'runTaskInWorkflow',
-        'garbageCollect',
-        'listResources',
-        'listWorkflow',
-        'watchWorkflow',
-    ];
-    for (const method of requiredMethods) {
-        if (typeof instance[method] !== 'function') {
-            throw new Error(`Provider package '${providerName}' does not implement ProviderInterface. Missing method '${method}'.`);
-        }
-    }
-    return instance;
-}
-exports["default"] = loadProvider;
-
-
 /***/ }),
 
 /***/ 63007:

jest.config.js

@@ -25,8 +25,6 @@ module.exports = {
   // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
   modulePathIgnorePatterns: ['<rootDir>/lib/', '<rootDir>/dist/'],
 
-  // Files that will be run before Jest is loaded to set globals like fetch
+  // A list of paths to modules that run some code to configure or set up the testing framework before each test
-  setupFiles: ['<rootDir>/src/jest.globals.ts'],
-  // A list of paths to modules that run some code to configure or set up the testing framework after the environment is ready
   setupFilesAfterEnv: ['<rootDir>/src/jest.setup.ts'],
 };

src/integration/cloud-runner-github-checks.integration.test.ts

@@ -1,8 +1,17 @@
-// Integration test for exercising real GitHub check creation and updates.
+import { BuildParameters } from '../model';
 import CloudRunner from '../model/cloud-runner/cloud-runner';
 import UnityVersioning from '../model/unity-versioning';
+import { Cli } from '../model/cli/cli';
 import GitHub from '../model/github';
-import { TIMEOUT_INFINITE, createParameters } from '../test-utils/cloud-runner-test-helpers';
+import { OptionValues } from 'commander';
+
+export const TIMEOUT_INFINITE = 1e9;
+
+async function createParameters(overrides?: OptionValues) {
+  if (overrides) Cli.options = overrides;
+
+  return BuildParameters.create();
+}
 
 const runIntegration = process.env.RUN_GITHUB_INTEGRATION_TESTS === 'true';
 const describeOrSkip = runIntegration ? describe : describe.skip;

src/jest.globals.ts

@@ -1,3 +0,0 @@
-import { fetch as undiciFetch, Headers, Request, Response } from 'undici';
-
-Object.assign(globalThis, { fetch: undiciFetch, Headers, Request, Response });

src/jest.setup.ts

@@ -1,5 +1,15 @@
 import failOnConsole from 'jest-fail-on-console';
 
+// Polyfill fetch for the Node.js test environment.
+// Jest runs tests inside a VM context where the global `fetch` is not
+// automatically provided, even on Node 18+. Octokit requires a `fetch`
+// implementation, so we provide one using undici's implementation.
+// This ensures tests that interact with Octokit do not throw when
+// constructing the client.
+import { fetch as undiciFetch, Headers, Request, Response } from 'undici';
+
+Object.assign(globalThis, { fetch: undiciFetch, Headers, Request, Response });
+
 // Fail when console logs something inside a test - use spyOn instead
 failOnConsole({
   shouldFailOnWarn: true,

src/model/build-parameters.ts

@@ -54,7 +54,6 @@ class BuildParameters {
   public sshAgent!: string;
   public sshPublicKeysDirectoryPath!: string;
   public providerStrategy!: string;
-  public providerPackage!: string;
   public gitPrivateToken!: string;
   public awsStackName!: string;
   public kubeConfig!: string;
@@ -184,7 +183,6 @@ class BuildParameters {
       containerRegistryRepository: Input.containerRegistryRepository,
       containerRegistryImageVersion: Input.containerRegistryImageVersion,
       providerStrategy: CloudRunnerOptions.providerStrategy,
-      providerPackage: CloudRunnerOptions.providerPackage,
       buildPlatform: CloudRunnerOptions.buildPlatform,
       kubeConfig: CloudRunnerOptions.kubeConfig,
       containerMemory: CloudRunnerOptions.containerMemory,

src/model/cloud-runner/cloud-runner.ts

@@ -13,7 +13,6 @@ import CloudRunnerEnvironmentVariable from './options/cloud-runner-environment-v
 import TestCloudRunner from './providers/test';
 import LocalCloudRunner from './providers/local';
 import LocalDockerCloudRunner from './providers/docker';
-import loadProvider from './providers/provider-loader';
 import GitHub from '../github';
 import SharedWorkspaceLocking from './services/core/shared-workspace-locking';
 import { FollowLogStreamService } from './services/core/follow-log-stream-service';
@@ -39,7 +38,7 @@ class CloudRunner {
     if (CloudRunner.buildParameters.githubCheckId === ``) {
       CloudRunner.buildParameters.githubCheckId = await GitHub.createGitHubCheck(CloudRunner.buildParameters.buildGuid);
     }
-    await CloudRunner.setupSelectedBuildPlatform();
+    CloudRunner.setupSelectedBuildPlatform();
     CloudRunner.defaultSecrets = TaskParameterSerializer.readDefaultSecrets();
     CloudRunner.cloudRunnerEnvironmentVariables =
       TaskParameterSerializer.createCloudRunnerEnvironmentVariables(buildParameters);
@@ -63,7 +62,7 @@ class CloudRunner {
     FollowLogStreamService.Reset();
   }
 
-  private static async setupSelectedBuildPlatform() {
+  private static setupSelectedBuildPlatform() {
     CloudRunnerLogger.log(`Cloud Runner platform selected ${CloudRunner.buildParameters.providerStrategy}`);
     switch (CloudRunner.buildParameters.providerStrategy) {
       case 'k8s':
@@ -81,13 +80,6 @@ class CloudRunner {
       case 'local-system':
         CloudRunner.Provider = new LocalCloudRunner();
         break;
-      default:
-        if (CloudRunner.buildParameters.providerStrategy !== 'local') {
-          CloudRunner.Provider = await loadProvider(
-            CloudRunner.buildParameters.providerPackage,
-            CloudRunner.buildParameters,
-          );
-        }
     }
   }
 

src/model/cloud-runner/options/cloud-runner-options.ts

@@ -127,12 +127,6 @@ class CloudRunnerOptions {
     return provider || 'local';
   }
 
-  static get providerPackage(): string {
-    return (
-      CloudRunnerOptions.getInput('providerPackage') || `unity-builder-provider-${CloudRunnerOptions.providerStrategy}`
-    );
-  }
-
   static get containerCpu(): string {
     return CloudRunnerOptions.getInput('containerCpu') || `1024`;
   }

src/model/cloud-runner/providers/fixtures/invalid-provider.ts

@@ -1 +0,0 @@
-export default class InvalidProvider {}

src/model/cloud-runner/providers/provider-loader.test.ts

@@ -1,19 +0,0 @@
-import loadProvider from './provider-loader';
-import { ProviderInterface } from './provider-interface';
-
-describe('provider-loader', () => {
-  it('loads a provider dynamically', async () => {
-    const provider: ProviderInterface = await loadProvider('./test', {} as any);
-    expect(typeof provider.runTaskInWorkflow).toBe('function');
-  });
-
-  it('throws when provider package is missing', async () => {
-    await expect(loadProvider('non-existent-package', {} as any)).rejects.toThrow('non-existent-package');
-  });
-
-  it('throws when provider does not implement ProviderInterface', async () => {
-    await expect(loadProvider('./fixtures/invalid-provider', {} as any)).rejects.toThrow(
-      'does not implement ProviderInterface',
-    );
-  });
-});

src/model/cloud-runner/providers/provider-loader.ts

@@ -1,48 +0,0 @@
-import { ProviderInterface } from './provider-interface';
-import BuildParameters from '../../build-parameters';
-
-/**
- * Dynamically load a provider package by name.
- * @param providerName Name of the provider package to load
- * @param buildParameters Build parameters passed to the provider constructor
- * @throws Error when the provider cannot be loaded or does not implement ProviderInterface
- */
-export default async function loadProvider(
-  providerName: string,
-  buildParameters: BuildParameters,
-): Promise<ProviderInterface> {
-  let importedModule: any;
-  try {
-    importedModule = await import(providerName);
-  } catch (error) {
-    throw new Error(`Failed to load provider package '${providerName}': ${(error as Error).message}`);
-  }
-
-  const Provider = importedModule.default || importedModule;
-  let instance: any;
-  try {
-    instance = new Provider(buildParameters);
-  } catch (error) {
-    throw new Error(`Failed to instantiate provider '${providerName}': ${(error as Error).message}`);
-  }
-
-  const requiredMethods = [
-    'cleanupWorkflow',
-    'setupWorkflow',
-    'runTaskInWorkflow',
-    'garbageCollect',
-    'listResources',
-    'listWorkflow',
-    'watchWorkflow',
-  ];
-
-  for (const method of requiredMethods) {
-    if (typeof instance[method] !== 'function') {
-      throw new Error(
-        `Provider package '${providerName}' does not implement ProviderInterface. Missing method '${method}'.`,
-      );
-    }
-  }
-
-  return instance as ProviderInterface;
-}

src/model/cloud-runner/tests/cloud-runner-github-checks.test.ts

@@ -1,8 +1,16 @@
+import { BuildParameters } from '../..';
 import CloudRunner from '../cloud-runner';
 import UnityVersioning from '../../unity-versioning';
+import { Cli } from '../../cli/cli';
 import setups from './cloud-runner-suite.test';
+import { OptionValues } from 'commander';
 import GitHub from '../../github';
-import { TIMEOUT_INFINITE, createParameters } from '../../../test-utils/cloud-runner-test-helpers';
+export const TIMEOUT_INFINITE = 1e9;
+async function CreateParameters(overrides: OptionValues | undefined) {
+  if (overrides) Cli.options = overrides;
+
+  return BuildParameters.create();
+}
 describe('Cloud Runner Github Checks', () => {
   setups();
   it('Responds', () => {});
@@ -28,7 +36,7 @@ describe('Cloud Runner Github Checks', () => {
     'Check Handling Direct',
     async () => {
       // Setup parameters
-      const buildParameter = await createParameters({
+      const buildParameter = await CreateParameters({
         versioning: 'None',
         projectPath: 'test-project',
         unityVersion: UnityVersioning.read('test-project'),
@@ -46,7 +54,7 @@ describe('Cloud Runner Github Checks', () => {
     'Check Handling Via Async Workflow',
     async () => {
       // Setup parameters
-      const buildParameter = await createParameters({
+      const buildParameter = await CreateParameters({
         versioning: 'None',
         projectPath: 'test-project',
         unityVersion: UnityVersioning.read('test-project'),

src/test-utils/cloud-runner-test-helpers.ts

@@ -1,11 +0,0 @@
-import { BuildParameters } from '../model';
-import { Cli } from '../model/cli/cli';
-import { OptionValues } from 'commander';
-
-export const TIMEOUT_INFINITE = 1e9;
-
-export async function createParameters(overrides?: OptionValues) {
-  if (overrides) Cli.options = overrides;
-
-  return BuildParameters.create();
-}