snapctl 0.43.2__tar.gz → 0.44.1__tar.gz

{snapctl-0.43.2 → snapctl-0.44.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: snapctl
-Version: 0.43.2
+Version: 0.44.1
 Summary: Snapser CLI Tool
 Author: Ajinkya Apte
 Author-email: aj@snapser.com

{snapctl-0.43.2 → snapctl-0.44.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "snapctl"
-version = "0.43.2"
+version = "0.44.1"
 description = "Snapser CLI Tool"
 authors = ["Ajinkya Apte <aj@snapser.com>"]
 readme = "README.md"

{snapctl-0.43.2 → snapctl-0.44.1}/snapctl/commands/byogs.py

@@ -4,6 +4,7 @@
 import base64
 from binascii import Error as BinasciiError
 import os
+import json
 import subprocess
 import time
 import platform as sys_platform
@@ -130,6 +131,24 @@ class ByoGs:
         try:
             # Login to Snapser Registry
             if platform == 'win32':
+                # Start: Hack for Windows               
+                data = {
+                    "auths": {
+                        "https://index.docker.io/v1/": {}
+                    }
+                }
+
+                # Path to the Docker config file, adjust the path as necessary
+                docker_config_path = os.path.expanduser('~\\.docker\\config.json')
+
+                # Ensure the directory exists
+                os.makedirs(os.path.dirname(docker_config_path), exist_ok=True)
+
+                # Write the data to the file
+                with open(docker_config_path, 'w', encoding='utf-8') as file:
+                    json.dump(data, file)
+                info("Updated the docker config for docker login")
+                # End: Hack for Windows
                 response = subprocess.run([
                     'docker', 'login', '--username', ecr_repo_username,
                     '--password', ecr_repo_token, ecr_repo_url

{snapctl-0.43.2 → snapctl-0.44.1}/snapctl/commands/byosnap.py

@@ -261,6 +261,10 @@ class ByoSnap:
         if self.prefix.endswith('/'):
             snapctl_error("Prefix should not end with a forward slash (/)",
                           SNAPCTL_INPUT_ERROR)
+        # check that prefix does not contain multiple slashes
+        if self.prefix.count('/') > 1:
+            snapctl_error("Prefix should not contain multiple path segments",
+                          SNAPCTL_INPUT_ERROR)
         if not self.version:
             snapctl_error("Missing version", SNAPCTL_INPUT_ERROR)
         pattern = r'^v\d+\.\d+\.\d+$'
@@ -372,6 +376,25 @@ class ByoSnap:
         try:
             # Login to Snapser Registry
             if platform == 'win32':
+                # Start: Hack for Windows
+                data = {
+                    "auths": {
+                        "https://index.docker.io/v1/": {}
+                    }
+                }
+
+                # Path to the Docker config file, adjust the path as necessary
+                docker_config_path = os.path.expanduser(
+                    '~\\.docker\\config.json')
+
+                # Ensure the directory exists
+                os.makedirs(os.path.dirname(docker_config_path), exist_ok=True)
+
+                # Write the data to the file
+                with open(docker_config_path, 'w', encoding='utf-8') as file:
+                    json.dump(data, file)
+                info("Updated the docker config for docker login")
+                # End: Hack for Windows
                 response = subprocess.run([
                     'docker', 'login', '--username', ecr_repo_username,
                     '--password', ecr_repo_token, ecr_repo_url
@@ -640,6 +663,15 @@ class ByoSnap:
             if self.path is None and self.resources_path is None:
                 snapctl_error(
                     "Missing one of: path or resources-path parameter", SNAPCTL_INPUT_ERROR)
+            if not self.tag:
+                snapctl_error("Missing tag", SNAPCTL_INPUT_ERROR)
+            if len(self.tag.split()) > 1 or \
+                    len(self.tag) > ByoSnap.TAG_CHARACTER_LIMIT:
+                snapctl_error(
+                    "Tag should be a single word with maximum of " +
+                    f"{ByoSnap.TAG_CHARACTER_LIMIT} characters",
+                    SNAPCTL_INPUT_ERROR
+                )
         elif self.subcommand == 'publish-version':
             if self.token_parts is None:
                 snapctl_error('Invalid token. Please reach out to your support team.',

{snapctl-0.43.2 → snapctl-0.44.1}/snapctl/config/constants.py

@@ -2,7 +2,7 @@
 Constants used by snapctl
 """
 COMPANY_NAME = 'Snapser'
-VERSION = '0.43.2'
+VERSION = '0.44.1'
 CONFIG_FILE_MAC = '~/.snapser/config'
 CONFIG_FILE_WIN = '%homepath%\\.snapser\\config'
 

{snapctl-0.43.2 → snapctl-0.44.1}/snapctl/config/hashes.py

@@ -192,7 +192,7 @@ BYOSNAP_TEMPLATE: Dict[str, Dict[str, object]] = {
     'description': "TODO: Add your BYOSnap description here",
     'platform': "TODO: Add your platform here. Options are 'linux/arm64' or 'linux/amd64'",
     'language': "TODO: Add your language here. Options are 'go', 'node', 'python', 'java', 'csharp', 'cpp', 'rust', 'ruby', 'php', 'perl', 'clojure', 'lua', 'ts', 'js', 'kotlin', 'c'",
-    'prefix': "TODO: Add your prefix here. Prefix should start with /. Eg: '/v1'",
+    'prefix': "TODO: Add your prefix here. Prefix should start with / and only contain one path segment. Eg: '/v1'",
     'ingress': {
         'external_port': {
             'name': 'http',

{snapctl-0.43.2 → snapctl-0.44.1}/snapctl/main.py

@@ -361,7 +361,7 @@ def byosnap(
     # publish-image and publish-version
     tag: str = typer.Option(
         None, "--tag", help=(
-            "(req: publish-image, publish-version) Tag for your snap"
+            "(req: publish-image, publish-version, upload-docs) Tag for your snap"
         )
     ),
     # overrides