CH-194 fix image build arg

Author: filippomc

deployment-configuration/codefresh-template-dev.yaml

@@ -34,7 +34,7 @@ steps:
     working_directory: .
     commands:
       - bash cloud-harness/install.sh
-      - harness-deployment $PATHS -d ${{DOMAIN}} -r ${{REGISTRY}} -rs ${{REGISTRY_SECRET}} -n ${{NAMESPACE}} --write-env -e $ENV --cache-url ${{IMAGE_CACHE_URL}} $PARAMS
+      - harness-deployment $PATHS -d ${{DOMAIN}} -r ${{REGISTRY}} -rs '${{REGISTRY_SECRET}}' -n ${{NAMESPACE}} --write-env -e $ENV --cache-url '${{IMAGE_CACHE_URL}}' $PARAMS
       - cat deployment/.env >> ${{CF_VOLUME_PATH}}/env_vars_to_export
       - cat ${{CF_VOLUME_PATH}}/env_vars_to_export
   prepare_deployment_view:

deployment-configuration/codefresh-template-prod.yaml

@@ -30,7 +30,7 @@ steps:
     working_directory: .
     commands:
       - bash cloud-harness/install.sh
-      - harness-deployment $PATHS -t ${{DEPLOYMENT_TAG}} -d ${{DOMAIN}} -r ${{REGISTRY}} -rs ${{REGISTRY_SECRET}} -n ${{NAMESPACE}} -e $ENV --no-cd $PARAMS
+      - harness-deployment $PATHS -t ${{DEPLOYMENT_TAG}} -d ${{DOMAIN}} -r ${{REGISTRY}} -rs '${{REGISTRY_SECRET}}' -n ${{NAMESPACE}} -e $ENV --no-cd $PARAMS
   prepare_deployment_view:
     commands:
       - "helm template ./deployment/helm --debug -n ${{NAMESPACE}}"

tools/deployment-cli-tools/ch_cli_tools/codefresh.py

