Defaulting image_tag to "latest".

Removed old unused test.
Fixed missing pytest-mock package.

Author: bitfoo1

gcip/addons/container/jobs/crane.py

@@ -124,8 +124,8 @@ def pull(
     *,
     src_registry: Union[Registry, str],
     image_name: str,
+    image_tag: str = "latest",
     tar_path: Optional[str] = None,
-    image_tag: Optional[str] = None,
     docker_client_config: Optional[DockerClientConfig] = None,
     crane_image: Optional[Union[Image, str]] = None,
 ) -> Job:
@@ -135,9 +135,7 @@ def pull(
     Args:
         src_registry (str): Registry URL to pull container image from.
         image_name (str): Container image with namespace to pull from `src_registry`.
-            If `None` it defaults internally to `PredefinedVariables.CI_PROJECT_NAME`.
-        image_tag (str): Tag of the image which will be pulled.  If `None` it defaults internally to `PredefinedVariables.CI_COMMIT_TAG`
-            or `PredefinedVariables.CI_COMMIT_REF_SLUG` in order.
+        image_tag (str): Tag of the image which will be pulled. Defaults to "latest".
         tar_path (Optional[str], optional): Path where to save the container image tarball.
             If `None` it defaults internally to `PredefinedVariables.CI_PROJECT_DIR`. Defaults to None.
         docker_client_config (Optional[DockerClientConfig], optional): Creates the Docker configuration file base on objects settings,
@@ -162,12 +160,6 @@ def pull(
         docker_client_config = DockerClientConfig()
         docker_client_config.add_auth(registry=Registry.DOCKER)
 
-    if not image_tag:
-        if PredefinedVariables.CI_COMMIT_TAG:
-            image_tag = PredefinedVariables.CI_COMMIT_TAG
-        else:
-            image_tag = PredefinedVariables.CI_COMMIT_REF_SLUG
-
     job = Job(
         script=[
             f"crane pull {src_registry}/{image_name}:{image_tag} {tar_path}/{image_path}.tar",

requirements.txt

@@ -3,6 +3,7 @@ isort
 flake8
 pytest
 pytest-cov
+pytest-mock
 mypy
 black
 boto3~=1.17

tests/unit/comparison_files/test_addons_container_crane_test_crane_simple_pull.yml

@@ -10,4 +10,4 @@ pull:
   - mkdir -p $HOME/.docker
   - 'echo "{\"auths\": {\"https://index.docker.io/v1/\": {\"username\": \"$REGISTRY_USERNAME\",
     \"password\": \"$REGISTRY_PASSWORD\"}}}" > $HOME/.docker/config.json'
-  - crane pull gcr.io/gitlab-ci-project:11.22.33 /path/to/project/gitlab-ci-project.tar
+  - crane pull gcr.io/awsome/image:latest /path/to/project/awsome_image.tar

tests/unit/comparison_files/test_addons_container_crane_test_crane_simple_pull_with_ref.yml

@@ -83,22 +83,20 @@ def test_addons_container_jobs_crane_push_registry(gitlab_ci_environment_variabl
 
 def test_crane_simple_pull(gitlab_ci_environment_variables):
     pipeline = Pipeline()
-    pipeline.add_children(crane.pull(Registry.GCR))
-    conftest.check(pipeline.render())
-
-
-def test_crane_simple_pull_with_ref(monkeypatch, gitlab_ci_environment_variables):
-    monkeypatch.delenv("CI_COMMIT_TAG")
-    pipeline = Pipeline()
-    pipeline.add_children(crane.pull(Registry.GCR))
+    pipeline.add_children(
+        crane.pull(
+            src_registry=Registry.GCR,
+            image_name="awsome/image",
+        )
+    )
     conftest.check(pipeline.render())
 
 
 def test_crane_advanced_pull(gitlab_ci_environment_variables, docker_client_config):
     pipeline = Pipeline()
     pipeline.add_children(
         crane.pull(
-            Registry.GCR,
+            src_registry=Registry.GCR,
             docker_client_config=docker_client_config,
             image_name="thomass/gcip",
             image_tag="main",