Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(remote-config): save reusable solo flags in remoteconfig #1191

Open
wants to merge 18 commits into
base: main
Choose a base branch
from
Open

feat(remote-config): save reusable solo flags in remoteconfig #1191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
dec37b5
added new data wrapper for the common flags and the common methods fo…
instamenta Jan 21, 2025
072f142
add to middleware, pass the configManager and the argv down to the re…
instamenta Jan 21, 2025
7d03d77
removed some ts-ignore tags, lint fix and added .madgerc file to igno…
instamenta Jan 21, 2025
95dff03
Merge remote-tracking branch 'origin/main' into 01178-save-reusable-s…
instamenta Jan 21, 2025
8b961b3
Merge remote-tracking branch 'origin/main' into 01178-save-reusable-s…
instamenta Jan 21, 2025
9722eee
removed circular dependencies and madgerc override
jeromy-cannon Jan 21, 2025
c354941
working on prompting the user and overriding the configManager's valu…
instamenta Jan 22, 2025
1e270e1
changed strategy to override values on argv so they have effect durin…
instamenta Jan 22, 2025
82b2f5b
Merge remote-tracking branch 'origin/main' into 01178-save-reusable-s…
instamenta Jan 23, 2025
a3cbd49
merge with mian
instamenta Jan 23, 2025
75d3837
Apply suggestions from code review
instamenta Jan 23, 2025
1cd8d22
add logic for handling quiet and force flags
instamenta Jan 23, 2025
966ab43
Merge remote-tracking branch 'origin/01178-save-reusable-solo-flags-i…
instamenta Jan 23, 2025
b4eb113
rename method
instamenta Jan 23, 2025
f3d57c6
remove leftover functions from merge
instamenta Jan 23, 2025
047f11d
remove leftover comment
instamenta Jan 23, 2025
e7daab4
remove unusued compare method
instamenta Jan 23, 2025
0dd6a2c
removed enquirer and inquirer packages from dependencies
instamenta Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
236 changes: 5 additions & 231 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"license": "Apache2.0",
"dependencies": {
"@hashgraph/sdk": "^2.56.0",
"@inquirer/prompts": "^7.2.3",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see that there is some confusion in our package.json that has probably been there a while.

We have:

  • "@listr2/prompt-adapter-enquirer": "^2.0.12",
  • "enquirer": "^2.4.1",
  • "inquirer": "^12.3.2",
  • and now: "@inquirer/prompts": "^7.2.3",

It looks like enquirer is really old. inquirer is newer, but has the legacy post on their GitHub site. @inquirer/prompts is the newest and should probably be used.

Would you see if we can remove:

  • "@listr2/prompt-adapter-enquirer": "^2.0.12",
  • "enquirer": "^2.4.1",
  • "inquirer": "^12.3.2",

And add: @listr2/prompt-adapter-inquirer

If it works, this is much better than having all of those other libraries that will cause confusion.

"@kubernetes/client-node": "^0.22.3",
"@listr2/prompt-adapter-enquirer": "^2.0.12",
"@peculiar/x509": "^1.12.3",
Expand All @@ -57,12 +58,10 @@
"class-validator": "^0.14.1",
"dot-object": "^2.1.5",
"dotenv": "^16.4.7",
"enquirer": "^2.4.1",
"esm": "^3.2.25",
"figlet": "^1.8.0",
"got": "^14.4.5",
"http-status-codes": "^2.3.0",
"inquirer": "^12.3.2",
"ip": "^2.0.1",
"js-base64": "^3.7.7",
"listr2": "^8.2.5",
Expand Down
2 changes: 1 addition & 1 deletion src/commands/deployment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export class DeploymentCommand extends BaseCommand {
});
},
},
ListrRemoteConfig.createRemoteConfigInMultipleClusters(this),
ListrRemoteConfig.createRemoteConfigInMultipleClusters(this, argv),
],
{
concurrent: false,
Expand Down
4 changes: 2 additions & 2 deletions src/commands/mirror_node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ export class MirrorNodeCommand extends BaseCommand {
await tasks.run();
self.logger.debug('mirror node destruction has completed');
} catch (e) {
throw new SoloError(`Error destrong mirror node: ${e.message}`, e);
throw new SoloError(`Error destroying mirror node: ${e.message}`, e);
} finally {
await lease.release();
await self.accountManager.close();
Expand Down Expand Up @@ -570,7 +570,7 @@ export class MirrorNodeCommand extends BaseCommand {
}

/** Removes the mirror node components from remote config. */
public removeMirrorNodeComponents(): SoloListrTask<object> {
public removeMirrorNodeComponents(): SoloListrTask<any> {
return {
title: 'Remove mirror node from remote config',
skip: (): boolean => !this.remoteConfigManager.isLoaded(),
Expand Down
Loading