viur-cli 2.0.1.dev1__tar.gz → 2.0.2__tar.gz

{viur_cli-2.0.1.dev1/src/viur_cli.egg-info → viur_cli-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: viur_cli
-Version: 2.0.1.dev1
+Version: 2.0.2
 Summary: Command-line interface for ViUR application maintenance.
 Home-page: https://github.com/viur-framework/viur-cli
 Author: Andreas H. Kelch

{viur_cli-2.0.1.dev1 → viur_cli-2.0.2}/src/viur_cli/cloud.py

@@ -83,6 +83,7 @@ def enable_gcp_backup():
 
     print('Success! It may take a while until you can use Gcloud Backups')
 
+
 @cloud.command(context_settings={"ignore_unknown_options": True})
 @click.argument("service", type=click.Choice(["gcloud"]), default="gcloud")
 @click.argument("profile", default="default")
@@ -100,6 +101,7 @@ def init(service, profile):
         for element in deployments:
             os.system(f"viur cloud deploy {element} {profile} -y")
 
+
 @cloud.command(context_settings={"ignore_unknown_options": True})
 @click.argument("service", type=click.Choice(["gcloud"]), default="gcloud")
 @click.argument("option", type=click.Choice(["datastore"]), default="datastore")
@@ -533,7 +535,7 @@ def deploy(action, profile, name, ext, yes, additional_args):
         )
 
     elif action == "cloudfunction":
-        os.system(build_deploy_command(name, conf))
+        os.system(build_deploy_command(name, conf["gcloud"]))
 
     else:
         if action not in ["index", "queue", "cron"]:
@@ -625,6 +627,7 @@ def build_deploy_command(name, conf):
         echo_fatal(f"The cloudfunction {name} was not found your project.json\n "
                    f"You can create a cloudfunction entry by calling 'viur cloud create function'")
 
+
     command = (
         f"gcloud functions deploy "
         f"{name} "
@@ -633,7 +636,9 @@ def build_deploy_command(name, conf):
     )
 
     for k, v in conf["functions"][name].items():
-        if k in ["trigger", "update", "set", "remove"]:
+        if k == "gen":
+            command += f" --{k}{v}"
+        elif k in ["trigger", "update", "set", "remove"]:
             command += f"--{k}-{v}"
         else:
             command += f" --{k}='{str(v)}'"
@@ -644,51 +649,77 @@ def build_deploy_command(name, conf):
 @cloud.command()
 @click.argument("action", type=click.Choice(['function']))
 @click.argument("profile", default="default")
+@click.option("--gen", "-g")
 @click.option("--source", "-src")
-@click.option("--name", "-n", default=None)
+@click.option("--name", "-n")
 @click.option("--entrypoint", "-ep")
 @click.option("--env-vars-file", "-ev")
 @click.option("--memory", "-mem")
 @click.option("--runtime", "-rt")
 @click.option("--trigger", "-tr")
-def create(profile, action, source, name, entrypoint, env_vars_file, memory, runtime, trigger):
+def create(profile, action, gen, source, name, entrypoint, env_vars_file, memory, runtime, trigger):
     """Creates a cloud function based on the provided parameters."""
     if action == "function":
         conf = config.get_profile(profile)
         # First layer initialization:
         conf["gcloud"] = conf.get("gcloud", {})
         conf["gcloud"]["functions"] = conf["gcloud"].get("functions", {})
+
         conf["gcloud"]["max-instances"] = conf["gcloud"].get("max-instances", click.prompt(
-            "Please input the Max Instances your cloud functions should run on"))
+            "Please input the Max Instances your cloud functions should run on", default="1"))
+
         conf["gcloud"]["region"] = conf["gcloud"].get("region", click.prompt(
-            "Please enter your default cloudfunction region (europe-west3)"))
+            "Please enter your default cloud function region", default="europe-west3"))
 
         # function layer
-        function_name = name if name else click.prompt("Please enter the Name of your cloudfunction")
+        function_name = name if name else click.prompt("Please enter the Name of your cloud function")
         function_dict = conf["gcloud"]["functions"].get(function_name, {})
 
