snapctl 0.39.1__tar.gz → 0.39.3__tar.gz

{snapctl-0.39.1 → snapctl-0.39.3}/PKG-INFO

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

{snapctl-0.39.1 → snapctl-0.39.3}/pyproject.toml

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

{snapctl-0.39.1 → snapctl-0.39.3}/snapctl/commands/byogs.py

@@ -251,6 +251,35 @@ class ByoGs:
         snapctl_error('BYOGS upload failure. Duplicate image error.',
                       SNAPCTL_BYOGS_PUBLISH_DUPLICATE_TAG_ERROR, progress)
 
+    def _clean_slate(self) -> None:
+        progress = Progress(
+            SpinnerColumn(),
+            TextColumn("[progress.description]{task.description}"),
+            transient=True,
+        )
+        progress.start()
+        progress.add_task(
+            description='Cleaning cache and initializing...', total=None)
+        try:
+            # Specific ECR repository URL to check against
+            ecr_repo_url = self.token_parts[0]
+            if platform == "win32":
+                # Perform the Docker logout
+                logout_response = subprocess.run(
+                    ['docker', 'logout', ecr_repo_url],
+                    shell=True, check=False)
+            else:
+                # Perform the Docker logout
+                logout_response = subprocess.run([
+                    f"docker logout {ecr_repo_url}"
+                ], shell=True, check=False)
+            if not logout_response.returncode:
+                return snapctl_success('Cleanup complete', progress, no_exit=True)
+        except subprocess.CalledProcessError:
+            warning('Unable to initialize with a clean slate.')
+        finally:
+            progress.stop()
+
     # Public methods
 
     # Validator
@@ -310,7 +339,6 @@ class ByoGs:
           3. Build your snap
         """
         self._check_dependencies()
-        self._docker_login()
         self._docker_build()
 
     def push(self) -> None:
@@ -322,8 +350,9 @@ class ByoGs:
           4. Push your snap
         """
         self._check_dependencies()
-        self._docker_login()
         self._docker_tag()
+        self._clean_slate()
+        self._docker_login()
         self._docker_push()
 
     # Upper echelon commands
@@ -338,11 +367,12 @@ class ByoGs:
           6. Upload swagger.json
         """
         self._check_dependencies()
-        self._docker_login()
         if not self.skip_build:
             self._docker_build()
         else:
             info('--skip-build set. Skipping the build step.')
         self._docker_tag()
+        self._clean_slate()
+        self._docker_login()
         self._docker_push()
         snapctl_success('BYOGS publish successful')

{snapctl-0.39.1 → snapctl-0.39.3}/snapctl/commands/byosnap.py

@@ -354,6 +354,33 @@ class ByoSnap:
                     SNAPCTL_INPUT_ERROR
                 )
 
+    def _clean_slate(self) -> None:
+        progress = Progress(
+            SpinnerColumn(),
+            TextColumn("[progress.description]{task.description}"),
+            transient=True,
+        )
+        progress.start()
+        progress.add_task(
+            description='Cleaning cache and initializing...', total=None)
+        try:
+            # Specific ECR repository URL to check against
+            ecr_domain = self.token_parts[0].split('/')[0]
+            # Perform the Docker logout
+            if platform == "win32":
+                logout_response = subprocess.run(['docker', 'logout', ecr_domain],
+                                                 shell=True, check=False)
+            else:
+                logout_response = subprocess.run([
+                    f"docker logout {ecr_domain}"
+                ], shell=True, check=False)
+            if not logout_response.returncode:
+                return snapctl_success('Cleanup complete.', progress, no_exit=True)
+        except subprocess.CalledProcessError:
+            warning('Unable to initialize with a clean slate.')
+        finally:
+            progress.stop()
+
     # Public methods
 
     # Validator
@@ -497,7 +524,6 @@ class ByoSnap:
           3. Build your snap
         """
         self._check_dependencies()
-        self._docker_login()
         self._docker_build()
 
     def push(self) -> bool:
@@ -509,8 +535,9 @@ class ByoSnap:
           4. Push your snap
         """
         self._check_dependencies()
-        self._docker_login()
         self._docker_tag()
+        self._clean_slate()
+        self._docker_login()
         self._docker_push()
 
     # Upper echelon commands
@@ -658,12 +685,13 @@ class ByoSnap:
           6. Upload swagger.json
         """
         self._check_dependencies()
-        self._docker_login()
         if not self.skip_build:
             self._docker_build()
         else:
             info('--skip-build set. Skipping the build step.')
         self._docker_tag()
+        self._clean_slate()
+        self._docker_login()
         self._docker_push()
         if self.path is not None or self.resources_path is not None:
             self.upload_docs()

{snapctl-0.39.1 → snapctl-0.39.3}/snapctl/config/constants.py

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