push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,40 @@
diff --git a/aws_gate/cli.py b/aws_gate/cli.py
index ac37c2f..9743415 100644
--- a/aws_gate/cli.py
+++ b/aws_gate/cli.py
@@ -7,7 +7,6 @@ from marshmallow import ValidationError
from yaml.scanner import ScannerError
from aws_gate import __version__, __description__
-from aws_gate.bootstrap import bootstrap
from aws_gate.config import load_config_from_files
from aws_gate.constants import (
SUPPORTED_KEY_TYPES,
@@ -59,10 +58,14 @@ def get_argument_parser(*args, **kwargs):
# 'bootstrap' subcommand
bootstrap_parser = subparsers.add_parser(
- "bootstrap", help="Download and install session-manager-plugin"
+ "bootstrap",
+ help="Download and install session-manager-plugin (disabled by nix)",
)
bootstrap_parser.add_argument(
- "-f", "--force", action="store_true", help="Forces bootstrap operation"
+ "-f",
+ "--force",
+ action="store_true",
+ help="Forces bootstrap operation (disabled by nix)",
)
# 'exec' subcommand
@@ -268,7 +271,9 @@ def main(args=None, argument_parser=None):
logger.debug('Using AWS profile "%s" in region "%s"', profile, region)
if args.subcommand == "bootstrap":
- bootstrap(force=args.force)
+ print(
+ f"The SSM Plugin will not be downloaded as aws-gate was installed from nixpkgs and the plugin comes pre-bundled. The '--force' flag will not override this behavior."
+ )
elif args.subcommand == "exec":
exec(
config=config,