nate2-scripts 1.0.1__tar.gz → 1.0.3__tar.gz

{nate2_scripts-1.0.1 → nate2_scripts-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: nate2-scripts
-Version: 1.0.1
+Version: 1.0.3
 Summary: Utility scripts for AWS development on macOS
 Project-URL: Homepage, https://github.com/tennex-nwestfall/nate2-scripts
 License-File: LICENSE

{nate2_scripts-1.0.1 → nate2_scripts-1.0.3}/README.md

@@ -1,4 +1,3 @@
-
 [![PyPI version](https://img.shields.io/pypi/v/nate2-scripts)](https://pypi.org/project/nate2-scripts/)
 [![License](https://img.shields.io/github/license/tennex-nwestfall/nate2-scripts)](https://github.com/tennex-nwestfall/nate2-scripts/blob/main/LICENSE)
 
@@ -35,7 +34,7 @@ eval "$(register-python-argcomplete console)"
 **Usage:**
 
 ```bash
-# change to an account/role 
+# change to an account/role
 asp my-aws-role
 
 # open main page of the role/account
@@ -46,8 +45,8 @@ console ec2
 console s3
 # open lambda page of the role/account in us-west-2
 console lambda -r us-west-2
-# open instance id page of the role/account in  
-# whatever region that instance is in 
+# open instance id page of the role/account in
+# whatever region that instance is in
 console i-0123456789abcdef
 # open the console page for the resource the ARN points to
 console arn:aws:ec2:us-east-1:012345678967:instance/i-0123456789abcdef
@@ -60,7 +59,7 @@ console arn:aws:ec2:us-east-1:012345678967:instance/i-0123456789abcdef
 **Supported ARNs:** `ec2`, `iam` (role, user), `lambda`, `logs` (CloudWatch Logs), `rds`, `s3`, `secretsmanager`, `ecs`, `eks`, `sns`, `sqs`, `batch`, `dynamodb`, `states` (Step Functions), `elasticloadbalancing`
 
 **All Regions Supported:**
-Edit `console-regions.json` to change which regions are evaluated and to set the default one
+Edit `~/.local/state/console-regions.json` to change which regions are evaluated and to set the default one
 
 ---
 
@@ -78,13 +77,17 @@ alias cdk="bing-wrapper.py --end --pattern \"(y/n)\" --sound-end /System/Library
 
 # wraps nextflow to play a sound when done
 alias nextflow="bing-wrapper.py --end -- nextflow"
+
+# needed for autocomplete of bing-wrapper and the inner command
+eval "$(bing-wrapper --autocomplete)"
 ```
 
 **Options:**
 
-| Flag | Description | Default |
-| --- | --- | --- |
-| `--end` | Play a sound when the command exits | off |
-| `--pattern <text>` | Play a sound when `<text>` appears in output (repeatable) | none |
-| `--sound-end <path>` | Sound file to play on exit | `Glass.aiff` |
-| `--sound-pattern <path>` | Sound file to play on pattern match | `Glass.aiff` |
+| Flag                     | Description                                               | Default      |
+| ------------------------ | --------------------------------------------------------- | ------------ |
+| `--end`                  | Play a sound when the command exits                       | off          |
+| `--pattern <text>`       | Play a sound when `<text>` appears in output (repeatable) | none         |
+| `--sound-end <path>`     | Sound file to play on exit                                | `Glass.aiff` |
+| `--sound-pattern <path>` | Sound file to play on pattern match                       | `Glass.aiff` |
+| `--sound-while <path>`   | Sound file to play on while the command runs              | none         |

{nate2_scripts-1.0.1 → nate2_scripts-1.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "nate2-scripts"
-version = "1.0.1"
+version = "1.0.3"
 description = "Utility scripts for AWS development on macOS"
 requires-python = ">=3.11"
 dependencies = [
@@ -19,5 +19,8 @@ bing-wrapper = "nate2_scripts.bing_wrapper:main"
 [tool.hatch.build.targets.wheel]
 packages = ["src/nate2_scripts"]
 
+[tool.hatch.build.targets.wheel.force-include]
+"src/nate2_scripts/bing_wrapper/autocomplete.sh" = "nate2_scripts/bing_wrapper/autocomplete.sh"
+
 [project.urls]
 Homepage = "https://github.com/tennex-nwestfall/nate2-scripts"

nate2_scripts-1.0.1/src/nate2_scripts/bing_wrapper.py → nate2_scripts-1.0.3/src/nate2_scripts/bing_wrapper/__init__.py

@@ -8,6 +8,7 @@ import struct
 import subprocess
 import sys
 import termios
+import threading
 import tty
 import argparse
 
@@ -55,6 +56,26 @@ def run(args: argparse.Namespace) -> None:
     # ---- parent ----
     os.close(slave_fd)
 
+    # Loop sound-while for the lifetime of the child process.
+    _stop_sound_while = threading.Event()
+    _sound_while_thread = None
+
+    def _play_sound_while_loop() -> None:
+        while not _stop_sound_while.is_set():
+            proc = subprocess.Popen(["afplay", args.sound_while])
+            while proc.poll() is None:
+                if _stop_sound_while.wait(timeout=0.05):
+                    proc.terminate()
+                    try:
+                        proc.wait(timeout=1)
+                    except subprocess.TimeoutExpired:
+                        proc.kill()
+                    return
+
+    if args.sound_while:
+        _sound_while_thread = threading.Thread(target=_play_sound_while_loop, daemon=True)
+        _sound_while_thread.start()
+
     # Propagate terminal resizes to the child (also sends SIGWINCH to it).
     def _sigwinch(signum: int, frame) -> None:
         try:
@@ -119,6 +140,10 @@ def run(args: argparse.Namespace) -> None:
 
     _, status = os.waitpid(pid, 0)
 
+    _stop_sound_while.set()
+    if _sound_while_thread is not None:
+        _sound_while_thread.join(timeout=2)
+
     if args.end:
         subprocess.Popen(["afplay", args.sound_end])
     if os.WIFEXITED(status):
@@ -156,9 +181,25 @@ def main() -> None:
         type=str,
         default="/System/Library/Sounds/Glass.aiff",
     )
+    parser.add_argument(
+        "--sound-while",
+        help="play sound while command is running",
+        type=str,
+        default="",
+    )
+    parser.add_argument(
+        "--autocomplete",
+        help="return autocomplete scripts",
+        action="store_true",
+    )
 
     args = parser.parse_args()
 
+    if args.autocomplete:
+        script = os.path.join(os.path.dirname(__file__), "autocomplete.sh")
+        print(open(script).read())
+        sys.exit(0)
+
     if not args.command:
         parser.print_help()
         sys.exit(1)

nate2_scripts-1.0.3/src/nate2_scripts/bing_wrapper/autocomplete.sh

@@ -0,0 +1,30 @@
+_bing_wrapper() {
+  local -a bing_args
+  local -i double_dash_pos=0
+
+  # Find position of "--"
+  for (( i=1; i <= $#words; i++ )); do
+    if [[ "${words[$i]}" == "--" ]]; then
+      double_dash_pos=$i
+      break
+    fi
+  done
+
+  if (( double_dash_pos > 0 && CURRENT > double_dash_pos )); then
+    # Delegate to the wrapped command's completion
+    words=("${words[@]:$double_dash_pos}")
+    CURRENT=$(( CURRENT - double_dash_pos ))
+    _normal  # let zsh look up the right completion for inner_cmd
+  else
+    # Complete bing-wrapper's own options
+      _arguments \
+      '--end[play sound at end]' \
+      '*--pattern[pattern to listen for]:pattern:' \
+      '--sound-end[sound file at end]:file:_files' \
+      '--sound-pattern[sound file for pattern]:file:_files' \
+       '--sound-while[sound file for duration of command]:file:_files' \
+      '--[inner command]:command:_normal' \
+  fi
+}
+
+compdef _bing_wrapper bing-wrapper

{nate2_scripts-1.0.1 → nate2_scripts-1.0.3}/src/nate2_scripts/console/__init__.py

@@ -21,21 +21,55 @@ from nate2_scripts.console.hashGrabber import HashGrabber
 from nate2_scripts.console.regionCache import RegionCache
 from nate2_scripts.console.sessionCache import SessionCache
 
-
-def get_account_id() -> str:
-    return boto3.client("sts").get_caller_identity()["Account"]
+sts = boto3.client("sts")
 
 
-def get_credentials() -> dict:
+def get_email() -> str:
     result = subprocess.run(
-        ["aws", "configure", "export-credentials"],
-        capture_output=True,
-        text=True,
+        ["git", "config", "user.email"], capture_output=True, text=True
     )
-    if result.returncode != 0:
-        print(f"Error: Failed to export credentials.\n{result.stderr}", file=sys.stderr)
+    return result.stdout.strip()
+
+
+def get_account_id() -> str:
+    return sts.get_caller_identity()["Account"]
+
+
+def get_credentials(account_id: str) -> dict:
+    # Check if already in an assumed role with the correct session name
+    identity = sts.get_caller_identity()
+    arn = identity.get("Arn", "")
+    email = get_email()
+    if f"assumed-role/" in arn and arn.endswith(f"/{email}"):
+        result = subprocess.run(
+            ["aws", "configure", "export-credentials"],
+            capture_output=True,
+            text=True,
+        )
+        if result.returncode == 0:
+            return json.loads(result.stdout)
+
+    profile = os.environ.get("AWS_PROFILE", "default")
+    session = boto3.Session(profile_name=profile)
+    config = session._session.get_scoped_config()
+
+    role_arn = config.get("role_arn", f"arn:aws:iam::{account_id}:role/OrganizationAccountAccessRole")
+    source_profile = config.get("source_profile")
+
+    if source_profile:
+        source_sts = boto3.Session(profile_name=source_profile).client("sts")
+    else:
+        source_sts = sts
+
+    try:
+        response = source_sts.assume_role(
+            RoleArn=role_arn,
+            RoleSessionName=email,
+        )
+    except Exception as e:
+        print(f"Error: Failed to assume role {role_arn}.\n{e}", file=sys.stderr)
         sys.exit(1)
-    return json.loads(result.stdout)
+    return response["Credentials"]
 
 
 def get_signin_token(creds: dict) -> str:
@@ -115,15 +149,15 @@ def parse_args(region_cache: RegionCache) -> argparse.Namespace:
 
 
 def main() -> None:
-    profile_name = get_profile()
     region_cache = RegionCache()
+    args = parse_args(region_cache)
+
+    profile_name = get_profile()
     session_cache = SessionCache()
 
     print("Loading regions from cache:", region_cache.get_regions())
     print("Loading default region from cache:", region_cache.get_default_region())
 
-    args = parse_args(region_cache)
-
     if args.force:
         print("Force passed. Reseting session cache.")
         session_cache.reset()
@@ -131,8 +165,8 @@ def main() -> None:
     if args.region:
         print("Default region is now:", args.region)
 
-    creds = get_credentials()
     account_id = get_account_id()
+    creds = get_credentials(account_id)
     hash = session_cache.get_session_hash(profile_name, creds)
 
     multisession_domain_name = ""
@@ -172,3 +206,6 @@ def main() -> None:
 
 if __name__ == "__main__":
     main()
+
+
+# set user to OrganizationAccountAccessRole/nwestfall@tennex.io

{nate2_scripts-1.0.1 → nate2_scripts-1.0.3}/src/nate2_scripts/console/destitationResolver.py

@@ -107,6 +107,9 @@ class DestinationResolver:
             "ct": f"https://{mdn}{region}.console.aws.amazon.com/cloudtrailv2/",
             "fsx": f"https://{mdn}{region}.console.aws.amazon.com/fsx/",
             "subnet": f"https://{mdn}{region}.console.aws.amazon.com/vpcconsole/home#subnets:",
+            "ssm": f"https://{mdn}{region}.console.aws.amazon.com/systems-manager/",
+            "parameter": f"https://{mdn}{region}.console.aws.amazon.com/systems-manager/parameters/",
+            "ps": f"https://{mdn}{region}.console.aws.amazon.com/systems-manager/parameters/",
             # unchecked
         }
 

{nate2_scripts-1.0.1 → nate2_scripts-1.0.3}/src/nate2_scripts/console/nameResolver.py

@@ -21,13 +21,14 @@ class NameResolver:
     def resolve_name(self, name: str) -> str | None:
         regions = self.region_cache.get_regions()
 
-        # Priority: 0=logs, 1=ec2, 2=s3, 3=cloudformation
+        # Priority: 0=logs, 1=ec2, 2=s3, 3=cloudformation, 4=lambda
         tasks: list[tuple] = []
         for region in regions:
             tasks.append((0, self._resolve_log_group, name, region))
-            tasks.append((1, self._resolve_ec2_instance, name, region))
+            tasks.append((2, self._resolve_ec2_instance, name, region))
             tasks.append((3, self._resolve_cloudformation_stack, name, region))
-        tasks.append((2, self._resolve_s3_bucket, name))
+            tasks.append((4, self._resolve_lambda_function, name, region))
+        tasks.append((1, self._resolve_s3_bucket, name))
 
         results: dict[int, str] = {}
 
@@ -94,6 +95,12 @@ class NameResolver:
         except Exception:
             pass
         return None
-    
-
 
+    def _resolve_lambda_function(self, name: str, region: str) -> str | None:
+        try:
+            boto3.client("lambda", region_name=region).get_function(FunctionName=name)
+            base = f"https://{self.mdn}{region}.console.aws.amazon.com"
+            return f"{base}/lambda/home?region={region}#/functions/{name}"
+        except ClientError:
+            pass
+        return None

{nate2_scripts-1.0.1 → nate2_scripts-1.0.3}/src/nate2_scripts/console/resourceIdResolver.py

@@ -77,14 +77,16 @@ class ResourceIdResolver:
         # keeping it here in case I figure out later
         # if re.match(r"^fl-[0-9a-f]{8,17}$", resource_id):
         #     return "fl"
-        if self._KMS_UUID.match(resource_id) or self._KMS_MRK.match(resource_id):
-            return "kms"
-        if resource_id.startswith("db/"):
-            return "rds"
-        if resource_id.startswith("role/"):
-            return "role"
-        if resource_id.startswith("usr/"):
-            return "user"
+        
+        #   not tested
+        # if self._KMS_UUID.match(resource_id) or self._KMS_MRK.match(resource_id):
+        #     return "kms"
+        # if resource_id.startswith("db/"):
+        #     return "rds"
+        # if resource_id.startswith("role/"):
+        #     return "role"
+        # if resource_id.startswith("usr/"):
+        #     return "user"
         return None
 
     def _resolve_in_region(

{nate2_scripts-1.0.1 → nate2_scripts-1.0.3}/src/nate2_scripts/console/sessionCache.py

@@ -59,9 +59,13 @@ class SessionCache:
 
         # Honour the STS credential expiration if present
         expiration = creds.get("Expiration")
+        print(expiration)
         if expiration:
             try:
-                exp_time = datetime.fromisoformat(expiration.replace("Z", "+00:00"))
+                if isinstance(expiration, datetime):
+                    exp_time = expiration
+                else:
+                    exp_time = datetime.fromisoformat(expiration.replace("Z", "+00:00"))
                 if datetime.now(timezone.utc) >= exp_time:
                     return None
             except ValueError: