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

nate2_scripts-1.0.1/.github/workflows/publish.yml

@@ -0,0 +1,64 @@
+name: Publish to PyPI
+
+# Trigger this workflow on every push to the main branch.
+# To prevent unauthorized publishes, protect main with branch protection rules
+# (require PRs + approvals) and add required reviewers to the "pypi" environment.
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    name: Build distribution
+    runs-on: ubuntu-latest
+
+    steps:
+      # GitHub Actions run on fresh virtual machines that have no knowledge of your code.
+      # This step clones your repository into the runner so subsequent steps can access your files.
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
+
+      - name: Install Hatch
+        run: pip install hatch
+
+      # Produces a source distribution (sdist) and a wheel in the dist/ directory.
+      # The version published is whatever is set in pyproject.toml — bump it before
+      # merging to main, otherwise PyPI will reject a duplicate version.
+      - name: Build package
+        run: hatch build
+
+      # Pass the built artifacts to the publish job via GitHub's artifact storage.
+      - name: Upload distribution artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: dist
+          path: dist/
+
+  publish:
+    name: Publish to PyPI
+    needs: build  # only runs after the build job succeeds
+    runs-on: ubuntu-latest
+    # The "pypi" environment can be configured in GitHub (Settings → Environments)
+    # to require manual approval before this job runs, adding an extra gate on publishing.
+    environment:
+      name: pypi
+      url: https://pypi.org/p/nate2-scripts
+    permissions:
+      id-token: write  # required for Trusted Publishing (OIDC) — no API token needed
+
+    steps:
+      - name: Download distribution artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: dist
+          path: dist/
+
+      # Uses PyPA's official action with Trusted Publishing (OIDC).
+      # PyPI must be configured with a Trusted Publisher pointing at this repo/workflow.
+      - name: Publish to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1

nate2_scripts-1.0.1/.gitignore

@@ -0,0 +1,3 @@
+__pycache__
+dist
+.vscode

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nate2-scripts
-Version: 1.0.0
+Version: 1.0.1
 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.0 → nate2_scripts-1.0.1}/README.md

