Edickinson release candidate

.flake8

@@ -1,4 +1,7 @@
 [flake8]
-ignore = F401
-exclude = .git,.github,examples,__pycache__,docs
-max-complexity = 10
+ignore = F401,C901,F811,E203,W503,E501
+exclude = .git,.github,examples,__pycache__,docs,venv,env,.venv,build,examples
+max-complexity = 10
+max-line-length = 120
+builtins = unicode
+tee = True

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "pip"
+    directory: "/requirements.txt" # Location of package manifests
+    schedule:
+      interval: "daily"

.gitignore

@@ -1 +1,19 @@
-examples/
+examples/
+
+build/
+
+dist/
+
+pyterraformer.egg-info/
+
+venv/
+
+.idea/
+
+__pycache__/
+
+.terraform/
+
+.terraform.lock.hcl
+
+/scripts/local_execution.py

pyterraformer/__init__.py

@@ -4,6 +4,8 @@
 from .terraform.backends import LocalBackend
 from .terraform.terraform import Terraform
 
+__version__ = "0.0.1-rc.1"
+
 __all__ = [
     "HumanSerializer",
     "Config",

pyterraformer/config.py

@@ -1,14 +1,12 @@
-import atexit
-import shutil
 from dataclasses import dataclass
-from tempfile import mkdtemp
 from typing import Optional
 
 from pyterraformer.settings import get_default_terraform_location
 
-tempdir = mkdtemp()
 
-atexit.register(shutil.rmtree, tempdir)
+# tempdir = mkdtemp()
+#
+# atexit.register(shutil.rmtree, tempdir)
 
 
 @dataclass

pyterraformer/core/generics/__init__.py

@@ -33,3 +33,44 @@
 from .terraform import TerraformConfig
 from .terraform_block import BlockList, BlockSet
 from .variables import Variable
+
+__all__ = [
+    "Variable",
+    "BlockList",
+    "BlockSet",
+    "TerraformConfig",
+    "Output",
+    "Local",
+    "Literal",
+    "Metadata",
+    "DependsOn",
+    "Provider",
+    "ForEach",
+    "Count",
+    "Lifecycle",
+    "Backend",
+    "Comment",
+    "Data",
+    "Interpolation",
+    "DictLookup",
+    "PropertyLookup",
+    "StringLit",
+    "String",
+    "Expression",
+    "Conditional",
+    "BinaryOp",
+    "BinaryOperator",
+    "BinaryTerm",
+    "Parenthetical",
+    "File",
+    "Boolean",
+    "Merge",
+    "Concat",
+    "Replace",
+    "Types",
+    "ArrayLookup",
+    "GenericFunction",
+    "Symlink",
+    "LegacySplat",
+    "ToSet",
+]

pyterraformer/core/generics/backend.py

@@ -5,10 +5,8 @@
 
 
 class Backend(TerraformObject):
-    def __init__(self, name:str,
-                 metadata: Optional[ObjectMetadata] = None,
-                 **kwargs,):
-        TerraformObject.__init__(self, "backend", metadata=metadata, **kwargs)
+    def __init__(self, name: str, _metadata: Optional[ObjectMetadata] = None, **kwargs):
+        TerraformObject.__init__(self, "backend", _metadata=_metadata, **kwargs)
         self.name = str(name).replace('"', "")
 
     # def render(self, variables=None):

pyterraformer/core/generics/comment.py

@@ -1,19 +1,24 @@
-from pyterraformer.core.objects import TerraformObject
+from typing import Optional
+
+from pyterraformer.core.objects import TerraformObject, ObjectMetadata
 
 
 class Comment(TerraformObject):
-    def __init__(self, text, multiline=False):
+    def __init__(
+        self,
+        text: str,
+        multiline: bool = False,
+        _metadata: Optional[ObjectMetadata] = None,
+    ):
         self.multiline = multiline
         if self.multiline:
             text = f"/*{text}*/"
-        TerraformObject.__init__(self, "comment", text, None)
-
-    def __repr__(self):
-        return f"{self._type}({self._original_text})"
+        else:
+            text = text.strip()
+        TerraformObject.__init__(
+            self, "comment", tf_id=None, text=text, _metadata=_metadata
+        )
 
     @property
     def has_content(self):
         return bool(self.text.strip())
-
-    def render(self, variables=None):
-        return self.template.render(multiline=self.multiline, text=self._original_text)

pyterraformer/core/generics/interpolation.py

@@ -22,9 +22,8 @@
 from dataclasses import dataclass
 from typing import Any, Optional, List, TYPE_CHECKING
 
-
 if TYPE_CHECKING:
-    from pyterraformer.core.namespace import TerraformFile, TerraformNamespace
+    from pyterraformer.core.namespace import TerraformFile
     from pyterraformer.core.workspace import TerraformWorkspace
 
 
@@ -275,12 +274,12 @@ def resolve(
 
 
 class StringLit(Resolvable):
-    def __init__(self, contents:List):
+    def __init__(self, contents: List):
         self.contents = contents
 
     @property
-    def string(self)->str:
-        return ''.join([str(v) for v in self.contents])
+    def string(self) -> str:
+        return "".join([str(v) for v in self.contents])
 
     def __add__(self, v):
         return self.string.__add__(v)
@@ -603,7 +602,7 @@ def __init__(self, name, values):
                 key = str(attribute[0])
                 val = attribute[1]
                 if isinstance(val, Block):
-                    base = getattr(self, key, Block())
+                    base = getattr(self, key, Block)
                     base.append(val)
                     val = base
                 setattr(self, key, val)

pyterraformer/core/generics/meta_arguments.py

@@ -5,12 +5,9 @@
 
 
 class Provider(TerraformObject):
-    def __init__(self,
-                 type:str,
-                 metadata: Optional[ObjectMetadata] = None,
-                 **kwargs,):
+    def __init__(self, type: str, _metadata: Optional[ObjectMetadata] = None, **kwargs):
         self.ptype = str(type).replace('"', "")
-        TerraformObject.__init__(self, type = "provider", metadata=metadata)
+        TerraformObject.__init__(self, type="provider", _metadata=_metadata)
 
     def __repr__(self):
         return (

pyterraformer/core/generics/terraform.py

@@ -4,16 +4,9 @@
 
 
 class TerraformConfig(TerraformObject):
-    def __init__(self,
-                 metadata: Optional[ObjectMetadata] = None,
-                 **kwargs, ):
+    def __init__(self, _metadata: Optional[ObjectMetadata] = None, **kwargs):
         # self.backends = [obj for obj in attributes if isinstance(obj, Backend)]
-        TerraformObject.__init__(
-            self,
-            "terraform",
-            metadata=metadata,
-            **kwargs
-        )
+        TerraformObject.__init__(self, "terraform", _metadata=_metadata, **kwargs)
 
     # def render(self, variables=None):
     #     from pyterraformer.core.generics import Block, Literal

pyterraformer/core/generics/terraform_block.py

@@ -1,5 +1,6 @@
 class BlockList(list):
     pass
 
+
 class BlockSet(set):
     pass

pyterraformer/core/generics/variables.py

@@ -1,4 +1,8 @@
 from pyterraformer.core.objects import TerraformObject
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from pyterraformer.core.generics import Literal
 
 
 class Variable(TerraformObject):
@@ -22,28 +26,28 @@ def __getitem__(self, val):
                 return item
         raise KeyError(val)
 
-    def render_lookup(self, item):
+    def render_lookup(self, item) -> "Literal":
         from pyterraformer.core.generics import Literal
 
         return Literal(f'var.{self.name}["{item}"]')
 
-    def render_attribute(self, item):
+    def render_attribute(self, item) -> "Literal":
         from pyterraformer.core.generics import Literal
 
         return Literal(f"var.{self.name}.{item}")
 
-    def render_basic(self):
+    def render_basic(self) -> "Literal":
         from pyterraformer.core.generics import Literal
 
         return Literal(f"var.{self.name}")
 
-    def get(self, val, fallback=None):
+    def get(self, val, fallback: str = None):
         for key, item in self.default.items():
             if val == key:
                 return item
         return fallback
 
-    def get_type(self, val):
+    def get_type(self, val) -> "Literal":
         from pyterraformer.core.generics.interpolation import String
         from pyterraformer.core.generics import Literal, StringLit
 
@@ -55,9 +59,9 @@ def get_type(self, val):
             out = set()
             for item in val.values():
                 out.add(self.get_type(item).value)
-            out = list(out)
-            if len(out) == 1:
-                return Literal(f"map({out[0]})")
+            outlist = list(out)
+            if len(outlist) == 1:
+                return Literal(f"map({outlist[0]})")
             return Literal("map(any)")
         elif isinstance(val, set):
             return Literal(f"set({self.get_type(next(iter(val))).value})")

pyterraformer/core/objects.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import Dict, Any, List, Optional, TYPE_CHECKING
+from typing import Dict, Optional, TYPE_CHECKING
 
 from pyterraformer.exceptions import ValidationError
 
@@ -12,18 +12,20 @@ class ObjectMetadata:
     source_file: Optional[str] = None
     orig_text: Optional[str] = None
     row_num: Optional[int] = None
+    start_pos: Optional[int] = None
+    end_pos: Optional[int] = None
 
 
 class TerraformObject(object):
     def __init__(
         self,
         type,
         tf_id: Optional[str] = None,
-        metadata: Optional[ObjectMetadata] = None,
+        _metadata: Optional[ObjectMetadata] = None,
         **kwargs,
     ):
 
-        self.metadata = metadata or ObjectMetadata()
+        self._metadata = _metadata or ObjectMetadata()
         self.id = tf_id
         arguments = kwargs or {}
         self.render_variables: Dict[str, str] = {

pyterraformer/core/resources/resource_object.py

@@ -17,12 +17,9 @@ class ResourceObject(TerraformObject):
     _type = "generic_resource_object"
 
     def __init__(
-        self,
-        tf_id: str,
-        metadata: Optional[ObjectMetadata] = None,
-        **kwargs,
+        self, tf_id: str, _metadata: Optional[ObjectMetadata] = None, **kwargs
     ):
-        TerraformObject.__init__(self, self._type, tf_id, metadata=metadata, **kwargs)
+        TerraformObject.__init__(self, self._type, tf_id, _metadata=_metadata, **kwargs)
 
     def render_attribute(self, item):
         return f"${{{self._type}.{self.id}.{item}}}"