-        function_dict["entry-point"] = function_dict.get("entry-point", entrypoint if entrypoint else click.prompt(
-            "Please enter your cloudfunction entrypoint (main)"))
+        function_dict["gen"] = function_dict.get("gen",
+                                                        gen if gen else click.prompt(
+                                                            "Please enter your cloud function generation",
+                                                            default="2")
+                                                        )
+
+        function_dict["entry-point"] = function_dict.get("entry-point",
+                                                         entrypoint if entrypoint else click.prompt(
+                                                             "Please enter your cloud function entrypoint ",
+                                                             default="main")
+                                                         )
 
         function_dict["env-vars-file"] = function_dict.get("env-vars-file",
                                                            env_vars_file if env_vars_file else click.prompt(
-                                                               "Enter the name of your environment variables file"))
-
-        function_dict["memory"] = function_dict.get("memory", memory if memory else click.prompt(
-            "Please enter your cloudfunction memory usage (512MB)"))
-
-        function_dict["runtime"] = function_dict.get("runtime", runtime if runtime else click.prompt(
-            "Please enter your cloudfunction runtime (python311)"))
-
-        function_dict["trigger"] = function_dict.get("trigger", trigger if trigger else click.prompt(
-            "Please enter your cloudfunction trigger type (http)"))
-        function_dict["source"] = function_dict.get("source", source if source else click.prompt(
-            "Enter the directory of your cloudfuntion"))
+                                                               "Enter the name of your environment variables file",
+                                                               default="env.yaml")
+                                                           )
+
+        function_dict["memory"] = function_dict.get("memory",
+                                                    memory if memory else click.prompt(
+                                                        "Please enter your cloud function memory usage",
+                                                        default="512MB")
+                                                    )
+
+        function_dict["runtime"] = function_dict.get("runtime",
+                                                     runtime if runtime else click.prompt(
+                                                         "Please enter your cloud function runtime",
+                                                         default="python312")
+                                                     )
+
+        function_dict["trigger"] = function_dict.get("trigger",
+                                                     trigger if trigger else click.prompt(
+                                                         "Please enter your cloud function trigger type",
+                                                         default="http")
+                                                     )
+
+        function_dict["source"] = function_dict.get("source",
+                                                    source if source else click.prompt(
+                                                        "Enter the directory of your cloud functio"
+                                                        "(deploy/cloudfunction/{FileName})")
+                                                    )
 
         conf["gcloud"]["functions"][function_name] = function_dict
 
         config[profile] = conf
         config.migrate()
-        echo_positive("Your cloudfunction creation was succesfull, if you want to add more flags, "
+        echo_positive("Your cloud function creation was successful, if you want to add more flags, "
                       "add them in your project.json under")
-

{viur_cli-2.0.1.dev1 → viur_cli-2.0.2}/src/viur_cli/conf.py

@@ -1,6 +1,4 @@
 import json
-from pprint import pprint
-
 import click
 import requests
 import difflib
@@ -120,9 +118,13 @@ class ProjectConfig(dict):
             if "application_name" in self:
                 del self["application_name"]
 
+        if "version" not in self["default"]:
+            self.find_key(self, target_key="version", target="default", keep=True)
+            # Fail Safe
+            if "version" in self:
+                del self["version"]  4
         self.remove_key(self, target_key="core")
 
-
         if old_format := self["default"].get("format"):
             self["format"] = old_format
             del self["default"]["format"]

{viur_cli-2.0.1.dev1 → viur_cli-2.0.2}/src/viur_cli/update.py

@@ -100,6 +100,7 @@ def check_req(projects_requirements_path):
 
     if not core_requirements:
         echo_error("could now find core package, please update the core to validate the requirements.txt")
+        return
 
     core_requirements_obj = utils.requirements_to_dict(parse_requirements(core_requirements, session=PipSession()))
 

{viur_cli-2.0.1.dev1 → viur_cli-2.0.2}/src/viur_cli/version.py

@@ -1,3 +1,3 @@
-__version__ = "2.0.1.dev1"
+__version__ = "2.0.2"
 MINIMAL_PIPENV = "2023.11.15"
 

{viur_cli-2.0.1.dev1 → viur_cli-2.0.2/src/viur_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: viur_cli
-Version: 2.0.1.dev1
+Version: 2.0.2
 Summary: Command-line interface for ViUR application maintenance.
 Home-page: https://github.com/viur-framework/viur-cli
 Author: Andreas H. Kelch