@zincapp/znvault-plugin-payara 1.8.0 → 1.9.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli/commands/deploy-run.d.ts +1 -1
- package/dist/cli/commands/deploy-run.d.ts.map +1 -1
- package/dist/cli/commands/deploy-run.js +30 -24
- package/dist/cli/commands/deploy-run.js.map +1 -1
- package/dist/cli/index.d.ts +4 -1
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +4 -0
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/progress.d.ts +21 -1
- package/dist/cli/progress.d.ts.map +1 -1
- package/dist/cli/progress.js +72 -4
- package/dist/cli/progress.js.map +1 -1
- package/dist/cli/strategy-executor.d.ts +65 -0
- package/dist/cli/strategy-executor.d.ts.map +1 -0
- package/dist/cli/strategy-executor.js +135 -0
- package/dist/cli/strategy-executor.js.map +1 -0
- package/dist/cli/types.d.ts +54 -0
- package/dist/cli/types.d.ts.map +1 -1
- package/dist/cli/types.js +68 -1
- package/dist/cli/types.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +17 -1
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-run.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/deploy-run.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiBzC,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"deploy-run.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/deploy-run.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiBzC,OAAO,EACL,KAAK,gBAAgB,EAItB,MAAM,aAAa,CAAC;AAKrB;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,OAAO,EACf,GAAG,EAAE,gBAAgB,GACpB,IAAI,CA6QN"}
|
|
@@ -6,8 +6,10 @@ import { loadDeployConfigs } from '../config-store.js';
|
|
|
6
6
|
import { getWarInfo, ProgressReporter, } from '../progress.js';
|
|
7
7
|
import { ANSI } from '../constants.js';
|
|
8
8
|
import { checkPluginVersions, triggerPluginUpdate, checkHostReachable, } from '../host-checks.js';
|
|
9
|
+
import { parseDeploymentStrategy, getStrategyDisplayName, } from '../types.js';
|
|
9
10
|
import { getErrorMessage } from '../../utils/error.js';
|
|
10
11
|
import { deployToHost } from './deploy.js';
|
|
12
|
+
import { executeStrategy, resolveStrategy } from '../strategy-executor.js';
|
|
11
13
|
/**
|
|
12
14
|
* Register deploy run command for multi-host deployment
|
|
13
15
|
*/
|
|
@@ -19,6 +21,7 @@ export function registerDeployRunCommand(deploy, ctx) {
|
|
|
19
21
|
.option('-f, --force', 'Force full deployment (no diff)')
|
|
20
22
|
.option('--dry-run', 'Show what would be deployed without deploying')
|
|
21
23
|
.option('--sequential', 'Deploy to hosts one at a time (override parallel setting)')
|
|
24
|
+
.option('-s, --strategy <strategy>', 'Deployment strategy: sequential, parallel, or canary (e.g., 1+R, 1+2, 2+3+R)')
|
|
22
25
|
.option('--skip-preflight', 'Skip pre-flight checks')
|
|
23
26
|
.option('--skip-version-check', 'Skip plugin version check')
|
|
24
27
|
.option('--update-plugins', 'Update plugins if updates are available')
|
|
@@ -56,13 +59,28 @@ export function registerDeployRunCommand(deploy, ctx) {
|
|
|
56
59
|
ctx.output.info(`Deploying ${configName}`);
|
|
57
60
|
}
|
|
58
61
|
progress.showWarInfo(warInfo);
|
|
62
|
+
// Resolve deployment strategy
|
|
63
|
+
const strategyString = resolveStrategy({
|
|
64
|
+
strategy: options.strategy,
|
|
65
|
+
sequential: options.sequential,
|
|
66
|
+
configStrategy: config.strategy,
|
|
67
|
+
configParallel: config.parallel,
|
|
68
|
+
});
|
|
69
|
+
let strategy;
|
|
70
|
+
try {
|
|
71
|
+
strategy = parseDeploymentStrategy(strategyString);
|
|
72
|
+
}
|
|
73
|
+
catch (err) {
|
|
74
|
+
ctx.output.error(getErrorMessage(err));
|
|
75
|
+
process.exit(1);
|
|
76
|
+
}
|
|
59
77
|
if (!ctx.isPlainMode()) {
|
|
60
78
|
console.log(`${ANSI.dim} Hosts: ${ANSI.reset}${config.hosts.length}`);
|
|
61
|
-
|
|
79
|
+
progress.showStrategy(getStrategyDisplayName(strategy), strategy.isCanary);
|
|
62
80
|
}
|
|
63
81
|
else {
|
|
64
82
|
ctx.output.info(` Hosts: ${config.hosts.length}`);
|
|
65
|
-
ctx.output.info(`
|
|
83
|
+
ctx.output.info(` Strategy: ${getStrategyDisplayName(strategy)}`);
|
|
66
84
|
}
|
|
67
85
|
// Pre-flight checks
|
|
68
86
|
if (!options.skipPreflight) {
|
|
@@ -183,37 +201,25 @@ export function registerDeployRunCommand(deploy, ctx) {
|
|
|
183
201
|
ctx.output.info(`Dry run - would deploy ${warInfo.fileCount} files to ${config.hosts.length} host(s)`);
|
|
184
202
|
return;
|
|
185
203
|
}
|
|
186
|
-
|
|
187
|
-
const
|
|
204
|
+
// Deploy function for strategy executor
|
|
205
|
+
const deployFn = async (host) => {
|
|
188
206
|
progress.setHost(host);
|
|
189
207
|
const result = await deployToHost(ctx, host, config.port, warPath, localHashes, options.force ?? false, progress);
|
|
190
|
-
results.push({
|
|
191
|
-
host,
|
|
192
|
-
success: result.success,
|
|
193
|
-
error: result.error,
|
|
194
|
-
result: result.result,
|
|
195
|
-
});
|
|
196
208
|
if (result.success && result.result) {
|
|
197
209
|
progress.deployed(result.result);
|
|
198
210
|
}
|
|
199
211
|
else {
|
|
200
212
|
progress.failed(result.error ?? 'Unknown error');
|
|
201
213
|
}
|
|
214
|
+
return result;
|
|
202
215
|
};
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
// Parallel deployment
|
|
211
|
-
await Promise.all(config.hosts.map(deployToHostWrapper));
|
|
212
|
-
}
|
|
213
|
-
const successful = results.filter(r => r.success).length;
|
|
214
|
-
const failed = results.filter(r => !r.success).length;
|
|
215
|
-
progress.summary(successful, config.hosts.length, failed);
|
|
216
|
-
if (failed > 0) {
|
|
216
|
+
// Execute deployment strategy
|
|
217
|
+
const executionResult = await executeStrategy(strategy, config.hosts, deployFn, {
|
|
218
|
+
abortOnFailure: strategy.isCanary, // Only abort on failure for canary strategies
|
|
219
|
+
progress,
|
|
220
|
+
});
|
|
221
|
+
progress.summary(executionResult.successful, executionResult.total, executionResult.failed, executionResult.skipped);
|
|
222
|
+
if (executionResult.failed > 0 || executionResult.aborted) {
|
|
217
223
|
process.exit(1);
|
|
218
224
|
}
|
|
219
225
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-run.js","sourceRoot":"","sources":["../../../src/cli/commands/deploy-run.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,wEAAwE;AAGxE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EACL,UAAU,EACV,gBAAgB,GAGjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy-run.js","sourceRoot":"","sources":["../../../src/cli/commands/deploy-run.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/index.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export { CHUNK_SIZE, MAX_RETRIES, RETRY_BASE_DELAY_MS, AGENT_TIMEOUT_MS, DEPLOYMENT_TIMEOUT_MS, STATUS_POLL_INTERVAL_MS, STATUS_POLL_MAX_WAIT_MS, CONFIG_DIR, CONFIG_FILE, ANSI, getRetryDelay, parsePort, } from './constants.js';
|
|
2
|
-
export type { CLIPluginContext, CLIPlugin, DeployConfig, DeployConfigStore, DeploymentStatusResponse, AgentPostResult, HostReachableResult, PluginVersionInfo, PluginVersionsResponse, PluginUpdateResult, PluginUpdateResponse, PluginVersionCheckResult, TriggerUpdateResult, DeployToHostResult, } from './types.js';
|
|
2
|
+
export type { CLIPluginContext, CLIPlugin, DeployConfig, DeployConfigStore, DeploymentStatusResponse, AgentPostResult, HostReachableResult, PluginVersionInfo, PluginVersionsResponse, PluginUpdateResult, PluginUpdateResponse, PluginVersionCheckResult, TriggerUpdateResult, DeployToHostResult, DeploymentStrategy, DeploymentStrategyBatch, } from './types.js';
|
|
3
|
+
export { parseDeploymentStrategy, getStrategyDisplayName, } from './types.js';
|
|
3
4
|
export { agentGet, agentPost, agentPostWithStatus, pollDeploymentStatus, buildPluginUrl, } from './http-client.js';
|
|
4
5
|
export type { ProgressCallback } from './http-client.js';
|
|
5
6
|
export { formatSize, formatDuration, formatDate, progressBar, truncatePath, formatCount, } from './formatters.js';
|
|
@@ -7,4 +8,6 @@ export { ProgressReporter, getWarInfo, } from './progress.js';
|
|
|
7
8
|
export type { WarInfo, PreflightResult, } from './progress.js';
|
|
8
9
|
export { loadDeployConfigs, saveDeployConfigs, getConfig, configExists, listConfigNames, } from './config-store.js';
|
|
9
10
|
export { checkPluginVersions, triggerPluginUpdate, checkHostReachable, } from './host-checks.js';
|
|
11
|
+
export { executeStrategy, resolveStrategy, } from './strategy-executor.js';
|
|
12
|
+
export type { StrategyExecutionResult, StrategyExecutorOptions, } from './strategy-executor.js';
|
|
10
13
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/cli/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,UAAU,EACV,WAAW,EACX,mBAAmB,EACnB,gBAAgB,EAChB,qBAAqB,EACrB,uBAAuB,EACvB,uBAAuB,EACvB,UAAU,EACV,WAAW,EACX,IAAI,EACJ,aAAa,EACb,SAAS,GACV,MAAM,gBAAgB,CAAC;AAGxB,YAAY,EACV,gBAAgB,EAChB,SAAS,EACT,YAAY,EACZ,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EACf,mBAAmB,EACnB,iBAAiB,EACjB,sBAAsB,EACtB,kBAAkB,EAClB,oBAAoB,EACpB,wBAAwB,EACxB,mBAAmB,EACnB,kBAAkB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,UAAU,EACV,WAAW,EACX,mBAAmB,EACnB,gBAAgB,EAChB,qBAAqB,EACrB,uBAAuB,EACvB,uBAAuB,EACvB,UAAU,EACV,WAAW,EACX,IAAI,EACJ,aAAa,EACb,SAAS,GACV,MAAM,gBAAgB,CAAC;AAGxB,YAAY,EACV,gBAAgB,EAChB,SAAS,EACT,YAAY,EACZ,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EACf,mBAAmB,EACnB,iBAAiB,EACjB,sBAAsB,EACtB,kBAAkB,EAClB,oBAAoB,EACpB,wBAAwB,EACxB,mBAAmB,EACnB,kBAAkB,EAClB,kBAAkB,EAClB,uBAAuB,GACxB,MAAM,YAAY,CAAC;AAGpB,OAAO,EACL,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,YAAY,CAAC;AAGpB,OAAO,EACL,QAAQ,EACR,SAAS,EACT,mBAAmB,EACnB,oBAAoB,EACpB,cAAc,GACf,MAAM,kBAAkB,CAAC;AAC1B,YAAY,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGzD,OAAO,EACL,UAAU,EACV,cAAc,EACd,UAAU,EACV,WAAW,EACX,YAAY,EACZ,WAAW,GACZ,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,gBAAgB,EAChB,UAAU,GACX,MAAM,eAAe,CAAC;AACvB,YAAY,EACV,OAAO,EACP,eAAe,GAChB,MAAM,eAAe,CAAC;AAGvB,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,SAAS,EACT,YAAY,EACZ,eAAe,GAChB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACL,eAAe,EACf,eAAe,GAChB,MAAM,wBAAwB,CAAC;AAChC,YAAY,EACV,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,wBAAwB,CAAC"}
|
package/dist/cli/index.js
CHANGED
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
// CLI module entry point - re-exports all CLI components
|
|
3
3
|
// Constants
|
|
4
4
|
export { CHUNK_SIZE, MAX_RETRIES, RETRY_BASE_DELAY_MS, AGENT_TIMEOUT_MS, DEPLOYMENT_TIMEOUT_MS, STATUS_POLL_INTERVAL_MS, STATUS_POLL_MAX_WAIT_MS, CONFIG_DIR, CONFIG_FILE, ANSI, getRetryDelay, parsePort, } from './constants.js';
|
|
5
|
+
// Strategy functions
|
|
6
|
+
export { parseDeploymentStrategy, getStrategyDisplayName, } from './types.js';
|
|
5
7
|
// HTTP client
|
|
6
8
|
export { agentGet, agentPost, agentPostWithStatus, pollDeploymentStatus, buildPluginUrl, } from './http-client.js';
|
|
7
9
|
// Formatters
|
|
@@ -12,3 +14,5 @@ export { ProgressReporter, getWarInfo, } from './progress.js';
|
|
|
12
14
|
export { loadDeployConfigs, saveDeployConfigs, getConfig, configExists, listConfigNames, } from './config-store.js';
|
|
13
15
|
// Host checks
|
|
14
16
|
export { checkPluginVersions, triggerPluginUpdate, checkHostReachable, } from './host-checks.js';
|
|
17
|
+
// Strategy executor
|
|
18
|
+
export { executeStrategy, resolveStrategy, } from './strategy-executor.js';
|
package/dist/cli/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"AAAA,yBAAyB;AACzB,yDAAyD;AAEzD,YAAY;AACZ,OAAO,EACL,UAAU,EACV,WAAW,EACX,mBAAmB,EACnB,gBAAgB,EAChB,qBAAqB,EACrB,uBAAuB,EACvB,uBAAuB,EACvB,UAAU,EACV,WAAW,EACX,IAAI,EACJ,aAAa,EACb,SAAS,GACV,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"AAAA,yBAAyB;AACzB,yDAAyD;AAEzD,YAAY;AACZ,OAAO,EACL,UAAU,EACV,WAAW,EACX,mBAAmB,EACnB,gBAAgB,EAChB,qBAAqB,EACrB,uBAAuB,EACvB,uBAAuB,EACvB,UAAU,EACV,WAAW,EACX,IAAI,EACJ,aAAa,EACb,SAAS,GACV,MAAM,gBAAgB,CAAC;AAsBxB,qBAAqB;AACrB,OAAO,EACL,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,YAAY,CAAC;AAEpB,cAAc;AACd,OAAO,EACL,QAAQ,EACR,SAAS,EACT,mBAAmB,EACnB,oBAAoB,EACpB,cAAc,GACf,MAAM,kBAAkB,CAAC;AAG1B,aAAa;AACb,OAAO,EACL,UAAU,EACV,cAAc,EACd,UAAU,EACV,WAAW,EACX,YAAY,EACZ,WAAW,GACZ,MAAM,iBAAiB,CAAC;AAEzB,oBAAoB;AACpB,OAAO,EACL,gBAAgB,EAChB,UAAU,GACX,MAAM,eAAe,CAAC;AAMvB,eAAe;AACf,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,SAAS,EACT,YAAY,EACZ,eAAe,GAChB,MAAM,mBAAmB,CAAC;AAE3B,cAAc;AACd,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,kBAAkB,CAAC;AAE1B,oBAAoB;AACpB,OAAO,EACL,eAAe,EACf,eAAe,GAChB,MAAM,wBAAwB,CAAC"}
|
package/dist/cli/progress.d.ts
CHANGED
|
@@ -76,6 +76,26 @@ export declare class ProgressReporter implements ProgressCallback {
|
|
|
76
76
|
* Show verification step
|
|
77
77
|
*/
|
|
78
78
|
verifyingDeployment(): void;
|
|
79
|
-
summary(successful: number, total: number, failed: number): void;
|
|
79
|
+
summary(successful: number, total: number, failed: number, skipped?: number): void;
|
|
80
|
+
/**
|
|
81
|
+
* Show the strategy being used
|
|
82
|
+
*/
|
|
83
|
+
showStrategy(strategyName: string, isCanary: boolean): void;
|
|
84
|
+
/**
|
|
85
|
+
* Show batch header for canary deployments
|
|
86
|
+
*/
|
|
87
|
+
showBatchHeader(batchNumber: number, totalBatches: number, hostCount: number, batchLabel: string): void;
|
|
88
|
+
/**
|
|
89
|
+
* Show batch completion result
|
|
90
|
+
*/
|
|
91
|
+
showBatchResult(batchNumber: number, successes: number, failures: number): void;
|
|
92
|
+
/**
|
|
93
|
+
* Show canary abort message when a batch fails
|
|
94
|
+
*/
|
|
95
|
+
showCanaryAbort(failedBatch: number, skippedHosts: number): void;
|
|
96
|
+
/**
|
|
97
|
+
* Show canary success message before proceeding to next batch
|
|
98
|
+
*/
|
|
99
|
+
showCanaryProceeding(nextBatch: number, totalBatches: number): void;
|
|
80
100
|
}
|
|
81
101
|
//# sourceMappingURL=progress.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"progress.d.ts","sourceRoot":"","sources":["../../src/cli/progress.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"progress.d.ts","sourceRoot":"","sources":["../../src/cli/progress.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/progress.js
CHANGED
|
@@ -447,18 +447,86 @@ export class ProgressReporter {
|
|
|
447
447
|
console.log(` ${ANSI.cyan}🔍${ANSI.reset} Verifying deployment completed...`);
|
|
448
448
|
}
|
|
449
449
|
}
|
|
450
|
-
summary(successful, total, failed) {
|
|
450
|
+
summary(successful, total, failed, skipped) {
|
|
451
451
|
console.log('');
|
|
452
|
+
const skippedText = skipped && skipped > 0 ? `, ${skipped} skipped` : '';
|
|
452
453
|
if (this.isPlain) {
|
|
453
|
-
console.log(`Deployment complete: ${successful}/${total} hosts successful${failed > 0 ? `, ${failed} failed` : ''}`);
|
|
454
|
+
console.log(`Deployment complete: ${successful}/${total} hosts successful${failed > 0 ? `, ${failed} failed` : ''}${skippedText}`);
|
|
454
455
|
}
|
|
455
456
|
else {
|
|
456
|
-
if (failed === 0) {
|
|
457
|
+
if (failed === 0 && (!skipped || skipped === 0)) {
|
|
457
458
|
console.log(`${ANSI.bold}${ANSI.green}✓ Deployment complete${ANSI.reset}: ${successful}/${total} hosts successful`);
|
|
458
459
|
}
|
|
459
460
|
else {
|
|
460
|
-
|
|
461
|
+
const failedPart = failed > 0 ? `, ${ANSI.red}${failed} failed${ANSI.reset}` : '';
|
|
462
|
+
const skippedPart = skipped && skipped > 0 ? `, ${ANSI.yellow}${skipped} skipped${ANSI.reset}` : '';
|
|
463
|
+
console.log(`${ANSI.bold}${ANSI.yellow}⚠ Deployment complete${ANSI.reset}: ${successful}/${total} hosts successful${failedPart}${skippedPart}`);
|
|
461
464
|
}
|
|
462
465
|
}
|
|
463
466
|
}
|
|
467
|
+
// ===== Canary/Batch Deployment Methods =====
|
|
468
|
+
/**
|
|
469
|
+
* Show the strategy being used
|
|
470
|
+
*/
|
|
471
|
+
showStrategy(strategyName, isCanary) {
|
|
472
|
+
if (this.isPlain) {
|
|
473
|
+
console.log(` Strategy: ${strategyName}`);
|
|
474
|
+
}
|
|
475
|
+
else {
|
|
476
|
+
const strategyLabel = isCanary
|
|
477
|
+
? `${ANSI.cyan}canary${ANSI.reset} (${strategyName})`
|
|
478
|
+
: strategyName;
|
|
479
|
+
console.log(`${ANSI.dim} Strategy: ${ANSI.reset}${strategyLabel}`);
|
|
480
|
+
}
|
|
481
|
+
}
|
|
482
|
+
/**
|
|
483
|
+
* Show batch header for canary deployments
|
|
484
|
+
*/
|
|
485
|
+
showBatchHeader(batchNumber, totalBatches, hostCount, batchLabel) {
|
|
486
|
+
const batchName = batchLabel === 'rest' ? 'remaining' : batchLabel;
|
|
487
|
+
const hostsWord = hostCount === 1 ? 'host' : 'hosts';
|
|
488
|
+
if (this.isPlain) {
|
|
489
|
+
console.log(`\nBatch ${batchNumber}/${totalBatches}: deploying to ${hostCount} ${hostsWord} (${batchName})`);
|
|
490
|
+
}
|
|
491
|
+
else {
|
|
492
|
+
console.log(`\n${ANSI.bold}${ANSI.blue}━━━ Batch ${batchNumber}/${totalBatches}${ANSI.reset} ${ANSI.dim}(${hostCount} ${hostsWord}${batchLabel === 'rest' ? ' - remaining' : ''})${ANSI.reset}`);
|
|
493
|
+
}
|
|
494
|
+
}
|
|
495
|
+
/**
|
|
496
|
+
* Show batch completion result
|
|
497
|
+
*/
|
|
498
|
+
showBatchResult(batchNumber, successes, failures) {
|
|
499
|
+
if (this.isPlain) {
|
|
500
|
+
console.log(`Batch ${batchNumber}: ${successes} succeeded, ${failures} failed`);
|
|
501
|
+
}
|
|
502
|
+
else {
|
|
503
|
+
if (failures === 0) {
|
|
504
|
+
console.log(`${ANSI.dim} Batch ${batchNumber}:${ANSI.reset} ${ANSI.green}✓ ${successes} succeeded${ANSI.reset}`);
|
|
505
|
+
}
|
|
506
|
+
else {
|
|
507
|
+
console.log(`${ANSI.dim} Batch ${batchNumber}:${ANSI.reset} ${ANSI.green}${successes} succeeded${ANSI.reset}, ${ANSI.red}${failures} failed${ANSI.reset}`);
|
|
508
|
+
}
|
|
509
|
+
}
|
|
510
|
+
}
|
|
511
|
+
/**
|
|
512
|
+
* Show canary abort message when a batch fails
|
|
513
|
+
*/
|
|
514
|
+
showCanaryAbort(failedBatch, skippedHosts) {
|
|
515
|
+
const hostsWord = skippedHosts === 1 ? 'host' : 'hosts';
|
|
516
|
+
if (this.isPlain) {
|
|
517
|
+
console.log(`\nCanary failed at batch ${failedBatch}. Aborting deployment.`);
|
|
518
|
+
console.log(`Skipped ${skippedHosts} remaining ${hostsWord}.`);
|
|
519
|
+
}
|
|
520
|
+
else {
|
|
521
|
+
console.log(`\n${ANSI.red}${ANSI.bold}✗ Canary failed${ANSI.reset} at batch ${failedBatch}. ${ANSI.yellow}Skipping ${skippedHosts} remaining ${hostsWord}.${ANSI.reset}`);
|
|
522
|
+
}
|
|
523
|
+
}
|
|
524
|
+
/**
|
|
525
|
+
* Show canary success message before proceeding to next batch
|
|
526
|
+
*/
|
|
527
|
+
showCanaryProceeding(nextBatch, totalBatches) {
|
|
528
|
+
if (!this.isPlain) {
|
|
529
|
+
console.log(`${ANSI.dim} Proceeding to batch ${nextBatch}/${totalBatches}...${ANSI.reset}`);
|
|
530
|
+
}
|
|
531
|
+
}
|
|
464
532
|
}
|
package/dist/cli/progress.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"progress.js","sourceRoot":"","sources":["../../src/cli/progress.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"progress.js","sourceRoot":"","sources":["../../src/cli/progress.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import type { DeploymentStrategy, DeployToHostResult } from './types.js';
|
|
2
|
+
import type { ProgressReporter } from './progress.js';
|
|
3
|
+
/**
|
|
4
|
+
* Result of executing a deployment strategy
|
|
5
|
+
*/
|
|
6
|
+
export interface StrategyExecutionResult {
|
|
7
|
+
/** Total hosts processed */
|
|
8
|
+
total: number;
|
|
9
|
+
/** Successful deployments */
|
|
10
|
+
successful: number;
|
|
11
|
+
/** Failed deployments */
|
|
12
|
+
failed: number;
|
|
13
|
+
/** Hosts that were skipped (due to earlier batch failure in canary mode) */
|
|
14
|
+
skipped: number;
|
|
15
|
+
/** Results per host */
|
|
16
|
+
results: Map<string, DeployToHostResult>;
|
|
17
|
+
/** Whether the deployment was aborted due to canary failure */
|
|
18
|
+
aborted: boolean;
|
|
19
|
+
/** The batch that failed (if aborted) */
|
|
20
|
+
failedBatch?: number;
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* Options for strategy execution
|
|
24
|
+
*/
|
|
25
|
+
export interface StrategyExecutorOptions {
|
|
26
|
+
/** Abort on first failure in canary mode */
|
|
27
|
+
abortOnFailure?: boolean;
|
|
28
|
+
/** Progress reporter for visual feedback */
|
|
29
|
+
progress?: ProgressReporter;
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
* Execute a deployment strategy across multiple hosts
|
|
33
|
+
*
|
|
34
|
+
* @param strategy Parsed deployment strategy
|
|
35
|
+
* @param hosts List of host addresses to deploy to
|
|
36
|
+
* @param deployFn Function to deploy to a single host (returns promise)
|
|
37
|
+
* @param options Execution options
|
|
38
|
+
* @returns Execution result with success/failure counts
|
|
39
|
+
*
|
|
40
|
+
* @example
|
|
41
|
+
* // Canary deployment: 1 host first, then rest
|
|
42
|
+
* const strategy = parseDeploymentStrategy('1+R');
|
|
43
|
+
* const result = await executeStrategy(strategy, hosts, deployToHost, {
|
|
44
|
+
* abortOnFailure: true,
|
|
45
|
+
* progress: reporter,
|
|
46
|
+
* });
|
|
47
|
+
*/
|
|
48
|
+
export declare function executeStrategy(strategy: DeploymentStrategy, hosts: string[], deployFn: (host: string) => Promise<DeployToHostResult>, options?: StrategyExecutorOptions): Promise<StrategyExecutionResult>;
|
|
49
|
+
/**
|
|
50
|
+
* Resolve effective strategy from config and CLI options
|
|
51
|
+
*
|
|
52
|
+
* Priority:
|
|
53
|
+
* 1. Explicit --strategy flag
|
|
54
|
+
* 2. --sequential flag (maps to "sequential")
|
|
55
|
+
* 3. config.strategy field
|
|
56
|
+
* 4. config.parallel field (legacy: true → "parallel", false → "sequential")
|
|
57
|
+
* 5. Default: "sequential"
|
|
58
|
+
*/
|
|
59
|
+
export declare function resolveStrategy(options: {
|
|
60
|
+
strategy?: string;
|
|
61
|
+
sequential?: boolean;
|
|
62
|
+
configStrategy?: string;
|
|
63
|
+
configParallel?: boolean;
|
|
64
|
+
}): string;
|
|
65
|
+
//# sourceMappingURL=strategy-executor.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"strategy-executor.d.ts","sourceRoot":"","sources":["../../src/cli/strategy-executor.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AACzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEtD;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,4BAA4B;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,6BAA6B;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,yBAAyB;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,4EAA4E;IAC5E,OAAO,EAAE,MAAM,CAAC;IAChB,uBAAuB;IACvB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IACzC,+DAA+D;IAC/D,OAAO,EAAE,OAAO,CAAC;IACjB,yCAAyC;IACzC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,4CAA4C;IAC5C,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,4CAA4C;IAC5C,QAAQ,CAAC,EAAE,gBAAgB,CAAC;CAC7B;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,kBAAkB,EAC5B,KAAK,EAAE,MAAM,EAAE,EACf,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,kBAAkB,CAAC,EACvD,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,uBAAuB,CAAC,CAwGlC;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,GAAG,MAAM,CAuBT"}
|
|
@@ -0,0 +1,135 @@
|
|
|
1
|
+
// Path: src/cli/strategy-executor.ts
|
|
2
|
+
// Deployment strategy executor for canary/rolling deployments
|
|
3
|
+
/**
|
|
4
|
+
* Execute a deployment strategy across multiple hosts
|
|
5
|
+
*
|
|
6
|
+
* @param strategy Parsed deployment strategy
|
|
7
|
+
* @param hosts List of host addresses to deploy to
|
|
8
|
+
* @param deployFn Function to deploy to a single host (returns promise)
|
|
9
|
+
* @param options Execution options
|
|
10
|
+
* @returns Execution result with success/failure counts
|
|
11
|
+
*
|
|
12
|
+
* @example
|
|
13
|
+
* // Canary deployment: 1 host first, then rest
|
|
14
|
+
* const strategy = parseDeploymentStrategy('1+R');
|
|
15
|
+
* const result = await executeStrategy(strategy, hosts, deployToHost, {
|
|
16
|
+
* abortOnFailure: true,
|
|
17
|
+
* progress: reporter,
|
|
18
|
+
* });
|
|
19
|
+
*/
|
|
20
|
+
export async function executeStrategy(strategy, hosts, deployFn, options = {}) {
|
|
21
|
+
const { abortOnFailure = true, progress } = options;
|
|
22
|
+
const results = new Map();
|
|
23
|
+
let successful = 0;
|
|
24
|
+
let failed = 0;
|
|
25
|
+
let skipped = 0;
|
|
26
|
+
let aborted = false;
|
|
27
|
+
let failedBatch;
|
|
28
|
+
// Track which hosts we've processed
|
|
29
|
+
let hostIndex = 0;
|
|
30
|
+
let batchIndex = 0;
|
|
31
|
+
// Process batches until all hosts are done
|
|
32
|
+
// For non-canary strategies (sequential/parallel), we may need to repeat the batch pattern
|
|
33
|
+
while (hostIndex < hosts.length) {
|
|
34
|
+
// Get current batch (cycle through batches for non-canary strategies)
|
|
35
|
+
const effectiveBatchIndex = strategy.isCanary
|
|
36
|
+
? batchIndex
|
|
37
|
+
: batchIndex % strategy.batches.length;
|
|
38
|
+
const batch = strategy.batches[effectiveBatchIndex];
|
|
39
|
+
// If we've run out of batches in canary mode, stop
|
|
40
|
+
if (!batch) {
|
|
41
|
+
break;
|
|
42
|
+
}
|
|
43
|
+
// Determine how many hosts in this batch
|
|
44
|
+
const batchSize = batch.count === 'rest'
|
|
45
|
+
? hosts.length - hostIndex
|
|
46
|
+
: Math.min(batch.count, hosts.length - hostIndex);
|
|
47
|
+
if (batchSize <= 0) {
|
|
48
|
+
// No more hosts to process
|
|
49
|
+
break;
|
|
50
|
+
}
|
|
51
|
+
// Get hosts for this batch
|
|
52
|
+
const batchHosts = hosts.slice(hostIndex, hostIndex + batchSize);
|
|
53
|
+
hostIndex += batchSize;
|
|
54
|
+
// Show batch header for canary strategies
|
|
55
|
+
if (strategy.isCanary && progress) {
|
|
56
|
+
progress.showBatchHeader(batchIndex + 1, strategy.batches.length, batchHosts.length, batch.label);
|
|
57
|
+
}
|
|
58
|
+
// Deploy to all hosts in this batch (in parallel within batch)
|
|
59
|
+
const batchPromises = batchHosts.map(async (host) => {
|
|
60
|
+
const result = await deployFn(host);
|
|
61
|
+
results.set(host, result);
|
|
62
|
+
return { host, result };
|
|
63
|
+
});
|
|
64
|
+
const batchResults = await Promise.all(batchPromises);
|
|
65
|
+
// Count successes and failures in this batch
|
|
66
|
+
let batchSuccesses = 0;
|
|
67
|
+
let batchFailures = 0;
|
|
68
|
+
for (const { result } of batchResults) {
|
|
69
|
+
if (result.success) {
|
|
70
|
+
successful++;
|
|
71
|
+
batchSuccesses++;
|
|
72
|
+
}
|
|
73
|
+
else {
|
|
74
|
+
failed++;
|
|
75
|
+
batchFailures++;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
// Show batch summary for canary strategies
|
|
79
|
+
if (strategy.isCanary && progress) {
|
|
80
|
+
progress.showBatchResult(batchIndex + 1, batchSuccesses, batchFailures);
|
|
81
|
+
}
|
|
82
|
+
// Check if we should abort (canary failure)
|
|
83
|
+
if (abortOnFailure && batchFailures > 0 && hostIndex < hosts.length) {
|
|
84
|
+
aborted = true;
|
|
85
|
+
failedBatch = batchIndex + 1;
|
|
86
|
+
// Mark remaining hosts as skipped
|
|
87
|
+
const remainingHosts = hosts.slice(hostIndex);
|
|
88
|
+
skipped = remainingHosts.length;
|
|
89
|
+
if (progress) {
|
|
90
|
+
progress.showCanaryAbort(failedBatch, skipped);
|
|
91
|
+
}
|
|
92
|
+
break;
|
|
93
|
+
}
|
|
94
|
+
batchIndex++;
|
|
95
|
+
}
|
|
96
|
+
return {
|
|
97
|
+
total: hosts.length,
|
|
98
|
+
successful,
|
|
99
|
+
failed,
|
|
100
|
+
skipped,
|
|
101
|
+
results,
|
|
102
|
+
aborted,
|
|
103
|
+
failedBatch,
|
|
104
|
+
};
|
|
105
|
+
}
|
|
106
|
+
/**
|
|
107
|
+
* Resolve effective strategy from config and CLI options
|
|
108
|
+
*
|
|
109
|
+
* Priority:
|
|
110
|
+
* 1. Explicit --strategy flag
|
|
111
|
+
* 2. --sequential flag (maps to "sequential")
|
|
112
|
+
* 3. config.strategy field
|
|
113
|
+
* 4. config.parallel field (legacy: true → "parallel", false → "sequential")
|
|
114
|
+
* 5. Default: "sequential"
|
|
115
|
+
*/
|
|
116
|
+
export function resolveStrategy(options) {
|
|
117
|
+
// 1. Explicit --strategy flag takes precedence
|
|
118
|
+
if (options.strategy) {
|
|
119
|
+
return options.strategy;
|
|
120
|
+
}
|
|
121
|
+
// 2. --sequential flag overrides everything
|
|
122
|
+
if (options.sequential) {
|
|
123
|
+
return 'sequential';
|
|
124
|
+
}
|
|
125
|
+
// 3. Config strategy field
|
|
126
|
+
if (options.configStrategy) {
|
|
127
|
+
return options.configStrategy;
|
|
128
|
+
}
|
|
129
|
+
// 4. Legacy parallel field
|
|
130
|
+
if (options.configParallel !== undefined) {
|
|
131
|
+
return options.configParallel ? 'parallel' : 'sequential';
|
|
132
|
+
}
|
|
133
|
+
// 5. Default
|
|
134
|
+
return 'sequential';
|
|
135
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"strategy-executor.js","sourceRoot":"","sources":["../../src/cli/strategy-executor.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/types.d.ts
CHANGED
|
@@ -31,6 +31,50 @@ export interface CLIPlugin {
|
|
|
31
31
|
description?: string;
|
|
32
32
|
registerCommands(program: Command, ctx: CLIPluginContext): void;
|
|
33
33
|
}
|
|
34
|
+
/**
|
|
35
|
+
* Deployment strategy batch
|
|
36
|
+
* Represents a group of hosts to deploy to in parallel within a batch
|
|
37
|
+
*/
|
|
38
|
+
export interface DeploymentStrategyBatch {
|
|
39
|
+
/** Number of hosts in this batch, or 'rest' for remaining hosts */
|
|
40
|
+
count: number | 'rest';
|
|
41
|
+
/** Label for display (e.g., "1", "2", "rest") */
|
|
42
|
+
label: string;
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* Parsed deployment strategy
|
|
46
|
+
*
|
|
47
|
+
* Examples:
|
|
48
|
+
* - "sequential" → batches with count=1 for each host
|
|
49
|
+
* - "parallel" → single batch with count='rest'
|
|
50
|
+
* - "1+2" → [{count:1}, {count:2}]
|
|
51
|
+
* - "1+R" or "1+rest" → [{count:1}, {count:'rest'}]
|
|
52
|
+
* - "2+3+R" → [{count:2}, {count:3}, {count:'rest'}]
|
|
53
|
+
*/
|
|
54
|
+
export interface DeploymentStrategy {
|
|
55
|
+
/** Original strategy string for display */
|
|
56
|
+
name: string;
|
|
57
|
+
/** Ordered list of batches */
|
|
58
|
+
batches: DeploymentStrategyBatch[];
|
|
59
|
+
/** Whether this is a canary strategy (has multiple batches) */
|
|
60
|
+
isCanary: boolean;
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* Parse a deployment strategy string into a structured strategy
|
|
64
|
+
*
|
|
65
|
+
* @param strategy Strategy string (e.g., "sequential", "parallel", "1+2", "1+R")
|
|
66
|
+
* @returns Parsed deployment strategy
|
|
67
|
+
* @throws Error if strategy format is invalid
|
|
68
|
+
*
|
|
69
|
+
* @example
|
|
70
|
+
* parseDeploymentStrategy("1+R") // → { name: "1+R", batches: [{count:1}, {count:'rest'}], isCanary: true }
|
|
71
|
+
* parseDeploymentStrategy("sequential") // → { name: "sequential", batches: [{count:1}], isCanary: false }
|
|
72
|
+
*/
|
|
73
|
+
export declare function parseDeploymentStrategy(strategy: string): DeploymentStrategy;
|
|
74
|
+
/**
|
|
75
|
+
* Get display name for a deployment strategy
|
|
76
|
+
*/
|
|
77
|
+
export declare function getStrategyDisplayName(strategy: DeploymentStrategy): string;
|
|
34
78
|
/**
|
|
35
79
|
* Deployment configuration
|
|
36
80
|
*/
|
|
@@ -39,7 +83,17 @@ export interface DeployConfig {
|
|
|
39
83
|
hosts: string[];
|
|
40
84
|
warPath: string;
|
|
41
85
|
port: number;
|
|
86
|
+
/** @deprecated Use strategy instead. Kept for backwards compatibility. */
|
|
42
87
|
parallel: boolean;
|
|
88
|
+
/**
|
|
89
|
+
* Deployment strategy
|
|
90
|
+
* - "sequential" - deploy one host at a time
|
|
91
|
+
* - "parallel" - deploy all hosts at once
|
|
92
|
+
* - "1+R" - deploy to 1 host, if success deploy to rest in parallel
|
|
93
|
+
* - "1+2" - deploy to 1, then 2 in parallel
|
|
94
|
+
* - "2+3+R" - deploy to 2, then 3, then rest in parallel
|
|
95
|
+
*/
|
|
96
|
+
strategy?: string;
|
|
43
97
|
description?: string;
|
|
44
98
|
}
|
|
45
99
|
/**
|
package/dist/cli/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/cli/types.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/cli/types.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/types.js
CHANGED
|
@@ -1,3 +1,70 @@
|
|
|
1
1
|
// Path: src/cli/types.ts
|
|
2
2
|
// CLI type definitions
|
|
3
|
-
|
|
3
|
+
/**
|
|
4
|
+
* Parse a deployment strategy string into a structured strategy
|
|
5
|
+
*
|
|
6
|
+
* @param strategy Strategy string (e.g., "sequential", "parallel", "1+2", "1+R")
|
|
7
|
+
* @returns Parsed deployment strategy
|
|
8
|
+
* @throws Error if strategy format is invalid
|
|
9
|
+
*
|
|
10
|
+
* @example
|
|
11
|
+
* parseDeploymentStrategy("1+R") // → { name: "1+R", batches: [{count:1}, {count:'rest'}], isCanary: true }
|
|
12
|
+
* parseDeploymentStrategy("sequential") // → { name: "sequential", batches: [{count:1}], isCanary: false }
|
|
13
|
+
*/
|
|
14
|
+
export function parseDeploymentStrategy(strategy) {
|
|
15
|
+
const normalized = strategy.toLowerCase().trim();
|
|
16
|
+
// Handle built-in strategies
|
|
17
|
+
if (normalized === 'sequential') {
|
|
18
|
+
return {
|
|
19
|
+
name: 'sequential',
|
|
20
|
+
batches: [{ count: 1, label: '1' }],
|
|
21
|
+
isCanary: false,
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
if (normalized === 'parallel') {
|
|
25
|
+
return {
|
|
26
|
+
name: 'parallel',
|
|
27
|
+
batches: [{ count: 'rest', label: 'all' }],
|
|
28
|
+
isCanary: false,
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
// Parse canary strategy (e.g., "1+2", "1+R", "2+3+R")
|
|
32
|
+
const parts = normalized.split('+').map(p => p.trim());
|
|
33
|
+
if (parts.length < 2) {
|
|
34
|
+
throw new Error(`Invalid strategy format: "${strategy}". ` +
|
|
35
|
+
`Use "sequential", "parallel", or canary format like "1+2", "1+R", "2+3+R"`);
|
|
36
|
+
}
|
|
37
|
+
const batches = [];
|
|
38
|
+
for (const part of parts) {
|
|
39
|
+
if (part === 'r' || part === 'rest') {
|
|
40
|
+
batches.push({ count: 'rest', label: 'rest' });
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
const count = parseInt(part, 10);
|
|
44
|
+
if (isNaN(count) || count < 1) {
|
|
45
|
+
throw new Error(`Invalid batch count "${part}" in strategy "${strategy}". ` +
|
|
46
|
+
`Must be a positive number or "R" for rest.`);
|
|
47
|
+
}
|
|
48
|
+
batches.push({ count, label: part });
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
// Validate: 'rest' can only appear at the end
|
|
52
|
+
const restIndex = batches.findIndex(b => b.count === 'rest');
|
|
53
|
+
if (restIndex !== -1 && restIndex !== batches.length - 1) {
|
|
54
|
+
throw new Error(`"R" (rest) can only appear at the end of the strategy. Got: "${strategy}"`);
|
|
55
|
+
}
|
|
56
|
+
return {
|
|
57
|
+
name: strategy,
|
|
58
|
+
batches,
|
|
59
|
+
isCanary: true,
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* Get display name for a deployment strategy
|
|
64
|
+
*/
|
|
65
|
+
export function getStrategyDisplayName(strategy) {
|
|
66
|
+
if (!strategy.isCanary) {
|
|
67
|
+
return strategy.name;
|
|
68
|
+
}
|
|
69
|
+
return `canary (${strategy.name})`;
|
|
70
|
+
}
|
package/dist/cli/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/cli/types.ts"],"names":[],"mappings":"AAAA,yBAAyB;AACzB,uBAAuB"}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/cli/types.ts"],"names":[],"mappings":"AAAA,yBAAyB;AACzB,uBAAuB;AAkEvB;;;;;;;;;;GAUG;AACH,MAAM,UAAU,uBAAuB,CAAC,QAAgB;IACtD,MAAM,UAAU,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;IAEjD,6BAA6B;IAC7B,IAAI,UAAU,KAAK,YAAY,EAAE,CAAC;QAChC,OAAO;YACL,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;YACnC,QAAQ,EAAE,KAAK;SAChB,CAAC;IACJ,CAAC;IAED,IAAI,UAAU,KAAK,UAAU,EAAE,CAAC;QAC9B,OAAO;YACL,IAAI,EAAE,UAAU;YAChB,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;YAC1C,QAAQ,EAAE,KAAK;SAChB,CAAC;IACJ,CAAC;IAED,sDAAsD;IACtD,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAEvD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CACb,6BAA6B,QAAQ,KAAK;YAC1C,2EAA2E,CAC5E,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAA8B,EAAE,CAAC;IAE9C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;YACpC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QACjD,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACjC,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;gBAC9B,MAAM,IAAI,KAAK,CACb,wBAAwB,IAAI,kBAAkB,QAAQ,KAAK;oBAC3D,4CAA4C,CAC7C,CAAC;YACJ,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IAED,8CAA8C;IAC9C,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC;IAC7D,IAAI,SAAS,KAAK,CAAC,CAAC,IAAI,SAAS,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzD,MAAM,IAAI,KAAK,CACb,gEAAgE,QAAQ,GAAG,CAC5E,CAAC;IACJ,CAAC;IAED,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,OAAO;QACP,QAAQ,EAAE,IAAI;KACf,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,sBAAsB,CAAC,QAA4B;IACjE,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACvB,OAAO,QAAQ,CAAC,IAAI,CAAC;IACvB,CAAC;IACD,OAAO,WAAW,QAAQ,CAAC,IAAI,GAAG,CAAC;AACrC,CAAC"}
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,WAAW,EAMZ,MAAM,iCAAiC,CAAC;AAIzC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAoCrD,YAAY,EACV,WAAW,EACX,aAAa,EACb,wBAAwB,EACxB,eAAe,EACf,kBAAkB,EAClB,kBAAkB,GACnB,MAAM,iCAAiC,CAAC;AAEzC;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,MAAM,EAAE,kBAAkB,GAAG,WAAW,CA2OlF;AAGD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChG,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,YAAY,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAG7D,OAAO,EACL,UAAU,EACV,gBAAgB,EAChB,qBAAqB,EACrB,IAAI,EACJ,SAAS,EACT,QAAQ,EACR,SAAS,EACT,cAAc,EACd,gBAAgB,EAChB,UAAU,EACV,UAAU,EACV,cAAc,EACd,iBAAiB,EACjB,iBAAiB,GAClB,MAAM,gBAAgB,CAAC;AAExB,YAAY,EACV,kBAAkB,EAClB,oBAAoB,EACpB,kBAAkB,EAClB,aAAa,EACb,UAAU,EACV,aAAa,EACb,cAAc,EACd,YAAY,EACZ,gBAAgB,EAChB,YAAY,EACZ,oBAAoB,EACpB,qBAAqB,EACrB,oBAAoB,GACrB,MAAM,YAAY,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
// Path: src/index.ts
|
|
2
2
|
// Payara plugin for zn-vault-agent
|
|
3
|
+
import { readFileSync } from 'node:fs';
|
|
4
|
+
import { dirname, join } from 'node:path';
|
|
5
|
+
import { fileURLToPath } from 'node:url';
|
|
3
6
|
import { PayaraManager } from './payara-manager.js';
|
|
4
7
|
import { WarDeployer } from './war-deployer.js';
|
|
5
8
|
import { registerRoutes } from './routes.js';
|
|
@@ -8,6 +11,19 @@ import { fetchSecrets, verifyApiKeyFile, writeApiKeyToFile } from './secrets-han
|
|
|
8
11
|
import { assertValidConfig, hasSecrets, hasApiKeySecrets, isLifecycleManaged, getStartupMode, } from './plugin-config.js';
|
|
9
12
|
import { handleExecModeStartup, handleAggressiveModeStartup, handleNormalModeStartup, ensureSinglePayaraProcess, } from './plugin-startup.js';
|
|
10
13
|
import { evaluateHealth, buildHealthStatus, buildErrorHealthStatus, } from './plugin-health.js';
|
|
14
|
+
// Read version from package.json at module load time
|
|
15
|
+
let pluginVersion = '0.0.0';
|
|
16
|
+
try {
|
|
17
|
+
const __filename = fileURLToPath(import.meta.url);
|
|
18
|
+
const __dirname = dirname(__filename);
|
|
19
|
+
const pkgPath = join(__dirname, '..', 'package.json');
|
|
20
|
+
const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
|
|
21
|
+
pluginVersion = pkg.version || '0.0.0';
|
|
22
|
+
}
|
|
23
|
+
catch {
|
|
24
|
+
// Fallback version if package.json cannot be read
|
|
25
|
+
pluginVersion = '0.0.0';
|
|
26
|
+
}
|
|
11
27
|
/**
|
|
12
28
|
* Create Payara agent plugin
|
|
13
29
|
*/
|
|
@@ -18,7 +34,7 @@ export default function createPayaraPlugin(config) {
|
|
|
18
34
|
let secretsEnv = {};
|
|
19
35
|
return {
|
|
20
36
|
name: 'payara',
|
|
21
|
-
version:
|
|
37
|
+
version: pluginVersion,
|
|
22
38
|
description: 'Payara application server management with WAR diff deployment, secret injection, and aggressive mode',
|
|
23
39
|
async onInit(ctx) {
|
|
24
40
|
pluginLogger = ctx.logger.child({ plugin: 'payara' });
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,qBAAqB;AACrB,mCAAmC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|