use resource plugin support for built-ins re #104

setup.py

@@ -89,5 +89,7 @@ def git_version(gitdir, default='0.0.0'):
     entry_points='''
         [console_scripts]
         cirrus=cirrus.cli.__main__:main
+        [cirrus.resources]
+        built-in=cirrus.builtins
     ''',
 )

src/cirrus/core/cloudformation/base.py

@@ -168,9 +168,6 @@ def search_dir(path, source=None):
                         misc.relative_to_cwd(yml),
                     )
 
-        if self.core_dir.is_dir():
-            yield from search_dir(self.core_dir, source=BUILT_IN)
-
         for plugin_name, plugin_dir in self.plugins.items():
             yield from search_dir(plugin_dir, source=plugin_name)
 

src/cirrus/core/components/base/component.py

@@ -6,6 +6,7 @@
 from pathlib import Path
 
 from ..files import ComponentFile, BaseDefinition
+from cirrus.core.constants import BUILT_IN
 from cirrus.core.exceptions import ComponentError
 from cirrus.core.utils.yaml import NamedYamlable
 from cirrus.core.utils import misc
@@ -16,8 +17,6 @@
 
 T = TypeVar('T', bound='Component')
 
-BUILT_IN = 'built-in'
-
 
 class ComponentMeta(GroupMeta):
     def __new__(cls, name, bases, attrs, **kwargs):
@@ -67,9 +66,6 @@ def from_dir(self, d: Path, name: str=None, source: str=None) -> Type[T]:
                 continue
 
     def _find(self, name: str=None) -> Type[T]:
-        if self.core_dir.is_dir():
-            yield from self.from_dir(self.core_dir, name=name, source='built-in')
-
         for plugin_name, plugin_dir in self.plugins.items():
             yield from self.from_dir(plugin_dir, name=name, source=plugin_name)
 

src/cirrus/core/constants.py

@@ -14,3 +14,5 @@
     'serverless-step-functions': '~3.7.0',
     'serverless-iam-roles-per-function': '~3.2.0',
   }
+
+BUILT_IN = 'built-in'

src/cirrus/core/group_meta.py

@@ -46,10 +46,6 @@ def __new__(cls, name, bases, attrs, **kwargs):
         elif 'user_dir_name' not in attrs or attrs['user_dir_name'] is None:
             attrs['user_dir_name'] = attrs['group_name']
 
-        attrs['core_dir'] = Path(cirrus.builtins.__file__).parent.joinpath(
-            attrs['group_name']
-        )
-
         attrs['_plugins'] = None
         attrs['_elements'] = None
         attrs['project'] = None