pulumi-extra 0.1.0__tar.gz → 0.1.2__tar.gz

{pulumi_extra-0.1.0 → pulumi_extra-0.1.2}/.devcontainer/devcontainer.json

@@ -10,11 +10,11 @@
   "overrideCommand": true,
   "workspaceFolder": "/workspaces/pulumi-extra",
   "features": {
-    "ghcr.io/devcontainers-contrib/features/pre-commit:2": {},
+    "ghcr.io/devcontainers-extra/features/pre-commit:2": {},
     "ghcr.io/devcontainers/features/docker-in-docker:2": {}
   },
   "onCreateCommand": "./.devcontainer/onCreateCommand.sh",
-  "postAttachCommand": "make install",
+  "postAttachCommand": "./.devcontainer/postAttachCommand.sh",
   "customizations": {
     "vscode": {
       "extensions": [
@@ -33,8 +33,5 @@
         "ms-python.debugpy"
       ]
     }
-  },
-  "containerEnv": {
-    "PYTHONPATH": "${containerWorkspaceFolder}"
   }
 }

{pulumi_extra-0.1.0 → pulumi_extra-0.1.2}/.devcontainer/postAttachCommand.sh

@@ -1,3 +1,5 @@
 #!/usr/bin/env bash
 
 sudo chown --recursive "$(id --user):$(id --group)" ~
+
+make install

{pulumi_extra-0.1.0 → pulumi_extra-0.1.2}/.github/dependabot.yaml

@@ -1,12 +1,13 @@
 # https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
 version: 2
+enable-beta-ecosystems: true
 updates:
   - package-ecosystem: github-actions
     directory: /
     schedule:
       interval: monthly
 
-  - package-ecosystem: pip
+  - package-ecosystem: uv
     directory: /
     schedule:
       interval: monthly

{pulumi_extra-0.1.0 → pulumi_extra-0.1.2}/.github/workflows/ci.yaml

@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v6
         with:
           version: latest
           enable-cache: true
@@ -28,6 +28,15 @@ jobs:
       - name: Install deps
         run: uv sync --all-extras
 
