feat: add providerPackage input for CloudRunner configuration
parent
ebb637d57e
commit
7c6f03998d
|
@ -194,6 +194,10 @@ inputs:
|
||||||
description:
|
description:
|
||||||
'[CloudRunner] Either local, k8s or aws can be used to run builds on a remote cluster. Additional parameters must
|
'[CloudRunner] Either local, k8s or aws can be used to run builds on a remote cluster. Additional parameters must
|
||||||
be configured.'
|
be configured.'
|
||||||
|
providerPackage:
|
||||||
|
default: ''
|
||||||
|
required: false
|
||||||
|
description: '[CloudRunner] Override the provider package name used to load the provider'
|
||||||
containerCpu:
|
containerCpu:
|
||||||
default: ''
|
default: ''
|
||||||
required: false
|
required: false
|
||||||
|
|
|
@ -327,6 +327,7 @@ class BuildParameters {
|
||||||
containerRegistryRepository: input_1.default.containerRegistryRepository,
|
containerRegistryRepository: input_1.default.containerRegistryRepository,
|
||||||
containerRegistryImageVersion: input_1.default.containerRegistryImageVersion,
|
containerRegistryImageVersion: input_1.default.containerRegistryImageVersion,
|
||||||
providerStrategy: cloud_runner_options_1.default.providerStrategy,
|
providerStrategy: cloud_runner_options_1.default.providerStrategy,
|
||||||
|
providerPackage: cloud_runner_options_1.default.providerPackage,
|
||||||
buildPlatform: cloud_runner_options_1.default.buildPlatform,
|
buildPlatform: cloud_runner_options_1.default.buildPlatform,
|
||||||
kubeConfig: cloud_runner_options_1.default.kubeConfig,
|
kubeConfig: cloud_runner_options_1.default.kubeConfig,
|
||||||
containerMemory: cloud_runner_options_1.default.containerMemory,
|
containerMemory: cloud_runner_options_1.default.containerMemory,
|
||||||
|
@ -751,6 +752,7 @@ const core = __importStar(__nccwpck_require__(42186));
|
||||||
const test_1 = __importDefault(__nccwpck_require__(63007));
|
const test_1 = __importDefault(__nccwpck_require__(63007));
|
||||||
const local_1 = __importDefault(__nccwpck_require__(66575));
|
const local_1 = __importDefault(__nccwpck_require__(66575));
|
||||||
const docker_1 = __importDefault(__nccwpck_require__(42802));
|
const docker_1 = __importDefault(__nccwpck_require__(42802));
|
||||||
|
const provider_loader_1 = __importDefault(__nccwpck_require__(45788));
|
||||||
const github_1 = __importDefault(__nccwpck_require__(83654));
|
const github_1 = __importDefault(__nccwpck_require__(83654));
|
||||||
const shared_workspace_locking_1 = __importDefault(__nccwpck_require__(71372));
|
const shared_workspace_locking_1 = __importDefault(__nccwpck_require__(71372));
|
||||||
const follow_log_stream_service_1 = __nccwpck_require__(40266);
|
const follow_log_stream_service_1 = __nccwpck_require__(40266);
|
||||||
|
@ -769,7 +771,7 @@ class CloudRunner {
|
||||||
if (CloudRunner.buildParameters.githubCheckId === ``) {
|
if (CloudRunner.buildParameters.githubCheckId === ``) {
|
||||||
CloudRunner.buildParameters.githubCheckId = await github_1.default.createGitHubCheck(CloudRunner.buildParameters.buildGuid);
|
CloudRunner.buildParameters.githubCheckId = await github_1.default.createGitHubCheck(CloudRunner.buildParameters.buildGuid);
|
||||||
}
|
}
|
||||||
CloudRunner.setupSelectedBuildPlatform();
|
await CloudRunner.setupSelectedBuildPlatform();
|
||||||
CloudRunner.defaultSecrets = task_parameter_serializer_1.TaskParameterSerializer.readDefaultSecrets();
|
CloudRunner.defaultSecrets = task_parameter_serializer_1.TaskParameterSerializer.readDefaultSecrets();
|
||||||
CloudRunner.cloudRunnerEnvironmentVariables =
|
CloudRunner.cloudRunnerEnvironmentVariables =
|
||||||
task_parameter_serializer_1.TaskParameterSerializer.createCloudRunnerEnvironmentVariables(buildParameters);
|
task_parameter_serializer_1.TaskParameterSerializer.createCloudRunnerEnvironmentVariables(buildParameters);
|
||||||
|
@ -787,7 +789,7 @@ class CloudRunner {
|
||||||
}
|
}
|
||||||
follow_log_stream_service_1.FollowLogStreamService.Reset();
|
follow_log_stream_service_1.FollowLogStreamService.Reset();
|
||||||
}
|
}
|
||||||
static setupSelectedBuildPlatform() {
|
static async setupSelectedBuildPlatform() {
|
||||||
cloud_runner_logger_1.default.log(`Cloud Runner platform selected ${CloudRunner.buildParameters.providerStrategy}`);
|
cloud_runner_logger_1.default.log(`Cloud Runner platform selected ${CloudRunner.buildParameters.providerStrategy}`);
|
||||||
switch (CloudRunner.buildParameters.providerStrategy) {
|
switch (CloudRunner.buildParameters.providerStrategy) {
|
||||||
case 'k8s':
|
case 'k8s':
|
||||||
|
@ -805,6 +807,10 @@ class CloudRunner {
|
||||||
case 'local-system':
|
case 'local-system':
|
||||||
CloudRunner.Provider = new local_1.default();
|
CloudRunner.Provider = new local_1.default();
|
||||||
break;
|
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) {
|
static async run(buildParameters, baseImage) {
|
||||||
|
@ -1214,6 +1220,9 @@ class CloudRunnerOptions {
|
||||||
}
|
}
|
||||||
return provider || 'local';
|
return provider || 'local';
|
||||||
}
|
}
|
||||||
|
static get providerPackage() {
|
||||||
|
return (CloudRunnerOptions.getInput('providerPackage') || `unity-builder-provider-${CloudRunnerOptions.providerStrategy}`);
|
||||||
|
}
|
||||||
static get containerCpu() {
|
static get containerCpu() {
|
||||||
return CloudRunnerOptions.getInput('containerCpu') || `1024`;
|
return CloudRunnerOptions.getInput('containerCpu') || `1024`;
|
||||||
}
|
}
|
||||||
|
@ -4214,6 +4223,78 @@ class LocalCloudRunner {
|
||||||
exports["default"] = 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:
|
/***/ 63007:
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -54,6 +54,7 @@ class BuildParameters {
|
||||||
public sshAgent!: string;
|
public sshAgent!: string;
|
||||||
public sshPublicKeysDirectoryPath!: string;
|
public sshPublicKeysDirectoryPath!: string;
|
||||||
public providerStrategy!: string;
|
public providerStrategy!: string;
|
||||||
|
public providerPackage!: string;
|
||||||
public gitPrivateToken!: string;
|
public gitPrivateToken!: string;
|
||||||
public awsStackName!: string;
|
public awsStackName!: string;
|
||||||
public kubeConfig!: string;
|
public kubeConfig!: string;
|
||||||
|
@ -183,6 +184,7 @@ class BuildParameters {
|
||||||
containerRegistryRepository: Input.containerRegistryRepository,
|
containerRegistryRepository: Input.containerRegistryRepository,
|
||||||
containerRegistryImageVersion: Input.containerRegistryImageVersion,
|
containerRegistryImageVersion: Input.containerRegistryImageVersion,
|
||||||
providerStrategy: CloudRunnerOptions.providerStrategy,
|
providerStrategy: CloudRunnerOptions.providerStrategy,
|
||||||
|
providerPackage: CloudRunnerOptions.providerPackage,
|
||||||
buildPlatform: CloudRunnerOptions.buildPlatform,
|
buildPlatform: CloudRunnerOptions.buildPlatform,
|
||||||
kubeConfig: CloudRunnerOptions.kubeConfig,
|
kubeConfig: CloudRunnerOptions.kubeConfig,
|
||||||
containerMemory: CloudRunnerOptions.containerMemory,
|
containerMemory: CloudRunnerOptions.containerMemory,
|
||||||
|
|
|
@ -84,7 +84,7 @@ class CloudRunner {
|
||||||
default:
|
default:
|
||||||
if (CloudRunner.buildParameters.providerStrategy !== 'local') {
|
if (CloudRunner.buildParameters.providerStrategy !== 'local') {
|
||||||
CloudRunner.Provider = await loadProvider(
|
CloudRunner.Provider = await loadProvider(
|
||||||
CloudRunner.buildParameters.providerStrategy,
|
CloudRunner.buildParameters.providerPackage,
|
||||||
CloudRunner.buildParameters,
|
CloudRunner.buildParameters,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -127,6 +127,12 @@ class CloudRunnerOptions {
|
||||||
return provider || 'local';
|
return provider || 'local';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static get providerPackage(): string {
|
||||||
|
return (
|
||||||
|
CloudRunnerOptions.getInput('providerPackage') || `unity-builder-provider-${CloudRunnerOptions.providerStrategy}`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
static get containerCpu(): string {
|
static get containerCpu(): string {
|
||||||
return CloudRunnerOptions.getInput('containerCpu') || `1024`;
|
return CloudRunnerOptions.getInput('containerCpu') || `1024`;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue