aws-annoying 0.8.0__tar.gz → 0.8.1__tar.gz

{aws_annoying-0.8.0 → aws_annoying-0.8.1}/.github/workflows/ci.yaml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up uv
         uses: astral-sh/setup-uv@v6
@@ -26,7 +26,7 @@ jobs:
           enable-cache: true
 
       - name: Install deps
-        run: uv sync --all-extras
+        run: uv sync
 
       - uses: pre-commit/action@v3.0.1
         env:
@@ -49,7 +49,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up uv
         uses: astral-sh/setup-uv@v6
@@ -61,7 +61,7 @@ jobs:
         run: uv python pin "${{ matrix.python-version }}"
 
       - name: Install deps
-        run: uv sync --all-extras
+        run: uv sync
 
       - name: Run tests (Ubuntu)
         if: ${{ matrix.os == 'ubuntu-latest' }}

{aws_annoying-0.8.0 → aws_annoying-0.8.1}/.github/workflows/release.yaml

@@ -4,7 +4,8 @@ on:
   push:
     tags: [v*]
 
-permissions: read-all
+env:
+  UV_FROZEN: 1
 
 jobs:
   release:
@@ -14,7 +15,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up uv
         uses: astral-sh/setup-uv@v6
@@ -23,7 +24,7 @@ jobs:
           enable-cache: true
 
       - name: Install deps
-        run: uv sync --frozen --all-extras
+        run: uv sync
 
       - name: Build package
         run: uv build
@@ -50,7 +51,7 @@ jobs:
     environment: pypi
     steps:
       - name: Retrieve release distributions
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: release-dists
           path: dist/

{aws_annoying-0.8.0 → aws_annoying-0.8.1}/.vscode/extensions.json

@@ -2,16 +2,11 @@
   "recommendations": [
     "ms-python.python",
     "ms-python.vscode-pylance",
-    "ldez.ignore-files",
-    "gruntfuggly.todo-tree",
-    "redhat.vscode-yaml",
-    "tamasfe.even-better-toml",
     "streetsidesoftware.code-spell-checker",
     "editorconfig.editorconfig",
     "visualstudioexptteam.vscodeintellicode",
     "charliermarsh.ruff",
     "ms-python.mypy-type-checker",
-    "njpwerner.autodocstring",
     "ms-python.debugpy"
   ]
 }

{aws_annoying-0.8.0 → aws_annoying-0.8.1}/.vscode/settings.json

@@ -6,7 +6,6 @@
     "editor.defaultFormatter": "charliermarsh.ruff",
     "editor.formatOnSave": true
   },
-  "autoDocstring.docstringFormat": "google-notypes",
   "cSpell.words": [
     "Deregistering",
     "localstack",
@@ -17,13 +16,6 @@
   ],
   "editor.formatOnSave": true,
   "files.eol": "\n",