@@ -154,6 +154,56 @@ def e2e_test_environment(app_config: ApplicationHarnessConfig, app_domain: str =
                 env = get_app_environment(app_config, app_domain, False)
                 return [f"{k}={env[k]}" for k in env]
 
+            def codefresh_app_build_spec(app_name, app_context_path, dockerfile_path="Dockerfile", base_name=None, helm_values: HarnessMainConfig = {}, dependencies=None):
+                logging.info('Generating build script for ' + app_name)
+                title = app_name.capitalize().replace(
+                    '-', ' ').replace('/', ' ').replace('.', ' ').strip()
+                build = codefresh_template_spec(
+                    template_path=CF_BUILD_PATH,
+                    image_name=get_image_name(app_name, base_name),
+                    title=title,
+                    working_directory='./' + app_context_path,
+                    dockerfile=dockerfile_path)
+
+                tag = app_specific_tag_variable(app_name)
+                build["tag"] = "${{%s}}" % tag
+
+                specific_build_template_path = join(app_context_path, 'build.yaml')
+                if exists(specific_build_template_path):
+                    logging.info("Specific build template found: %s" %
+                                 (specific_build_template_path))
+                    with open(specific_build_template_path) as f:
+                        build_specific = yaml.safe_load(f)
+
+                    build_specific.pop(
+                        'build_arguments') if 'build_arguments' in build_specific else []
+
+                build['dependencies'] = dependencies
+
+                def get_other_image_name(app_name):
+                    return ("${{REGISTRY}}/" + f"{build_steps[app_name]['image_name']}:{build_steps[app_name]['tag']}")\
+                        if app_name in build_steps \
+                        else image_tag_with_variables(app_name, app_specific_tag_variable(app_name), base_name)
+
+                def add_arg_dependencies(dependencies):
+                    arg_dependencies = [f"{d.upper().replace('-', '_')}={get_other_image_name(d)}"
+                                        for d in dependencies]
+                    build['build_arguments'].extend(arg_dependencies)
+
+                values_key = app_name
+                if dependencies is not None:
+                    add_arg_dependencies(dependencies)
+                elif values_key in helm_values.apps:
+                    try:
+                        add_arg_dependencies(
+                            helm_values.apps[values_key].harness.dependencies.build)
+                    except (KeyError, AttributeError):
+                        add_arg_dependencies(helm_values['task-images'])
+
+                when_condition = existing_build_when_condition(tag)
+                build["when"] = when_condition
+                return build
+
             def codefresh_steps_from_base_path(base_path, fixed_context=None, include=build_included, publish=True):
                 found = False
                 for dockerfile_path in find_dockerfiles_paths(base_path):
@@ -433,52 +483,6 @@ def app_specific_tag_variable(app_name):
     return "%s_TAG" % app_name.replace('-', '_').upper().strip()
 
 
-def codefresh_app_build_spec(app_name, app_context_path, dockerfile_path="Dockerfile", base_name=None, helm_values: HarnessMainConfig = {}, dependencies=None):
-    logging.info('Generating build script for ' + app_name)
-    title = app_name.capitalize().replace(
-        '-', ' ').replace('/', ' ').replace('.', ' ').strip()
-    build = codefresh_template_spec(
-        template_path=CF_BUILD_PATH,
-        image_name=get_image_name(app_name, base_name),
-        title=title,
-        working_directory='./' + app_context_path,
-        dockerfile=dockerfile_path)
-
-    tag = app_specific_tag_variable(app_name)
-    build["tag"] = "${{%s}}" % tag
-
-    specific_build_template_path = join(app_context_path, 'build.yaml')
-    if exists(specific_build_template_path):
-        logging.info("Specific build template found: %s" %
-                     (specific_build_template_path))
-        with open(specific_build_template_path) as f:
-            build_specific = yaml.safe_load(f)
-
-        build_specific.pop(
-            'build_arguments') if 'build_arguments' in build_specific else []
-
-    build['dependencies'] = dependencies
-
-    def add_arg_dependencies(dependencies):
-        arg_dependencies = [f"{d.upper().replace('-', '_')}={image_tag_with_variables(d, app_specific_tag_variable(d), base_name)}" for
-                            d in dependencies]
-        build['build_arguments'].extend(arg_dependencies)
-
-    values_key = app_name
-    if dependencies is not None:
-        add_arg_dependencies(dependencies)
-    elif values_key in helm_values.apps:
-        try:
-            add_arg_dependencies(
-                helm_values.apps[values_key].harness.dependencies.build)
-        except (KeyError, AttributeError):
-            add_arg_dependencies(helm_values['task-images'])
-
-    when_condition = existing_build_when_condition(tag)
-    build["when"] = when_condition
-    return build
-
-
 def existing_build_when_condition(tag):
     """
     See https://codefresh.io/docs/docs/pipelines/conditional-execution-of-steps/#execute-steps-according-to-the-presence-of-a-variable

tools/deployment-cli-tools/tests/test_codefresh.py

@@ -117,6 +117,11 @@ def test_create_codefresh_configuration():
 
         step = steps["myapp"]
         assert step['dockerfile'] == "Dockerfile"
+        for build_argument in step['build_arguments']:
+            if build_argument.startswith("CLOUDHARNESS_FLASK="):
+                assert "cloud-harness" in build_argument, "Cloudharness flask image should have cloud-harness in its path"
+                assert build_argument == "CLOUDHARNESS_FLASK=${{REGISTRY}}/cloud-harness/cloudharness-flask:${{CLOUDHARNESS_FLASK_TAG}}", "Dependency is not properly set in the build arguments"
+
         assert os.path.samefile(step['working_directory'], os.path.join(
             RESOURCES, APPS_PATH, "myapp"))
 
@@ -131,7 +136,6 @@ def test_create_codefresh_configuration():
         assert len(
             tstep['commands']) == 2, "Unit test commands are not properly loaded from the unit test configuration file"
         assert tstep['commands'][0] == "tox", "Unit test commands are not properly loaded from the unit test configuration file"
-
         assert len(l1_steps[CD_STEP_CLONE_DEPENDENCIES]['steps']) == 3, "3 clone steps should be included as we have 2 dependencies from myapp, plus cloudharness"
     finally:
         shutil.rmtree(BUILD_MERGE_DIR)