poetry-plugin-ivcap 0.2.7__tar.gz → 0.2.8__tar.gz

{poetry_plugin_ivcap-0.2.7 → poetry_plugin_ivcap-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: poetry-plugin-ivcap
-Version: 0.2.7
+Version: 0.2.8
 Summary: A custom Poetry command for IVCAP deployments
 License: MIT
 Author: Max Ott

{poetry_plugin_ivcap-0.2.7 → poetry_plugin_ivcap-0.2.8}/poetry_plugin_ivcap/constants.py

@@ -11,6 +11,7 @@ SERVICE_ID_OPT = "service-id"
 SERVICE_FILE_OPT = "service-file"
 SERVICE_TYPE_OPT = "service-type"
 PORT_OPT = "port"
+POLICY_OPT = "policy"
 
 DOCKER_RUN_TEMPLATE_OPT = "docker-run-template"
 DOCKER_RUN_OPT = "docker-run-opts"

{poetry_plugin_ivcap-0.2.7 → poetry_plugin_ivcap-0.2.8}/poetry_plugin_ivcap/docker.py

@@ -44,11 +44,11 @@ class DockerConfig(BaseModel):
     def from_run_template(self, data, args, line) -> List[any]:
         pdata = data.get("tool", {}).get(PLUGIN_NAME, {})
         template = pdata.get(DOCKER_RUN_TEMPLATE_OPT)
+        smode = pdata.get(SERVICE_TYPE_OPT)
+        if smode is None:
+            line(f"<error>ERROR: 'service-type' is not defined in [{PLUGIN_NAME}]</error>")
+            sys.exit(1)
         if template is None:
-            smode = pdata.get(SERVICE_TYPE_OPT)
-            if smode is None:
-                line(f"<error>ERROR: 'service-type' is not defined in [{PLUGIN_NAME}]</error>")
-                sys.exit(1)
             if smode == "lambda":
                 template = DOCKER_LAMBDA_RUN_TEMPLATE
             elif smode == "batch":

{poetry_plugin_ivcap-0.2.7 → poetry_plugin_ivcap-0.2.8}/poetry_plugin_ivcap/ivcap.py

@@ -11,7 +11,7 @@ import tempfile
 import uuid
 import humanize
 
-from .constants import DEF_POLICY, PLUGIN_NAME, SERVICE_FILE_OPT, SERVICE_ID_OPT
+from .constants import DEF_POLICY, PLUGIN_NAME, POLICY_OPT, SERVICE_FILE_OPT, SERVICE_ID_OPT
 
 from .docker import docker_cfg, docker_build, docker_push
 from .util import command_exists, get_name, string_to_number
@@ -124,7 +124,7 @@ def create_service_id(data, is_silent, line):
     return f"urn:ivcap:service:{id}"
 
 def get_policy(data, line):
-    policy = data.get("tool", {}).get(PLUGIN_NAME, {}).get("policy")
+    policy = data.get("tool", {}).get(PLUGIN_NAME, {}).get(POLICY_OPT)
     if not policy:
         policy = DEF_POLICY
     return policy

{poetry_plugin_ivcap-0.2.7 → poetry_plugin_ivcap-0.2.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "poetry-plugin-ivcap"
-version = "0.2.7"
+version = "0.2.8"
 description = "A custom Poetry command for IVCAP deployments"
 authors = ["Max Ott <max.ott@csiro.au>"]
 license = "MIT"