Rollback python_on_whales conversion

Author: shanejbrown

buildrunner/__init__.py

@@ -21,7 +21,6 @@
 import types
 from typing import List, Optional
 
-import python_on_whales
 import requests
 
 from retry import retry
@@ -288,37 +287,15 @@ def get_source_image(self):
                 source_archive_path: "source.tar",
                 SOURCE_DOCKERFILE: "Dockerfile",
             }
-            if self.buildrunner_config.run_config.use_legacy_builder:
-                image = legacy_builder.build_image(
-                    temp_dir=self.buildrunner_config.global_config.temp_dir,
-                    inject=inject,
-                    timeout=self.docker_timeout,
-                    docker_registry=self.buildrunner_config.global_config.docker_registry,
-                    nocache=True,
-                    pull=False,
-                )
-                self._source_image = image
-            else:
-                # Use buildx builder
-                native_platform = self._step_runner.multi_platform.get_native_platform()
-                LOGGER.info(f"Setting platforms to [{native_platform}]")
-                platforms = [native_platform]
-                built_images_info = (
-                    self._step_runner.multi_platform.build_multiple_images(
-                        platforms=platforms,
-                        inject=inject,
-                        cache=False,
-                        pull=False,
-                        build_args={
-                            "BUILDRUNNER_DISTRO": os.environ.get("BUILDRUNNER_DISTRO")
-                        },
-                    )
-                )
-                if len(built_images_info.built_images) != 1:
-                    raise BuildRunnerProcessingError(
-                        "Failed to build source image. Retrying the build may resolve the issue."
-                    )
-                self._source_image = built_images_info.built_images[0].trunc_digest
+            image = legacy_builder.build_image(
+                temp_dir=self.buildrunner_config.global_config.temp_dir,
+                inject=inject,
+                timeout=self.docker_timeout,
+                docker_registry=self.buildrunner_config.global_config.docker_registry,
+                nocache=True,
+                pull=False,
+            )
+            self._source_image = image
 
         return self._source_image
 
@@ -519,16 +496,11 @@ def run(self):  # pylint: disable=too-many-statements,too-many-branches,too-many
             if self._source_image:
                 self.log.write(f"Destroying source image {self._source_image}\n")
                 try:
