gen3-dataops-toolkit 3.8.0__tar.gz → 3.8.1__tar.gz

{gen3_dataops_toolkit-3.8.0 → gen3_dataops_toolkit-3.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gen3-dataops-toolkit
-Version: 3.8.0
+Version: 3.8.1
 Summary: Gen3 DataOps toolkit (g3dt): operate SSM-published Gen3 data pipeline environments
 License: Apache-2.0
 Author: JoshuaHarris391
@@ -59,9 +59,9 @@ pip install gen3-dataops-toolkit
 ## Bootstrap: discover, then use
 
 ```bash
-g3dt config discover --all-profiles --add   # find every deployed env your
-                                            # AWS profiles can see; register
-                                            # them as contexts
+g3dt config discover <aws-profile> --add    # logs the profile in if needed,
+                                            # lists every deployed env its
+                                            # account holds, registers them
 g3dt config contexts                        # list them (current marked *)
 g3dt config use myproj/test                 # point g3dt at one
 ```

{gen3_dataops_toolkit-3.8.0 → gen3_dataops_toolkit-3.8.1}/README.md

@@ -25,9 +25,9 @@ pip install gen3-dataops-toolkit
 ## Bootstrap: discover, then use
 
 ```bash
-g3dt config discover --all-profiles --add   # find every deployed env your
-                                            # AWS profiles can see; register
-                                            # them as contexts
+g3dt config discover <aws-profile> --add    # logs the profile in if needed,
+                                            # lists every deployed env its
+                                            # account holds, registers them
 g3dt config contexts                        # list them (current marked *)
 g3dt config use myproj/test                 # point g3dt at one
 ```

{gen3_dataops_toolkit-3.8.0 → gen3_dataops_toolkit-3.8.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gen3-dataops-toolkit"
-version = "3.8.0"
+version = "3.8.1"
 description = "Gen3 DataOps toolkit (g3dt): operate SSM-published Gen3 data pipeline environments"
 authors = ["JoshuaHarris391 <harjo391@gmail.com>"]
 readme = "README.md"

{gen3_dataops_toolkit-3.8.0 → gen3_dataops_toolkit-3.8.1}/src/g3dt/cli/config_cmds.py

@@ -226,10 +226,16 @@ def forget(
 
 @app.command("discover")
 def discover(
+    profile_arg: str = typer.Argument(
+        None, metavar="[PROFILE]",
+        help="Scan just this AWS profile's account. If its SSO session is "
+             "stale you are offered `aws sso login` first.",
+    ),
     all_profiles: bool = typer.Option(
         False, "--all-profiles",
         help="Scan every profile in ~/.aws/config for deployed "
-             "/{project}/{env} trees.",
+             "/{project}/{env} trees (profiles with stale sessions are "
+             "skipped, not logged in).",
     ),
     add_found: bool = typer.Option(
         False, "--add", help="Register discovered pairs as contexts."
@@ -243,10 +249,11 @@ def discover(
 ) -> None:
     """Find deployable infrastructure.
 
-    Default: verify each configured context against its own account (nothing
-    else is touched). With --all-profiles: enumerate every AWS profile and
-    list all deployed environments its account holds; add --add to register
-    them as contexts.
+    With a PROFILE argument: log that one profile in if needed, then list
+    every deployed environment its account holds — the recommended flow.
+    With --all-profiles: sweep every configured profile (stale sessions are
+    skipped). With neither: verify each already-configured context against
+    its own account. Add --add to register findings as contexts.
     """
     resolve.announce_context()
     # The scan probes credentials that may be stale; botocore logs its own
@@ -259,12 +266,17 @@ def discover(
     marker = config.load_marker()
     default_region = region or marker.get("region") or config.DEFAULT_REGION
 
-    if not all_profiles:
+    if profile_arg and all_profiles:
+        typer.secho("Pass either a PROFILE argument or --all-profiles, not both.",
+                    fg=typer.colors.RED, err=True)
+        raise typer.Exit(1)
+
+    if not profile_arg and not all_profiles:
         ctxs = contexts.list_contexts(marker)
         if not ctxs:
             typer.secho(
                 "No contexts configured to verify. Try "
-                "`g3dt config discover --all-profiles [--add]`.",
+                "`g3dt config discover <aws-profile> --add`.",
                 fg=typer.colors.YELLOW,
             )
             return
@@ -285,13 +297,48 @@ def discover(
     import botocore.session
 
     profiles_cfg = botocore.session.Session().full_config.get("profiles", {})
-    names = profile or sorted(profiles_cfg)
-    if not names:
-        typer.secho("No AWS profiles found in ~/.aws/config.",
-                    fg=typer.colors.YELLOW)
-        return
+
+    if profile_arg:
+        if profile_arg not in profiles_cfg:
+            typer.secho(
+                f"No profile '{profile_arg}' in ~/.aws/config. Configured: "
+                f"{', '.join(sorted(profiles_cfg)) or '(none)'}.",
+                fg=typer.colors.RED, err=True,
+            )
+            raise typer.Exit(1)
+        if not _profile_session_valid(profile_arg):
+            typer.secho(
+                f"The SSO session for '{profile_arg}' is not valid.",
+                fg=typer.colors.YELLOW,
+            )
+            if not typer.confirm(
+                f"Run `aws sso login --profile {profile_arg}` now?",
+                default=True,
+            ):
+                typer.secho("Aborted — log in and re-run discover.",
+                            fg=typer.colors.YELLOW)
+                raise typer.Exit(1)
+            import subprocess
+
+            login = subprocess.run(
+                ["aws", "sso", "login", "--profile", profile_arg]
+            )
+            if login.returncode != 0 or not _profile_session_valid(profile_arg):
+                typer.secho(
+                    f"Still no valid session for '{profile_arg}'. Aborting.",
+                    fg=typer.colors.RED, err=True,
+                )
+                raise typer.Exit(1)
+        names = [profile_arg]
+    else:
+        names = profile or sorted(profiles_cfg)
+        if not names:
+            typer.secho("No AWS profiles found in ~/.aws/config.",
+                        fg=typer.colors.YELLOW)
+            return
 
     found: List[contexts.Context] = []
+    seen_names = set()
     for prof in names:
         prof_region = (profiles_cfg.get(prof, {}).get("region")
                        or default_region)
@@ -309,6 +356,12 @@ def discover(
             continue
         for project, env in pairs:
             name = f"{project}/{env}"
+            if name in seen_names:
+                # Same account visible through several profiles (e.g. a
+                # 'default' alias): the first profile wins; don't print
+                # duplicate suggestions.
+                continue
+            seen_names.add(name)
             ctx = contexts.Context(
                 name=name, project=project, env=env, profile=prof,
                 region=prof_region,
@@ -340,6 +393,23 @@ def discover(
             )
 
 
+def _profile_session_valid(profile: str) -> bool:
+    """Cheap credential check: can this profile sign a request right now?"""
+    import boto3
+    from botocore.config import Config as _BotoConfig
+
+    try:
+        session = boto3.Session(profile_name=profile)
+        session.client(
+            "sts",
+            config=_BotoConfig(connect_timeout=3, read_timeout=5,
+                               retries={"max_attempts": 1}),
+        ).get_caller_identity()
+        return True
+    except Exception:
+        return False
+
+
 def _scan_profile(profile: str, region: str) -> List[tuple]:
     """All deployed (project, env) pairs visible to one profile's account.
 

{gen3_dataops_toolkit-3.8.0 → gen3_dataops_toolkit-3.8.1}/src/g3dt/cli/main.py

@@ -71,7 +71,7 @@ Contexts: what am I pointed at?
   prints the active one first (to stderr) — read that line before anything
   else. Production contexts are marked [PROD] and gate destructive actions
   behind typing the context name; --yes never bypasses that.
-    g3dt config discover --all-profiles --add   find + register deployed infra
+    g3dt config discover <aws-profile> --add   find + register deployed infra
     g3dt config contexts                        list them (current marked *)
     g3dt config use <name>                      act there from now on
     g3dt --ctx <name> <command>                 one-shot override

{gen3_dataops_toolkit-3.8.0 → gen3_dataops_toolkit-3.8.1}/src/g3dt/config.py

@@ -180,7 +180,7 @@ def require_project(marker: Optional[dict] = None) -> str:
     if not project:
         raise ConfigError(
             "No project configured. Register a context with "
-            "`g3dt config discover --all-profiles --add` and select it with "
+            "`g3dt config discover <aws-profile> --add` and select it with "
             "`g3dt config use <name>` — or create a g3dt.yaml marker "
             f"(searched: {', '.join(MARKER_PATHS)}) with at least:\n"
             "    project: <projectId>\n"

{gen3_dataops_toolkit-3.8.0 → gen3_dataops_toolkit-3.8.1}/src/g3dt/contexts.py

@@ -240,7 +240,7 @@ def resolve_context(
         raise _config.ConfigError(
             "No context selected. Pass --env/--ctx, set one with "
             "`g3dt config use <name>`, or register some with "
-            "`g3dt config discover --all-profiles --add`."
+            "`g3dt config discover <aws-profile> --add`."
         )
     return None, None