+      - name: Toolchain caching
+        uses: actions/cache@v4
+        with:
+          path: |
+            .mypy_cache
+          key: ${{ runner.os }}-toolchain-cache-${{ hashFiles('**/uv.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-toolchain-cache-
+
       - uses: pre-commit/action@v3.0.1
         env:
           SKIP: pytest
@@ -51,7 +60,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v6
         with:
           version: latest
           enable-cache: true

{pulumi_extra-0.1.0 → pulumi_extra-0.1.2}/.github/workflows/release.yaml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v6
         with:
           version: latest
           enable-cache: true

{pulumi_extra-0.1.0 → pulumi_extra-0.1.2}/Makefile

@@ -46,7 +46,7 @@ lint:  ## Run all linters
 .PHONY: lint
 
 test:  ## Run tests
-	uv run pytest
+	uv run nox
 	uv run coverage html
 .PHONY: test
 

{pulumi_extra-0.1.0 → pulumi_extra-0.1.2}/PKG-INFO

@@ -1,7 +1,10 @@
 Metadata-Version: 2.4
 Name: pulumi-extra
-Version: 0.1.0
+Version: 0.1.2
 Summary: Extra Pulumi utils and resources.
+Project-URL: Homepage, https://github.com/lasuillard/pulumi-extra
+Project-URL: Repository, https://github.com/lasuillard/pulumi-extra.git
+Project-URL: Issues, https://github.com/lasuillard/pulumi-extra/issues
 Author-email: Yuchan Lee <lasuillard@gmail.com>
 License-Expression: MIT
 License-File: LICENSE
@@ -20,10 +23,11 @@ Provides-Extra: policy
 Requires-Dist: pulumi-policy<2,>=1; extra == 'policy'
 Provides-Extra: test
 Requires-Dist: coverage~=7.3; extra == 'test'
-Requires-Dist: nox~=2024.10.9; extra == 'test'
+Requires-Dist: nox<2025.3.0,>=2024.10.9; extra == 'test'
+Requires-Dist: pulumi-docker>=4.6.1; extra == 'test'
 Requires-Dist: pulumi-random>=4.18.0; extra == 'test'
 Requires-Dist: pytest-cov<7,>=5; extra == 'test'
-Requires-Dist: pytest-order>=1.3.0; extra == 'test'
+Requires-Dist: pytest-forked>=1.6.0; extra == 'test'
 Requires-Dist: pytest-sugar~=1.0; extra == 'test'
 Requires-Dist: pytest~=8.0; extra == 'test'
 Description-Content-Type: text/markdown
@@ -33,6 +37,6 @@ Description-Content-Type: text/markdown
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![CI](https://github.com/lasuillard/pulumi-extra/actions/workflows/ci.yaml/badge.svg)](https://github.com/lasuillard/pulumi-extra/actions/workflows/ci.yaml)
 [![codecov](https://codecov.io/gh/lasuillard/pulumi-extra/graph/badge.svg?token=uuckU93NAu)](https://codecov.io/gh/lasuillard/pulumi-extra)
-![GitHub Release](https://img.shields.io/github/v/release/lasuillard/pulumi-extra)
+[![PyPI - Version](https://img.shields.io/pypi/v/pulumi-extra)](https://pypi.org/project/pulumi-extra/)
 
 Extra Pulumi utils and resources.

{pulumi_extra-0.1.0 → pulumi_extra-0.1.2}/README.md

@@ -3,6 +3,6 @@
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![CI](https://github.com/lasuillard/pulumi-extra/actions/workflows/ci.yaml/badge.svg)](https://github.com/lasuillard/pulumi-extra/actions/workflows/ci.yaml)
 [![codecov](https://codecov.io/gh/lasuillard/pulumi-extra/graph/badge.svg?token=uuckU93NAu)](https://codecov.io/gh/lasuillard/pulumi-extra)
-![GitHub Release](https://img.shields.io/github/v/release/lasuillard/pulumi-extra)
+[![PyPI - Version](https://img.shields.io/pypi/v/pulumi-extra)](https://pypi.org/project/pulumi-extra/)
 
 Extra Pulumi utils and resources.

{pulumi_extra-0.1.0 → pulumi_extra-0.1.2}/pulumi_extra/contrib/aws/autotag.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 import pulumi
-import pulumi_aws  # noqa: F401; Required to detect resources otherwise `is_taggable` will always return `False`
+import pulumi_aws  # noqa: F401 ; Required to detect resources otherwise `is_taggable` will always return `False`
 
 from pulumi_extra import resource_has_attribute
 

{pulumi_extra-0.1.0 → pulumi_extra-0.1.2}/pulumi_extra/contrib/gcp/autolabel.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 import pulumi
-import pulumi_gcp  # noqa: F401; Required to detect resources otherwise `is_labelable` will always return `False`
+import pulumi_gcp  # noqa: F401 ; Required to detect resources otherwise `is_labelable` will always return `False`
 
 from pulumi_extra import resource_has_attribute
 

{pulumi_extra-0.1.0 → pulumi_extra-0.1.2}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "pulumi-extra"
 description = "Extra Pulumi utils and resources."
-version = "0.1.0"
+version = "0.1.2"
 authors = [{ name = "Yuchan Lee", email = "lasuillard@gmail.com" }]
 readme = "README.md"
 license = "MIT"
@@ -15,14 +15,20 @@ test = [
 	"pytest-cov>=5,<7",
 	"pytest-sugar~=1.0",
 	"pytest~=8.0",
-	"nox~=2024.10.9",
+	"nox>=2024.10.9,<2025.3.0",
 	"pulumi-random>=4.18.0",
-	"pytest-order>=1.3.0",
+	"pulumi-docker>=4.6.1",
+	"pytest-forked>=1.6.0",
 ]
 policy = ["pulumi-policy>=1,<2"]
 aws = ["pulumi-aws>=6"]
 gcp = ["pulumi-gcp>=8"]
 
+[project.urls]
+Homepage = "https://github.com/lasuillard/pulumi-extra"
+Repository = "https://github.com/lasuillard/pulumi-extra.git"
+Issues = "https://github.com/lasuillard/pulumi-extra/issues"
+
 [build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"
@@ -71,6 +77,9 @@ addopts = [
 	"-rs",
 ]
 testpaths = ["tests"]
+markers = [
+	"integration: mark a test as an integration test",
+]
 
 [tool.coverage.run]
 include = ["pulumi_extra/*"]

pulumi_extra-0.1.2/tests/_helpers.py

@@ -0,0 +1,7 @@
+from typing import Any
+
+from pulumi import automation
+
+
+def resolve_output_values(outputs: automation.OutputMap) -> dict[str, Any]:
+    return {k: v.value for k, v in outputs.items()}

{pulumi_extra-0.1.0 → pulumi_extra-0.1.2}/tests/test_resource_.py

@@ -4,14 +4,13 @@ import pytest
 
 from pulumi_extra import get_resource_cls, resource_has_attribute
 from pulumi_extra.errors import UnknownResourceTypeError
-from tests._helpers import Order
 
 
 class Test__resource_has_attribute:
-    @pytest.mark.order(Order.AfterRegistryInit)
+    @pytest.mark.forked
     def test(self) -> None:
         # Arrange
-        import pulumi_random  # noqa: F401
+        import pulumi_random  # noqa: F401, PLC0415
 
         # Act & Assert
         assert resource_has_attribute("random:index/randomId:RandomId", "byte_length") is True
@@ -31,10 +30,10 @@ class Test__resource_has_attribute:
 
 
 class Test__get_resource_cls:
-    @pytest.mark.order(Order.AfterRegistryInit)
+    @pytest.mark.forked
     def test(self) -> None:
         # Arrange
-        import pulumi_random  # noqa: F401
+        import pulumi_random  # noqa: F401, PLC0415
 
         # Act
         cls = get_resource_cls("random:index/randomId:RandomId")
@@ -43,7 +42,7 @@ class Test__get_resource_cls:
         assert cls is not None
         assert f"{cls.__module__}.{cls.__name__}" == "pulumi_random.random_id.RandomId"
 
-    @pytest.mark.order(Order.BeforeRegistryInit)
+    @pytest.mark.forked
     def test_registry_not_initialized(self) -> None:
         """If registry not initialized, it will return `None`."""
         # Arrange

pulumi_extra-0.1.2/tests/transforms/test_invoke.py

@@ -0,0 +1,69 @@
+from collections.abc import Iterator
+from pathlib import Path
+
+import pulumi
+import pytest
+from pulumi import automation
+
+from pulumi_extra import override_invoke, override_invoke_defaults
+from tests._helpers import resolve_output_values
+
+pytestmark = pytest.mark.integration
+
+
+def pulumi_program() -> None:
+    import pulumi_docker as docker  # noqa: PLC0415
+
+    # ? Invoke transforms cannot be applied to per-resource basis
+    invoke_transforms = [
+        # Will modify default
+        override_invoke_defaults("*", defaults={"insecure_skip_verify": True}),
+        # This will not have any effect (no match)
+        override_invoke("_", args={"insecure_skip_verify": False}),
+        # Will override argument
+        override_invoke("*", args={"name": "busybox"}),
+    ]
+    for it in invoke_transforms:
+        pulumi.runtime.register_invoke_transform(it)
+
+    busybox = docker.get_registry_image(name="scratch")
+
+    for attr in ("name", "insecure_skip_verify"):
+        pulumi.export(attr, getattr(busybox, attr))
+
+
+@pytest.fixture
+def pulumi_stack(tmpdir: Path) -> Iterator[automation.Stack]:
+    stack = automation.create_or_select_stack(
+        stack_name="test",
+        project_name="test",
+        program=pulumi_program,
+        opts=automation.LocalWorkspaceOptions(
+            env_vars={
+                "PULUMI_BACKEND_URL": f"file://{tmpdir}",
+                "PULUMI_CONFIG_PASSPHRASE": "test",
+            },
+        ),
+    )
+    stack.up(on_output=print)
+    yield stack
+    stack.destroy(on_output=print, remove=True)
+
+
+class Test__override_invoke:
+    @pytest.mark.forked
+    def test(self, pulumi_stack: automation.Stack) -> None:
+        # Arrange
+        # ...
+
+        # Act
+        outputs = pulumi_stack.outputs()
+
+        # Assert
+        assert resolve_output_values(outputs) == {
+            "name": "busybox",
+            "insecure_skip_verify": True,
+        }
+
+
+# TODO(lasuillard): `override_invoke_options` has not been tested, currently I'm not aware of a way (inspect resource's options) to test it.  # noqa: E501

pulumi_extra-0.1.2/tests/transforms/test_resource_.py

@@ -0,0 +1,71 @@
+from collections.abc import Iterator
+from pathlib import Path
+
+import pulumi
+import pytest
+from pulumi import automation
+
+from pulumi_extra import override_resource, override_resource_defaults
+from tests._helpers import resolve_output_values
+
+pytestmark = pytest.mark.integration
+
+
+def pulumi_program() -> None:
+    import pulumi_docker as docker  # noqa: PLC0415
+
+    busybox = docker.RemoteImage(
+        "busybox",
+        opts=pulumi.ResourceOptions(
+            transforms=[
+                # Modify default
+                override_resource_defaults("*", defaults={"platform": "linux/amd64"}),
+                # This will not have any effect (no match)
+                override_resource("_", props={"platform": "linux/arm64"}),
+                # Will modify argument
+                override_resource("*", props={"name": "busybox"}),
+            ],
+        ),
+        name="scratch",
+        keep_locally=True,
+    )
+
+    for attr in ("name", "platform"):
+        pulumi.export(attr, getattr(busybox, attr))
+
+
+@pytest.fixture
+def pulumi_stack(tmpdir: Path) -> Iterator[automation.Stack]:
+    stack = automation.create_or_select_stack(
+        stack_name="test",
+        project_name="test",
+        program=pulumi_program,
+        opts=automation.LocalWorkspaceOptions(
+            env_vars={
+                "PULUMI_BACKEND_URL": f"file://{tmpdir}",
+                "PULUMI_CONFIG_PASSPHRASE": "test",
+            },
+        ),
+    )
+    stack.up(on_output=print)
+    yield stack
+    stack.destroy(on_output=print, remove=True)
+
+
+class Test__override_resource:
+    @pytest.mark.forked
+    def test(self, pulumi_stack: automation.Stack) -> None:
+        # Arrange
+        # ...
+
+        # Act
+        outputs = pulumi_stack.outputs()
+
+        # Assert
+        assert resolve_output_values(outputs) == {
+            "name": "busybox",
+            "platform": "linux/amd64",  # Original default value is ""
+        }
+
+
+# TODO(lasuillard): `override_resource_options` has not been tested, currently I'm not aware of a way (inspect resource's options) to test it.  # noqa: E501