Skip to content

Commit 1a0a337

Browse files
jeromy-cannonjeromy-cannon
committed
renamed flag clusterName to clusterRef
Signed-off-by: Jeromy Cannon <[email protected]>
1 parent f4087bf commit 1a0a337

19 files changed

+39
-36
lines changed

‎src/commands/cluster/configs.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export const resetConfigBuilder = async function (argv, ctx, task) {
7272
this.parent.getConfigManager().update(argv);
7373

7474
ctx.config = {
75-
clusterName: this.parent.getConfigManager().getFlag(flags.clusterName) as string,
75+
clusterName: this.parent.getConfigManager().getFlag(flags.clusterRef) as string,
7676
clusterSetupNamespace: this.parent.getConfigManager().getFlag(flags.clusterSetupNamespace) as string,
7777
} as ClusterResetConfigClass;
7878

‎src/commands/cluster/flags.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export const SETUP_FLAGS = {
1515
requiredFlagsWithDisabledPrompt: [],
1616
optionalFlags: [
1717
flags.chartDirectory,
18-
flags.clusterName,
18+
flags.clusterRef,
1919
flags.clusterSetupNamespace,
2020
flags.deployCertManager,
2121
flags.deployCertManagerCrds,
@@ -29,7 +29,7 @@ export const SETUP_FLAGS = {
2929
export const RESET_FLAGS = {
3030
requiredFlags: [],
3131
requiredFlagsWithDisabledPrompt: [],
32-
optionalFlags: [flags.clusterName, flags.clusterSetupNamespace, flags.force, flags.quiet],
32+
optionalFlags: [flags.clusterRef, flags.clusterSetupNamespace, flags.force, flags.quiet],
3333
};
3434

3535
export const CONNECT_FLAGS = {
@@ -39,7 +39,7 @@ export const CONNECT_FLAGS = {
3939
flags.devMode,
4040
flags.deployment,
4141
flags.quiet,
42-
flags.clusterName,
42+
flags.clusterRef,
4343
flags.context,
4444
flags.namespace,
4545
flags.userEmailAddress,

‎src/commands/cluster/tasks.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ export class ClusterCommandTasks {
266266
const configManager = this.parent.getConfigManager();
267267
const isQuiet = configManager.getFlag<boolean>(flags.quiet);
268268
const deploymentName: string = configManager.getFlag<DeploymentName>(flags.deployment);
269-
let clusters = splitFlagInput(configManager.getFlag<string>(flags.clusterName));
269+
let clusters = splitFlagInput(configManager.getFlag<string>(flags.clusterRef));
270270
const contexts = splitFlagInput(configManager.getFlag<string>(flags.context));
271271
const namespace = configManager.getFlag<NamespaceName>(flags.namespace);
272272
const localConfig = this.parent.getLocalConfig();
@@ -319,7 +319,7 @@ export class ClusterCommandTasks {
319319

320320
// Prompt user for clusters and contexts
321321
else {
322-
const promptedClusters = await flags.clusterName.prompt(task, '');
322+
const promptedClusters = await flags.clusterRef.prompt(task, '');
323323
clusters = splitFlagInput(promptedClusters);
324324

325325
for (const cluster of clusters) {

‎src/commands/deployment.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ export class DeploymentCommand extends BaseCommand {
3535
flags.quiet,
3636
flags.context,
3737
flags.namespace,
38-
flags.clusterName,
38+
flags.clusterRef,
3939
flags.userEmailAddress,
4040
flags.deployment,
4141
flags.deploymentClusters,
4242
];
4343
}
4444

4545
private static get LIST_DEPLOYMENTS_FLAGS_LIST(): CommandFlag[] {
46-
return [flags.quiet, flags.clusterName];
46+
return [flags.quiet, flags.clusterRef];
4747
}
4848

4949
private async create(argv: any): Promise<boolean> {
@@ -183,10 +183,10 @@ export class DeploymentCommand extends BaseCommand {
183183
self.configManager.update(argv);
184184
self.logger.debug('Updated config with argv', {config: self.configManager.config});
185185

186-
await self.configManager.executePrompt(task, [flags.clusterName]);
186+
await self.configManager.executePrompt(task, [flags.clusterRef]);
187187

188188
ctx.config = {
189-
clusterName: self.configManager.getFlag<ClusterRef>(flags.clusterName),
189+
clusterName: self.configManager.getFlag<ClusterRef>(flags.clusterRef),
190190
} as Config;
191191

192192
self.logger.debug('Prepared config', {config: ctx.config, cachedConfig: self.configManager.config});

‎src/commands/flags.ts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,22 +110,24 @@ export class Flags {
110110
};
111111

112112
// list of common flags across commands. command specific flags are defined in the command's module.
113-
static readonly clusterName: CommandFlag = {
114-
constName: 'clusterName',
115-
name: 'cluster-name',
113+
static readonly clusterRef: CommandFlag = {
114+
constName: 'clusterRef',
115+
name: 'cluster-ref',
116116
definition: {
117-
describe: 'Cluster name',
117+
describe:
118+
'The cluster reference that will be used for referencing the Kubernetes cluster and stored in the local and ' +
119+
'remote configuration for the deployment. Multiple can be separated by commas.',
118120
alias: 'c',
119121
type: 'string',
120122
},
121123
prompt: async function promptClusterName(task: ListrTaskWrapper<any, any, any>, input: any) {
122124
return await Flags.promptText(
123125
task,
124126
input,
125-
Flags.clusterName.definition.defaultValue,
127+
Flags.clusterRef.definition.defaultValue,
126128
'Enter cluster name: ',
127129
'cluster name cannot be empty',
128-
Flags.clusterName.name,
130+
Flags.clusterRef.name,
129131
);
130132
},
131133
};
@@ -1877,7 +1879,7 @@ export class Flags {
18771879
Flags.cacheDir,
18781880
Flags.chainId,
18791881
Flags.chartDirectory,
1880-
Flags.clusterName,
1882+
Flags.clusterRef,
18811883
Flags.clusterSetupNamespace,
18821884
Flags.context,
18831885
Flags.createAmount,

‎src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export function main(argv: any) {
9393
configManager.reset();
9494
}
9595

96-
const clusterName = configManager.getFlag(flags.clusterName) || currentClusterName;
96+
const clusterName = configManager.getFlag(flags.clusterRef) || currentClusterName;
9797

9898
if (contextNamespace?.name) {
9999
configManager.setFlag(flags.namespace, contextNamespace);

‎test/e2e/commands/account.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ argv[flags.releaseTag.name] = HEDERA_PLATFORM_VERSION_TAG;
4343
argv[flags.nodeAliasesUnparsed.name] = 'node1';
4444
argv[flags.generateGossipKeys.name] = true;
4545
argv[flags.generateTlsKeys.name] = true;
46-
argv[flags.clusterName.name] = TEST_CLUSTER;
46+
argv[flags.clusterRef.name] = TEST_CLUSTER;
4747
argv[flags.soloChartVersion.name] = version.SOLO_CHART_VERSION;
4848
// set the env variable SOLO_CHARTS_DIR if developer wants to use local Solo charts
4949
argv[flags.chartDirectory.name] = process.env.SOLO_CHARTS_DIR ?? undefined;

‎test/e2e/commands/cluster.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ describe('ClusterCommand', () => {
3939
argv[flags.nodeAliasesUnparsed.name] = 'node1';
4040
argv[flags.generateGossipKeys.name] = true;
4141
argv[flags.generateTlsKeys.name] = true;
42-
argv[flags.clusterName.name] = TEST_CLUSTER;
42+
argv[flags.clusterRef.name] = TEST_CLUSTER;
4343
argv[flags.soloChartVersion.name] = version.SOLO_CHART_VERSION;
4444
argv[flags.force.name] = true;
4545
// set the env variable SOLO_CHARTS_DIR if developer wants to use local Solo charts

‎test/e2e/commands/mirror_node.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ argv[flags.releaseTag.name] = HEDERA_PLATFORM_VERSION_TAG;
3838
argv[flags.nodeAliasesUnparsed.name] = 'node1'; // use a single node to reduce resource during e2e tests
3939
argv[flags.generateGossipKeys.name] = true;
4040
argv[flags.generateTlsKeys.name] = true;
41-
argv[flags.clusterName.name] = TEST_CLUSTER;
41+
argv[flags.clusterRef.name] = TEST_CLUSTER;
4242
argv[flags.soloChartVersion.name] = version.SOLO_CHART_VERSION;
4343
argv[flags.force.name] = true;
4444
argv[flags.relayReleaseTag.name] = flags.relayReleaseTag.definition.defaultValue;

‎test/e2e/commands/network.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ describe('NetworkCommand', () => {
6565
fs.writeFileSync(applicationEnvFilePath, applicationEnvFileContents);
6666
});
6767

68+
it('deployment create should succeed', async () => {});
69+
6870
it('keys should be generated', async () => {
6971
expect(await nodeCmd.handlers.keys(argv)).to.be.true;
7072
});

‎test/e2e/commands/node_local_hedera.test.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,13 @@ import {NamespaceName} from '../../../src/core/kube/resources/namespace/namespac
2020
import {type NetworkNodes} from '../../../src/core/network_nodes.js';
2121
import {container} from 'tsyringe-neo';
2222
import {InjectTokens} from '../../../src/core/dependency_injection/inject_tokens.js';
23-
import net from 'net';
2423

2524
const LOCAL_HEDERA = NamespaceName.of('local-hedera-app');
2625
const argv = getDefaultArgv();
2726
argv[flags.nodeAliasesUnparsed.name] = 'node1,node2';
2827
argv[flags.generateGossipKeys.name] = true;
2928
argv[flags.generateTlsKeys.name] = true;
30-
argv[flags.clusterName.name] = TEST_CLUSTER;
29+
argv[flags.clusterRef.name] = TEST_CLUSTER;
3130
// set the env variable SOLO_CHARTS_DIR if developer wants to use local Solo charts
3231
argv[flags.chartDirectory.name] = process.env.SOLO_CHARTS_DIR ?? undefined;
3332
argv[flags.quiet.name] = true;

‎test/e2e/commands/node_local_ptt.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const argv = getDefaultArgv();
1818
argv[flags.nodeAliasesUnparsed.name] = 'node1,node2,node3';
1919
argv[flags.generateGossipKeys.name] = true;
2020
argv[flags.generateTlsKeys.name] = true;
21-
argv[flags.clusterName.name] = TEST_CLUSTER;
21+
argv[flags.clusterRef.name] = TEST_CLUSTER;
2222
// set the env variable SOLO_CHARTS_DIR if developer wants to use local Solo charts
2323
argv[flags.chartDirectory.name] = process.env.SOLO_CHARTS_DIR ?? undefined;
2424
argv[flags.quiet.name] = true;

‎test/e2e/commands/relay.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ argv[flags.releaseTag.name] = HEDERA_PLATFORM_VERSION_TAG;
2424
argv[flags.nodeAliasesUnparsed.name] = 'node1,node2';
2525
argv[flags.generateGossipKeys.name] = true;
2626
argv[flags.generateTlsKeys.name] = true;
27-
argv[flags.clusterName.name] = TEST_CLUSTER;
27+
argv[flags.clusterRef.name] = TEST_CLUSTER;
2828
argv[flags.soloChartVersion.name] = version.SOLO_CHART_VERSION;
2929
argv[flags.force.name] = true;
3030
argv[flags.relayReleaseTag.name] = flags.relayReleaseTag.definition.defaultValue;

‎test/e2e/e2e_node_util.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export function e2eNodeKeyRefreshTest(testName: string, mode: string, releaseTag
3737
argv[flags.nodeAliasesUnparsed.name] = 'node1,node2,node3';
3838
argv[flags.generateGossipKeys.name] = true;
3939
argv[flags.generateTlsKeys.name] = true;
40-
argv[flags.clusterName.name] = TEST_CLUSTER;
40+
argv[flags.clusterRef.name] = TEST_CLUSTER;
4141
argv[flags.devMode.name] = true;
4242
// set the env variable SOLO_CHARTS_DIR if developer wants to use local Solo charts
4343
argv[flags.chartDirectory.name] = process.env.SOLO_CHARTS_DIR ?? undefined;

‎test/e2e/integration/core/account_manager.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const argv = getDefaultArgv();
1919
argv[flags.namespace.name] = namespace.name;
2020
argv[flags.deployment.name] = 'deployment';
2121
argv[flags.nodeAliasesUnparsed.name] = 'node1';
22-
argv[flags.clusterName.name] = TEST_CLUSTER;
22+
argv[flags.clusterRef.name] = TEST_CLUSTER;
2323
argv[flags.soloChartVersion.name] = version.SOLO_CHART_VERSION;
2424
argv[flags.generateGossipKeys.name] = true;
2525
argv[flags.generateTlsKeys.name] = true;

‎test/e2e/integration/core/platform_installer_e2e.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const testCacheDir = getTestCacheDir();
2727
argv[flags.cacheDir.name] = testCacheDir;
2828
argv[flags.namespace.name] = namespace.name;
2929
argv[flags.nodeAliasesUnparsed.name] = 'node1';
30-
argv[flags.clusterName.name] = TEST_CLUSTER;
30+
argv[flags.clusterRef.name] = TEST_CLUSTER;
3131
argv[flags.soloChartVersion.name] = version.SOLO_CHART_VERSION;
3232
argv[flags.generateGossipKeys.name] = true;
3333
argv[flags.generateTlsKeys.name] = true;

‎test/e2e/integration/core/remote_config_manager.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ argv[flags.cacheDir.name] = testCacheDir;
2929
argv[flags.namespace.name] = namespace.name;
3030
argv[flags.deployment.name] = deploymentName;
3131
argv[flags.nodeAliasesUnparsed.name] = 'node1';
32-
argv[flags.clusterName.name] = TEST_CLUSTER;
32+
argv[flags.clusterRef.name] = TEST_CLUSTER;
3333
argv[flags.soloChartVersion.name] = version.SOLO_CHART_VERSION;
3434
argv[flags.generateGossipKeys.name] = true;
3535
argv[flags.generateTlsKeys.name] = true;

‎test/unit/commands/cluster.test.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ argv[flags.releaseTag.name] = HEDERA_PLATFORM_VERSION_TAG;
7575
argv[flags.nodeAliasesUnparsed.name] = 'node1';
7676
argv[flags.generateGossipKeys.name] = true;
7777
argv[flags.generateTlsKeys.name] = true;
78-
argv[flags.clusterName.name] = TEST_CLUSTER;
78+
argv[flags.clusterRef.name] = TEST_CLUSTER;
7979
argv[flags.soloChartVersion.name] = version.SOLO_CHART_VERSION;
8080
argv[flags.force.name] = true;
8181
argv[flags.clusterSetupNamespace.name] = constants.SOLO_SETUP_NAMESPACE.name;
@@ -255,7 +255,7 @@ describe('ClusterCommand unit tests', () => {
255255
resolve('deployment-3');
256256
});
257257
});
258-
clusterNamePromptStub = sandbox.stub(flags.clusterName, 'prompt').callsFake(() => {
258+
clusterNamePromptStub = sandbox.stub(flags.clusterRef, 'prompt').callsFake(() => {
259259
return new Promise(resolve => {
260260
resolve('cluster-3');
261261
});
@@ -386,7 +386,7 @@ describe('ClusterCommand unit tests', () => {
386386
resolve('deployment-3');
387387
});
388388
});
389-
clusterNamePromptStub = sandbox.stub(flags.clusterName, 'prompt').callsFake(() => {
389+
clusterNamePromptStub = sandbox.stub(flags.clusterRef, 'prompt').callsFake(() => {
390390
return new Promise(resolve => {
391391
resolve('cluster-3');
392392
});
@@ -410,22 +410,22 @@ describe('ClusterCommand unit tests', () => {
410410
});
411411

412412
it('should use local config mapping to connect to first provided cluster', async () => {
413-
const opts = getBaseCommandOpts(sandbox, {}, [[flags.clusterName, 'cluster-2,cluster-3']]);
413+
const opts = getBaseCommandOpts(sandbox, {}, [[flags.clusterRef, 'cluster-2,cluster-3']]);
414414

415415
command = await runSelectContextTask(opts); // @ts-ignore
416416
expect(command.getK8Factory().default().contexts().updateCurrent).to.have.been.calledWith('context-2');
417417
});
418418

419419
it('should prompt for context if selected cluster is not found in local config mapping', async () => {
420-
const opts = getBaseCommandOpts(sandbox, {}, [[flags.clusterName, 'cluster-3']]);
420+
const opts = getBaseCommandOpts(sandbox, {}, [[flags.clusterRef, 'cluster-3']]);
421421

422422
command = await runSelectContextTask(opts); // @ts-ignore
423423
expect(command.getK8Factory().default().contexts().updateCurrent).to.have.been.calledWith('context-3');
424424
});
425425

426426
it('should use default kubeConfig context if selected cluster is not found in local config mapping and quiet=true', async () => {
427427
const opts = getBaseCommandOpts(sandbox, {}, [
428-
[flags.clusterName, 'unknown-cluster'],
428+
[flags.clusterRef, 'unknown-cluster'],
429429
[flags.quiet, true],
430430
]);
431431

‎test/unit/commands/network.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ argv[flags.nodeAliasesUnparsed.name] = 'node1';
3939
argv[flags.deployment.name] = 'deployment';
4040
argv[flags.generateGossipKeys.name] = true;
4141
argv[flags.generateTlsKeys.name] = true;
42-
argv[flags.clusterName.name] = TEST_CLUSTER;
42+
argv[flags.clusterRef.name] = TEST_CLUSTER;
4343
argv[flags.soloChartVersion.name] = version.SOLO_CHART_VERSION;
4444
argv[flags.force.name] = true;
4545
argv[flags.clusterSetupNamespace.name] = constants.SOLO_SETUP_NAMESPACE.name;

0 commit comments

Comments
 (0)