Update stamp_subdir for directory_reorg changes

Author: hartmans

carthage_aws/connection.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2022, 2023, 2024, Hadron Industries, Inc.
+# Copyright (C) 2022, 2023, 2024, 2025, Hadron Industries, Inc.
 # Carthage is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License version 3
 # as published by the Free Software Foundation. It is distributed
@@ -8,7 +8,6 @@
 
 from pathlib import Path
 import asyncio
-import os
 import typing
 
 import carthage.network
@@ -198,6 +197,15 @@ def resource_types_to_tag(self)-> list:
         '''
         return [self.resource_type]
 
+    @property
+    def deployable_names(self):
+        res = []
+        if name := getattr(self, 'name', None):
+            res.append(f'{self.resource_type}:{name}')
+        if hasattr(super(), 'deployable_names'):
+            res.extend(super().deployable_names)
+        return res
+
     def should_retag(self) -> bool:
         '''Returns true if the resource's current tags do not align
         with what :meth:`resource_tags` says they should be.
@@ -504,11 +512,9 @@ async def read_write_hook(self):
         '''
 
 
-    @memoproperty
-    def stamp_path(self):
-        p = Path(self.config_layout.state_dir)
-        p = p.joinpath("aws_stamps", self.stamp_type,str(self.id)+".stamps")
-        os.makedirs(p, exist_ok=True)
+    @property
+    def stamp_subdir(self):
+        p = Path("aws").joinpath(self.stamp_type,str(self.id))
         return p
 
     async def dynamic_dependencies(self):

pyproject.toml

@@ -35,6 +35,7 @@ disable = [
     "C0116",  # missing-function-docstring: 1
     "C0103",  # invalid-name: 1
     "W0401",  # wildcard-import: 3
+              'R0901', #too many instance ancestors
     "R0902",  # too-many-instance-attributes: 5
     "C0121",  # singleton-comparison: 3
     "W0614",  # unused-wildcard-import: 3