-  "files.exclude": {
-    ".mypy_cache": true,
-    ".pytest_cache": true,
-    ".ruff_cache": true,
-    ".venv": true,
-    "**/__pycache__": true
-  },
   "files.insertFinalNewline": true,
   "json.format.enable": true,
   "mypy-type-checker.path": [

{aws_annoying-0.8.0 → aws_annoying-0.8.1}/Makefile

@@ -19,12 +19,12 @@ help: Makefile  ## Show help
 # =============================================================================
 install:  ## Install the app locally
 	uv python install
-	uv sync --frozen --all-extras
+	uv sync --frozen
 	pre-commit install --install-hooks
 .PHONY: install
 
 update:  ## Update deps and tools
-	uv sync --upgrade --all-extras
+	uv sync --upgrade
 	pre-commit autoupdate
 .PHONY: update
 

aws_annoying-0.8.1/PKG-INFO

@@ -0,0 +1,91 @@
+Metadata-Version: 2.4
+Name: aws-annoying
+Version: 0.8.1
+Summary: Utils to handle some annoying AWS tasks.
+Project-URL: Homepage, https://github.com/lasuillard/aws-annoying
+Project-URL: Repository, https://github.com/lasuillard/aws-annoying.git
+Project-URL: Issues, https://github.com/lasuillard/aws-annoying/issues
+Author-email: Yuchan Lee <lasuillard@gmail.com>
+License-Expression: MIT
+License-File: LICENSE
+Requires-Python: <4.0,>=3.9
+Requires-Dist: boto3<2,>=1
+Requires-Dist: pydantic<3,>=2
+Requires-Dist: requests<3,>=2
+Requires-Dist: tqdm<5,>=4
+Requires-Dist: typer<1,>=0
+Description-Content-Type: text/markdown
+
+# aws-annoying
+
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+[![CI](https://github.com/lasuillard/aws-annoying/actions/workflows/ci.yaml/badge.svg)](https://github.com/lasuillard/aws-annoying/actions/workflows/ci.yaml)
+[![codecov](https://codecov.io/gh/lasuillard/aws-annoying/graph/badge.svg?token=gbcHMVVz2k)](https://codecov.io/gh/lasuillard/aws-annoying)
+[![PyPI - Version](https://img.shields.io/pypi/v/aws-annoying)](https://pypi.org/project/aws-annoying/)
+
+Utils to handle some annoying AWS tasks.
+
+## ❓ About
+
+This project aims to provide a set of utilities and examples to help with some annoying tasks when working with AWS.
+
+Major directories of the project:
+
+- **aws_annoying** Python package containing CLI and utility functions.
+- **console** Utilities to help working with AWS Console.
+- **examples** Examples of how to use the package.
+
+## 🚀 Installation
+
+It is recommended to use [pipx](https://pipx.pypa.io/stable/) to install `aws-annoying` CLI:
+
+```bash
+$ pipx install aws-annoying
+$ aws-annoying --help
+
+ Usage: aws-annoying [OPTIONS] COMMAND [ARGS]...
+
+...
+```
+
+As the package also provides some utility functions, you can install `aws-annoying` via pip, if you are going to use those utils.
+
+## 💡 Usage
+
+Below are brief explanation of available commands. For more detailed information about commands, please refer to the CLI help.
+
+### `ecs task-definition-lifecycle`
+
+Expire and delete ECS task definitions based on criteria.
+
+### `ecs wait-for-deployment`
+
+Wait for ECS deployment to start, complete or fail, and stabilize.
+
+### `load-variables`
+
+Wrapper command to run command with variables from various AWS resources (SSM Parameter Store, Secrets Manager, etc.) injected as environment variables.
+
+### `mfa configure`
+
+Configure AWS profile or refresh session for MFA.
+
+### `session-manager install`
+
+Install AWS Session Manager plugin.
+
+### `session-manager port-forward`
+
+Start a port forwarding session using AWS Session Manager.
+
+### `session-manager start`
+
+Start new session via Session Manager.
+
+### `session-manager stop`
+
+Stop running port forwarding session for PID file.
+
+## 💖 Contributing
+
+Any feedback, suggestions or contributions are welcome! Feel free to open an issue or a pull request.

aws_annoying-0.8.1/README.md

@@ -0,0 +1,73 @@
+# aws-annoying
+
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+[![CI](https://github.com/lasuillard/aws-annoying/actions/workflows/ci.yaml/badge.svg)](https://github.com/lasuillard/aws-annoying/actions/workflows/ci.yaml)
+[![codecov](https://codecov.io/gh/lasuillard/aws-annoying/graph/badge.svg?token=gbcHMVVz2k)](https://codecov.io/gh/lasuillard/aws-annoying)
+[![PyPI - Version](https://img.shields.io/pypi/v/aws-annoying)](https://pypi.org/project/aws-annoying/)
+
+Utils to handle some annoying AWS tasks.
+
+## ❓ About
+
+This project aims to provide a set of utilities and examples to help with some annoying tasks when working with AWS.
+
+Major directories of the project:
+
+- **aws_annoying** Python package containing CLI and utility functions.
+- **console** Utilities to help working with AWS Console.
+- **examples** Examples of how to use the package.
+
+## 🚀 Installation
+
+It is recommended to use [pipx](https://pipx.pypa.io/stable/) to install `aws-annoying` CLI:
+
+```bash
+$ pipx install aws-annoying
+$ aws-annoying --help
+
+ Usage: aws-annoying [OPTIONS] COMMAND [ARGS]...
+
+...
+```
+
+As the package also provides some utility functions, you can install `aws-annoying` via pip, if you are going to use those utils.
+
+## 💡 Usage
+
+Below are brief explanation of available commands. For more detailed information about commands, please refer to the CLI help.
+
+### `ecs task-definition-lifecycle`
+
+Expire and delete ECS task definitions based on criteria.
+
+### `ecs wait-for-deployment`
+
+Wait for ECS deployment to start, complete or fail, and stabilize.
+
+### `load-variables`
+
+Wrapper command to run command with variables from various AWS resources (SSM Parameter Store, Secrets Manager, etc.) injected as environment variables.
+
+### `mfa configure`
+
+Configure AWS profile or refresh session for MFA.
+
+### `session-manager install`
+
+Install AWS Session Manager plugin.
+
+### `session-manager port-forward`
+
+Start a port forwarding session using AWS Session Manager.
+
+### `session-manager start`
+
+Start new session via Session Manager.
+
+### `session-manager stop`
+
+Stop running port forwarding session for PID file.
+
+## 💖 Contributing
+
+Any feedback, suggestions or contributions are welcome! Feel free to open an issue or a pull request.

{aws_annoying-0.8.0 → aws_annoying-0.8.1}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "aws-annoying"
 description = "Utils to handle some annoying AWS tasks."
-version = "0.8.0"
+version = "0.8.1"
 authors = [{ name = "Yuchan Lee", email = "lasuillard@gmail.com" }]
 readme = "README.md"
 license = "MIT"
@@ -17,7 +17,7 @@ dependencies = [
 [project.scripts]
 "aws-annoying" = "aws_annoying.cli.main:entrypoint"
 
-[project.optional-dependencies]
+[dependency-groups]
 dev = [
   "boto3-stubs[ecs,secretsmanager,ssm,sts,ec2]>=1.37.1",
   "mypy>=1.15,<1.17",
@@ -26,12 +26,12 @@ dev = [
 ]
 test = [
   "coverage>=7.6,<7.9",
-  "moto[secretsmanager,server,ssm,ecs]~=5.1.1",
-  "pytest~=8.3.2",
+  "moto[secretsmanager,server,ssm,ecs]~=5.1.8",
+  "pytest>=8.3.2,<8.5.0",
   "pytest-cov>=6.0,<6.2",
   "pytest-env~=1.1.1",
   "pytest-snapshot>=0.9.0",
-  "pytest-sugar~=1.0.0",
+  "pytest-sugar>=1.0,<1.2",
   "pytest-xdist>=3.6.1",
   "testcontainers[localstack]>=4.9.2",
   "toml>=0.10.2",
@@ -47,6 +47,9 @@ Issues = "https://github.com/lasuillard/aws-annoying/issues"
 requires = ["hatchling"]
 build-backend = "hatchling.build"
 
+[tool.uv]
+default-groups = ["dev", "test"]
+
 [tool.hatch.build.targets.wheel]
 packages = ["aws_annoying"]
 

aws_annoying-0.8.1/tests/cli/ecs/snapshots/test_task_definition_lifecycle/test_delete/stdout.txt

@@ -0,0 +1,19 @@
+⚠️ Deregistering 15 task definitions...
+⚠️ Deregistered task definition 'my-task:1'
+⚠️ Deregistered task definition 'my-task:2'
+⚠️ Deregistered task definition 'my-task:3'
+⚠️ Deregistered task definition 'my-task:4'
+⚠️ Deregistered task definition 'my-task:5'
+⚠️ Deregistered task definition 'my-task:6'
+⚠️ Deregistered task definition 'my-task:7'
+⚠️ Deregistered task definition 'my-task:8'
+⚠️ Deregistered task definition 'my-task:9'
+⚠️ Deregistered task definition 'my-task:10'
+⚠️ Deregistered task definition 'my-task:11'
+⚠️ Deregistered task definition 'my-task:12'
+⚠️ Deregistered task definition 'my-task:13'
+⚠️ Deregistered task definition 'my-task:14'
+⚠️ Deregistered task definition 'my-task:15'
+⚠️ Deleting 15 task definitions in chunks of size 10...
+⚠️ Deleted 10 task definitions in 0-th batch.
+⚠️ Deleted 5 task definitions in 1-th batch.

{aws_annoying-0.8.0 → aws_annoying-0.8.1}/tests/cli/ecs/test_task_definition_lifecycle.py

@@ -50,28 +50,70 @@ def test_basic(snapshot: Snapshot) -> None:
             family,
             "--keep-latest",
             str(keep_latest),
-            # ? `delete_task_definitions` not implemented in moto yet
-            # "--delete",
         ],
     )
-    task_definitions = [
-        ecs.describe_task_definition(taskDefinition=f"{family}:{i}")["taskDefinition"]
-        for i in range(1, num_task_defs + 1)
-    ]
 
     # Assert
     assert result.exit_code == 0
     snapshot.assert_match(normalize_console_output(result.stdout), "stdout.txt")
 
-    # ?: Moto (v5.1.1) `ecs.list_task_definitions` does not handle `status` filter properly
-    # ?:               + sorting also does not work (current behavior is ASC)
-    assert [td["revision"] for td in task_definitions if td["status"] == "INACTIVE"] == list(
-        range(1, num_task_defs - keep_latest + 1),  # 1..15
-    )
-    assert [td["revision"] for td in task_definitions if td["status"] == "ACTIVE"] == list(
-        range(num_task_defs - keep_latest + 1, num_task_defs + 1),  # 16..25
+    active_task_definitions = ecs.list_task_definitions(familyPrefix=family, status="ACTIVE")
+    assert active_task_definitions["taskDefinitionArns"] == [
+        f"arn:aws:ecs:us-east-1:123456789012:task-definition/{family}:{i}" for i in range(16, 26)
+    ]
+
+    inactive_task_definitions = ecs.list_task_definitions(familyPrefix=family, status="INACTIVE")
+    assert inactive_task_definitions["taskDefinitionArns"] == [
+        f"arn:aws:ecs:us-east-1:123456789012:task-definition/{family}:{i}" for i in range(1, 16)
+    ]
+
+
+def test_delete(snapshot: Snapshot) -> None:
+    """The command should deregister the oldest task definitions."""
+    # Arrange
+    ecs = boto3.client("ecs")
+    family = "my-task"
+    num_task_defs = 25
+    for i in range(1, num_task_defs + 1):
+        ecs.register_task_definition(
+            family=family,
+            containerDefinitions=[
+                {
+                    "name": "my-container",
+                    "image": f"my-image:{i}",
+                    "cpu": 0,
+                    "memory": 0,
+                },
+            ],
+        )
+
+    # Act
+    keep_latest = 10
+    result = runner.invoke(
+        app,
+        [
+            "ecs",
+            "task-definition-lifecycle",
+            "--family",
+            family,
+            "--keep-latest",
+            str(keep_latest),
+            "--delete",
+        ],
     )
 
+    # Assert
+    assert result.exit_code == 0
+    snapshot.assert_match(normalize_console_output(result.stdout), "stdout.txt")
+
+    active_task_definitions = ecs.list_task_definitions(familyPrefix=family, status="ACTIVE")
+    assert active_task_definitions["taskDefinitionArns"] == [
+        f"arn:aws:ecs:us-east-1:123456789012:task-definition/{family}:{i}" for i in range(16, 26)
+    ]
+
+    inactive_task_definitions = ecs.list_task_definitions(familyPrefix=family, status="INACTIVE")
+    assert inactive_task_definitions["taskDefinitionArns"] == []
+
 
 def test_dry_run(snapshot: Snapshot) -> None:
     """If `--dry-run` option given, the command should not perform any changes."""
@@ -107,16 +149,13 @@ def test_dry_run(snapshot: Snapshot) -> None:
             "--delete",
         ],
     )
-    task_definitions = [
-        ecs.describe_task_definition(taskDefinition=f"{family}:{i}")["taskDefinition"]
-        for i in range(1, num_task_defs + 1)
-    ]
 
     # Assert
     assert result.exit_code == 0
     snapshot.assert_match(normalize_console_output(result.stdout), "stdout.txt")
 
-    # ?: Moto (v5.1.1) `ecs.list_task_definitions` does not handle `status` filter properly
-    # ?:               + sorting also does not work (current behavior is ASC)
-    assert [td["revision"] for td in task_definitions if td["status"] == "INACTIVE"] == []
-    assert len([td["revision"] for td in task_definitions if td["status"] == "ACTIVE"]) == num_task_defs
+    active_task_definitions = ecs.list_task_definitions(familyPrefix=family, status="ACTIVE")
+    assert len(active_task_definitions["taskDefinitionArns"]) == 25
+
+    inactive_task_definitions = ecs.list_task_definitions(familyPrefix=family, status="INACTIVE")
+    assert len(inactive_task_definitions["taskDefinitionArns"]) == 0

{aws_annoying-0.8.0 → aws_annoying-0.8.1}/tests/cli/test_load_variables.py

@@ -221,7 +221,8 @@ def test_unsupported_resource(snapshot: Snapshot) -> None:
 @pytest.mark.parametrize(
     argnames="arn",
     argvalues=[
-        # TODO(lasuillard): Moto Secrets Manager does not respond with error for non-existing resources
+        # TODO(lasuillard): `batch_get_secret_value` does not raise an error if secret does not exist.
+        #                   Consider implementing new flag for strict mode (e.g. `--if-not-exists={error,ignore}`)
         # "arn:aws:secretsmanager:us-east-1:123456789012:secret:unknown-secret", # noqa: ERA001
         "arn:aws:ssm:us-east-1:123456789012:parameter/unknown-parameter",
     ],