@@ -1,3 +1,7 @@
+
+[![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)
+
 # Nate2's Scripts
 
 Utility scripts for AWS development on macOS.
@@ -5,7 +9,7 @@ Utility scripts for AWS development on macOS.
 To install run:
 
 ```bash
-pip install git+https://github.com/tennex-nwestfall/scripts.git
+pip install nate2-scripts
 ```
 
 ## Scripts

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

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "nate2-scripts"
-version = "1.0.0"
+version = "1.0.1"
 description = "Utility scripts for AWS development on macOS"
 requires-python = ">=3.11"
 dependencies = [

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

@@ -4,7 +4,8 @@ import sys
 from dataclasses import dataclass
 import boto3
 from nate2_scripts.console.arnResolver import ArnResolver
-from nate2_scripts.console.regionCache import DEFAULT_REGION, RegionCache
+from nate2_scripts.console.nameResolver import NameResolver
+from nate2_scripts.console.regionCache import RegionCache
 from botocore.exceptions import ClientError
 import urllib.parse
 
@@ -36,6 +37,9 @@ class DestinationResolver:
         if not service:
             return f"https://{self.mdn}{default_region}.console.aws.amazon.com/"
         
+        if service.lower() in service_urls:
+            return service_urls[service.lower()]
+        
         arn_dest = ArnResolver(self.account,self.mdn).try_parse_arn(service)
         if arn_dest:
             return arn_dest
@@ -44,10 +48,13 @@ class DestinationResolver:
         if id_dest:
             return id_dest
         
-        if service.lower() not in service_urls:
-            print(f"Error: Unknown service '{service}'.", file=sys.stderr)
-            sys.exit(1)
-        return service_urls[service.lower()]
+        name_dest = NameResolver(self.region_cache, self.mdn).resolve_name(service)
+        if name_dest:
+            return name_dest
+        
+        print(f"Error: Unknown service '{service}'.", file=sys.stderr)
+        sys.exit(1)
+
 
     @staticmethod
     def _get_services(region: str, mdn: str = "") -> dict[str, str]:
@@ -98,6 +105,8 @@ class DestinationResolver:
             "athena": f"https://{mdn}{region}.console.aws.amazon.com/athena/home#/query-editor",
             "cloudtrail": f"https://{mdn}{region}.console.aws.amazon.com/cloudtrailv2/",
             "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:",
             # unchecked
         }
 

nate2_scripts-1.0.1/src/nate2_scripts/console/nameResolver.py

@@ -0,0 +1,99 @@
+import re
+import urllib.parse
+from concurrent.futures import ThreadPoolExecutor, as_completed
+
+import boto3
+from botocore.exceptions import ClientError
+
+from nate2_scripts.console.regionCache import RegionCache
+
+MAX_THREADS = 10
+
+
+class NameResolver:
+    region_cache: RegionCache
+    mdn: str
+
+    def __init__(self, region_cache: RegionCache, multisession_domain_name: str):
+        self.region_cache = region_cache
+        self.mdn = multisession_domain_name
+
+    def resolve_name(self, name: str) -> str | None:
+        regions = self.region_cache.get_regions()
+
+        # Priority: 0=logs, 1=ec2, 2=s3, 3=cloudformation
+        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((3, self._resolve_cloudformation_stack, name, region))
+        tasks.append((2, self._resolve_s3_bucket, name))
+
+        results: dict[int, str] = {}
+
+        with ThreadPoolExecutor(max_workers=MAX_THREADS) as executor:
+            future_to_priority = {
+                executor.submit(fn, *args): priority
+                for priority, fn, *args in tasks
+            }
+            for future in as_completed(future_to_priority):
+                priority = future_to_priority[future]
+                url = future.result()
+                if url is not None and priority not in results:
+                    results[priority] = url
+
+        for priority in sorted(results):
+            return results[priority]
+        return None
+
+    def _resolve_log_group(self, name: str, region: str) -> str | None:
+        try:
+            result = boto3.client("logs", region_name=region).describe_log_groups(
+                logGroupNamePrefix=name
+            )
+            if any(lg["logGroupName"] == name for lg in result.get("logGroups", [])):
+                base = f"https://{self.mdn}{region}.console.aws.amazon.com"
+                encoded = urllib.parse.quote(name, safe="")
+                return f"{base}/cloudwatch/home?region={region}#logsV2:log-groups/log-group/{encoded}"
+        except ClientError:
+            pass
+        return None
+
+    def _resolve_ec2_instance(self, name: str, region: str) -> str | None:
+        try:
+            result = boto3.client("ec2", region_name=region).describe_instances(
+                Filters=[{"Name": "tag:Name", "Values": [name]}]
+            )
+            reservations = result.get("Reservations", [])
+            if reservations:
+                base = f"https://{self.mdn}{region}.console.aws.amazon.com"
+                instance_id = reservations[0]["Instances"][0]["InstanceId"]
+                return f"{base}/ec2/v2/home?region={region}#InstanceDetails:instanceId={instance_id}"
+        except ClientError:
+            pass
+        return None
+
+    def _resolve_cloudformation_stack(self, name: str, region: str) -> str | None:
+        try:
+            result = boto3.client("cloudformation", region_name=region).describe_stacks(
+                StackName=name
+            )
+            stacks = result.get("Stacks", [])
+            if stacks:
+                base = f"https://{self.mdn}{region}.console.aws.amazon.com"
+                stack_id = urllib.parse.quote(stacks[0]["StackId"], safe="")
+                return f"{base}/cloudformation/home?region={region}#/stacks/stackinfo?stackId={stack_id}"
+        except ClientError:
+            pass
+        return None
+
+    def _resolve_s3_bucket(self, name: str) -> str | None:
+        try:
+            boto3.client("s3").head_bucket(Bucket=name)
+            return f"https://{self.mdn}us-east-1.console.aws.amazon.com/s3/buckets/{name}"
+        except Exception:
+            pass
+        return None
+    
+
+

nate2_scripts-1.0.0/.gitignore

@@ -1 +0,0 @@
-__pycache__

nate2_scripts-1.0.0/testing.txt

@@ -1,9 +0,0 @@
-ec2
-
-i-04338f521d58918dd
-
-arn:aws:ec2:us-east-1:905502466771:instance/i-04338f521d58918dd
-
-arn:aws:logs:us-east-1:905502466771:log-group:/aws/parallelcluster/pcluster-lab-nate2-202607062002:*
-
-arn:aws:logs:us-west-2:905502466771:log-group:/aws/lambda/InternalTestingStack-1-TagBucketLambda1DCC2FF9-dwonHDanL8Xf:*