-                    if self.buildrunner_config.run_config.use_legacy_builder:
-                        _docker_client.remove_image(
-                            self._source_image,
-                            noprune=False,
-                            force=True,
-                        )
-                    else:
-                        python_on_whales.docker.image.remove(
-                            self._source_image, prune=True, force=True
-                        )
+                    _docker_client.remove_image(
+                        self._source_image,
+                        noprune=False,
+                        force=True,
+                    )
                 except ImageNotFound:
                     self.log.warning(
                         f"Failed to remove source image {self._source_image}\n"
@@ -540,16 +512,11 @@ def run(self):  # pylint: disable=too-many-statements,too-many-branches,too-many
                 # reverse the order of the images since child images would likely come after parent images
                 for _image in self.generated_images[::-1]:
                     try:
-                        if self.buildrunner_config.run_config.use_legacy_builder:
-                            _docker_client.remove_image(
-                                _image,
-                                noprune=False,
-                                force=True,
-                            )
-                        else:
-                            python_on_whales.docker.image.remove(
-                                _image, prune=True, force=True
-                            )
+                        _docker_client.remove_image(
+                            _image,
+                            noprune=False,
+                            force=True,
+                        )
                     except Exception as _ex:  # pylint: disable=broad-except
                         self.log.write(f"Error removing image {_image}: {str(_ex)}\n")
             else:

buildrunner/docker/__init__.py

@@ -12,7 +12,6 @@
 from typing import Tuple
 import urllib.parse
 import docker
-import python_on_whales
 
 from buildrunner.errors import BuildRunnerError, BuildRunnerConfigurationError
 
@@ -96,21 +95,17 @@ def new_client(
     )
 
 
-def force_remove_container(docker_client, container, use_legacy_builder: bool):
+def force_remove_container(docker_client, container):
     """
     Force removes a container from the given docker client.
     :param docker_client: the docker client
     :param container: the container
-    :param use_legacy_builder: whether to use the legacy builder
     """
-    if use_legacy_builder:
-        docker_client.remove_container(
-            container,
-            force=True,
-            v=True,
-        )
-    else:
-        python_on_whales.docker.remove(container, force=True, volumes=True)
+    docker_client.remove_container(
+        container,
+        force=True,
+        v=True,
+    )
 
 
 def get_dockerfile(dockerfile: str, temp_dir: str = None) -> Tuple[str, bool]:

buildrunner/docker/builder.py

@@ -277,9 +277,7 @@ def cleanup(self):
         # iterate through and destroy intermediate containers
         for container in self.intermediate_containers:
             try:
-                force_remove_container(
-                    self.docker_client, container, use_legacy_builder=True
-                )
+                force_remove_container(self.docker_client, container)
             except docker.errors.APIError as err:
                 logger.debug(
                     f"Error removing intermediate container {container}: {err}"

buildrunner/docker/daemon.py

@@ -8,9 +8,7 @@
 
 import os
 
-import python_on_whales
 
-from buildrunner.config import BuildRunnerConfig
 from buildrunner.docker import DOCKER_DEFAULT_DOCKERD_URL
 
 DAEMON_IMAGE_NAME = "busybox:latest"
@@ -99,13 +97,8 @@ def stop(self):
             f"Destroying Docker daemon container {self._daemon_container:.10}\n"
         )
         if self._daemon_container:
-            if BuildRunnerConfig.get_instance().run_config.use_legacy_builder:
-                self.docker_client.remove_container(
-                    self._daemon_container,
-                    force=True,
-                    v=True,
-                )
-            else:
-                python_on_whales.docker.remove(
-                    self._daemon_container, force=True, volumes=True
-                )
+            self.docker_client.remove_container(
+                self._daemon_container,
+                force=True,
+                v=True,
+            )

buildrunner/docker/importer.py

@@ -6,13 +6,11 @@
 with the terms of the Adobe license agreement accompanying it.
 """
 
-import python_on_whales
 import yaml
 
 import docker
 import docker.errors
 
-from buildrunner.config import BuildRunnerConfig
 from buildrunner.docker import new_client
 from buildrunner.errors import BuildRunnerProcessingError
 from buildrunner.utils import is_dict
@@ -43,11 +41,7 @@ def import_image(self):
         """
 
         try:
-            import_return = None
-            if BuildRunnerConfig.get_instance().run_config.use_legacy_builder:
-                import_return = self.docker_client.import_image(self.src)
-            else:
-                import_return = python_on_whales.docker.import_(self.src)
+            import_return = self.docker_client.import_image(self.src)
         except docker.errors.APIError as apie:
             raise BuildRunnerProcessingError(
                 f"Error importing image from archive file {self.src}: {apie}"

buildrunner/docker/runner.py

@@ -23,11 +23,9 @@
 from docker.utils import compare_version
 from retry import retry
 import docker.errors
-import python_on_whales
 import six
 import timeout_decorator
 
-from buildrunner.config import BuildRunnerConfig
 from buildrunner.docker import (
     new_client,
     force_remove_container,
@@ -133,10 +131,6 @@ def __init__(self, image_config, dockerd_url=None, log=None):
             if log:
                 log.write("\nImage pulled successfully\n")
 
-        self.use_docker_py = (
-            BuildRunnerConfig.get_instance().run_config.use_legacy_builder
-        )
-
     def start(
         self,
         shell="/bin/sh",
@@ -242,10 +236,7 @@ def start(
 
         # start the container
         self.container = self.docker_client.create_container(self.image_name, **kwargs)
-        if self.use_docker_py:
-            self.docker_client.start(self.container["Id"])
-        else:
-            python_on_whales.docker.start(self.container["Id"])
+        self.docker_client.start(self.container["Id"])
 
         # run any supplied provisioners
         if provisioners:
@@ -263,44 +254,31 @@ def stop(self):
         Stop the backing Docker container.
         """
         if self.container:
-            if self.use_docker_py:
-                self.docker_client.stop(
-                    self.container["Id"],
-                    timeout=0,
-                )
-            else:
-                python_on_whales.docker.stop(self.container["Id"], time=0)
+            self.docker_client.stop(
+                self.container["Id"],
+                timeout=0,
+            )
 
     def cleanup(self):
         """
         Cleanup the backing Docker container, stopping it if necessary.
         """
         if self.container:
-            use_docker_py = (
-                BuildRunnerConfig.get_instance().run_config.use_legacy_builder
-            )
             for container in self.containers:
                 try:
-                    force_remove_container(
-                        self.docker_client, container, use_legacy_builder=use_docker_py
-                    )
+                    force_remove_container(self.docker_client, container)
                 except docker.errors.NotFound:
                     try:
                         container_ids = self.docker_client.containers(
                             filters={"label": container}, quiet=True
                         )
                         if container_ids:
                             for container_id in container_ids:
-                                if use_docker_py:
-                                    self.docker_client.remove_container(
-                                        container_id["Id"],
-                                        force=True,
-                                        v=True,
-                                    )
-                                else:
-                                    python_on_whales.docker.remove(
-                                        container_id["Id"], force=True, volumes=True
-                                    )
+                                self.docker_client.remove_container(
+                                    container_id["Id"],
+                                    force=True,
+                                    v=True,
+                                )
                         else:
                             print(
                                 f'Unable to find docker container with name or label "{container}"'
@@ -309,16 +287,11 @@ def cleanup(self):
                         print(
                             f'Unable to find docker container with name or label "{container}"'
                         )
-            if use_docker_py:
-                self.docker_client.remove_container(
-                    self.container["Id"],
-                    force=True,
-                    v=True,
-                )
-            else:
-                python_on_whales.docker.remove(
-                    self.container["Id"], force=True, volumes=True
-                )
+            self.docker_client.remove_container(
+                self.container["Id"],
+                force=True,
+                v=True,
+            )
 
         self.container = None
 

buildrunner/sshagent/__init__.py

@@ -27,9 +27,7 @@
 from paramiko.common import io_sleep
 from paramiko.util import asbytes
 from paramiko.message import Message
-import python_on_whales
 
-import buildrunner.config
 import buildrunner.docker.builder as legacy_builder
 from buildrunner.errors import (
     BuildRunnerConfigurationError,
@@ -245,52 +243,25 @@ def stop(self):
             self.log.write(
                 f"Destroying ssh-agent container {self._ssh_agent_container:.10}\n"
             )
-            if buildrunner.config.BuildRunnerConfig.get_instance().run_config.use_legacy_builder:
-                self.docker_client.remove_container(
-                    self._ssh_agent_container,
-                    force=True,
-                    v=True,
-                )
-            else:
-                python_on_whales.docker.remove(
-                    self._ssh_agent_container, force=True, volumes=True
-                )
+            self.docker_client.remove_container(
+                self._ssh_agent_container,
+                force=True,
+                v=True,
+            )
 
     def get_ssh_agent_image(self):
         """
         Get and/or create the image used to proxy the ssh agent to a container.
         """
-        buildrunner_config = buildrunner.config.BuildRunnerConfig.get_instance()
         if not self._ssh_agent_image:
-            if buildrunner_config.run_config.use_legacy_builder:
-                self.log.write("Creating ssh-agent image\n")
-                image = legacy_builder.build_image(
-                    path=SSH_AGENT_PROXY_BUILD_CONTEXT,
-                    docker_registry=self.docker_registry,
-                    nocache=False,
-                    pull=False,
-                )
-                self._ssh_agent_image = image
-            else:
-                native_platform = (
-                    self._multiplatform_image_builder.get_native_platform()
-                )
-                platforms = [native_platform]
-                built_images_info = (
-                    self._multiplatform_image_builder.build_multiple_images(
-                        platforms=platforms,
-                        path=SSH_AGENT_PROXY_BUILD_CONTEXT,
-                        file=f"{SSH_AGENT_PROXY_BUILD_CONTEXT}/Dockerfile",
-                        cache=True,
-                        pull=False,
-                        use_threading=False,
-                    )
-                )
-                if len(built_images_info.built_images) != 1:
-                    raise BuildRunnerProcessingError(
-                        "Failed to build ssh-agent image. Retrying the build may resolve the issue."
-                    )
-                self._ssh_agent_image = built_images_info.built_images[0].trunc_digest
+            self.log.write("Creating ssh-agent image\n")
+            image = legacy_builder.build_image(
+                path=SSH_AGENT_PROXY_BUILD_CONTEXT,
+                docker_registry=self.docker_registry,
+                nocache=False,
+                pull=False,
+            )
+            self._ssh_agent_image = image
         return self._ssh_agent_image