Use copier to generate project config file

getindata · Dec 7, 2021 · bae8637 · bae8637
1 parent 02b1f9c
commit bae8637
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 30 deletions.
diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 from setuptools.command.install import install
 
 
-__version__ = "1.1.35"
+__version__ = "1.1.36"
 
 with open("README.md", "r") as fh:
     long_description = fh.read()

diff --git a/streamingcli/project/jupyter/jupyter_project_factory.py b/streamingcli/project/jupyter/jupyter_project_factory.py
@@ -1,8 +1,6 @@
 import pathlib
 import click
 import copier
-from streamingcli.project.local_project_config import LocalProjectConfigFactory
-from streamingcli.project.project_type import ProjectType
 
 
 JUPYTER_TEMPLATE_PROJECT = "[email protected]:getindata/streaming-labs/flink-sandbox-jupyter.git"
@@ -21,4 +19,3 @@ def create(project_name: str):
             raise click.ClickException("Project directory already exists!")
 
         copier.copy(src_path=JUPYTER_TEMPLATE_PROJECT, dst_path=project_path)
-        LocalProjectConfigFactory.generate_initial_project_config(project_name, ProjectType.JUPYTER)
diff --git a/streamingcli/project/local_project_config.py b/streamingcli/project/local_project_config.py
@@ -1,7 +1,6 @@
-import os
 from dataclasses import asdict, dataclass, field
 from enum import Enum
-from typing import Any, Optional, Type
+from typing import Any, Type
 
 import click
 from marshmallow_dataclass import class_schema
@@ -15,7 +14,6 @@ class LocalProjectConfig:
     project_name: str
     project_version: str
     project_type: ProjectType = field(metadata={"by_value": True})
-    project_configmap_name: Optional[str] = field(default=None)
     dependencies: list = field(default_factory=lambda: [])
 
     def add_dependency(self, dependency_path):
@@ -33,31 +31,14 @@ def convert_value(obj):
 
 
 class LocalProjectConfigFactory:
-    DEFAULT_PROJECT_VERSION = "v1.0"
-
-    @staticmethod
-    def generate_initial_project_config(project_name: str, project_type: ProjectType):
-        configmap_name = LocalProjectConfigFactory.format_project_configmap_name(project_name)
-        config = LocalProjectConfig(project_name=project_name,
-                                    project_version=LocalProjectConfigFactory.DEFAULT_PROJECT_VERSION,
-                                    project_type=project_type,
-                                    project_configmap_name=configmap_name)
-        LocalProjectConfigIO.save_project_config(config)
-
-    @staticmethod
-    def format_project_configmap_name(project_name: str):
-        formatted_project_name = project_name.replace("_", "-")
-        return f"{formatted_project_name}-configmap"
-
     @staticmethod
     def from_yaml_object(config_yaml) -> LocalProjectConfig:
         project_name = config_yaml["project_name"]
         project_version = config_yaml["project_version"]
-        project_configmap_name = config_yaml["project_configmap_name"]
         project_type = config_yaml["project_type"]
 
-        return LocalProjectConfig(project_name=project_name, project_version=project_version,
-                                  project_configmap_name=project_configmap_name,
+        return LocalProjectConfig(project_name=project_name,
+                                  project_version=project_version,
                                   project_type=project_type)
 
 

diff --git a/streamingcli/project/python/python_project_factory.py b/streamingcli/project/python/python_project_factory.py
@@ -1,8 +1,6 @@
 import pathlib
 import click
 import copier
-from streamingcli.project.local_project_config import LocalProjectConfigFactory
-from streamingcli.project.project_type import ProjectType
 
 
 PYTHON_TEMPLATE_PROJECT = "[email protected]:getindata/streaming-labs/flink-sandbox-python.git"
@@ -20,5 +18,8 @@ def create(project_name: str):
         if PythonProjectFactory.check_if_directory_exists(project_path=project_path):
             raise click.ClickException("Project directory already exists!")
 
-        copier.copy(src_path=PYTHON_TEMPLATE_PROJECT, dst_path=project_path)
-        LocalProjectConfigFactory.generate_initial_project_config(project_name, ProjectType.PYTHON)
+        template_data = {
+            "project_name": project_name
+        }
+
+        copier.copy(src_path=PYTHON_TEMPLATE_PROJECT, dst_path=project_path, data=template_data)