Support YAML input for CloudBuildCreateOperator #8808

joppevos · 2020-05-10T20:43:22Z

addresses the following issue.

Make sure to mark the boxes below before creating PR: [x]

Description above provides context of the change
Unit tests coverage for changes (not needed for documentation changes)
Target Github ISSUE in description if exists
Commits follow "How to write a good git commit message"
Relevant documentation is updated including usage instructions.
I will engage committers as explained in Contribution Workflow Example.

In case of fundamental code change, Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in UPDATING.md.
Read the Pull Request Guidelines for more information.

removed spaces

mik-laj · 2020-05-11T03:15:06Z

airflow/providers/google/cloud/operators/cloud_build.py

+        :return: dict
+        """
+        try:
+            with open(self.body, 'r') as f:


I think, we should use template_ext to load file. This will cause us to still have text instead of the dictionary, so we need to overwrite the prepare_template method to convert the string to a dictionary

mik-laj · 2020-05-11T03:16:49Z

airflow/providers/google/cloud/operators/cloud_build.py

+    def _load_body_to_dict(self):
+        """
+        :param file:
+            file path to YAML build config


Can you also add JSON file support? This is not common, but build can also be defined as JSON files.

You can write the build config file using the YAML or the JSON syntax.

https://cloud.google.com/cloud-build/docs/build-config#structure_of_a_build_config_file

airflow/providers/google/cloud/example_dags/example_cloud_build.py

airflow/providers/google/cloud/example_dags/example_cloud_build.yaml

mik-laj · 2020-05-11T03:19:01Z

airflow/providers/google/cloud/example_dags/example_cloud_build.py

@@ -99,6 +99,12 @@
        task_id="create_build_from_repo_result",
    )

+    create_build_from_file = CloudBuildCreateOperator(


Can you add this example to guide? https://airflow.readthedocs.io/en/latest/howto/operator/gcp/cloud_build.html

mik-laj · 2020-05-11T03:31:25Z

airflow/providers/google/cloud/example_dags/example_cloud_build.yaml

+# specific language governing permissions and limitations
+# under the License.
+
+steps:


Traceback (most recent call last): File "/usr/local/bin/airflow", line 11, in <module> load_entry_point('apache-airflow', 'console_scripts', 'airflow')() File "/opt/airflow/airflow/__main__.py", line 40, in main args.func(args) File "/opt/airflow/airflow/cli/cli_parser.py", line 52, in command return func(*args, **kwargs) File "/opt/airflow/airflow/utils/cli.py", line 84, in wrapper return f(*args, **kwargs) File "/opt/airflow/airflow/cli/commands/task_command.py", line 341, in task_test ti.run(ignore_task_deps=True, ignore_ti_state=True, test_mode=True) File "/opt/airflow/airflow/utils/session.py", line 61, in wrapper return func(*args, **kwargs) File "/opt/airflow/airflow/models/taskinstance.py", line 1143, in run session=session) File "/opt/airflow/airflow/utils/session.py", line 57, in wrapper return func(*args, **kwargs) File "/opt/airflow/airflow/sentry.py", line 140, in wrapper return func(task_instance, *args, session=session, **kwargs) File "/opt/airflow/airflow/models/taskinstance.py", line 1024, in _run_raw_task result = task_copy.execute(context=context) File "/opt/airflow/airflow/providers/google/cloud/operators/cloud_build.py", line 217, in execute body = BuildProcessor(body=self.body).process_body() File "/opt/airflow/airflow/providers/google/cloud/operators/cloud_build.py", line 99, in process_body self._verify_source() File "/opt/airflow/airflow/providers/google/cloud/operators/cloud_build.py", line 52, in _verify_source is_storage = "storageSource" in self.body["source"] KeyError: 'source'

I'm afraid this file won't work. Can you make this optional key?
Can you make this

providing a source is optional for a build config. Should we always check and fail if the body misses a source?

We should allow the build object to be passed without sources.

mik-laj · 2020-05-11T03:33:57Z

I tried to implement this feature based on template_ext. What do you think?

05:31 $ git diff --cached
diff --git a/airflow/providers/google/cloud/operators/cloud_build.py b/airflow/providers/google/cloud/operators/cloud_build.py
index b86b45d12..739281c00 100644
--- a/airflow/providers/google/cloud/operators/cloud_build.py
+++ b/airflow/providers/google/cloud/operators/cloud_build.py
@@ -16,6 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 """Operators that integrat with Google Cloud Build service."""
+import json
 import re
 from copy import deepcopy
 from typing import Any, Dict, Iterable, Optional, Union
@@ -85,17 +86,6 @@ class BuildProcessor:

         self.body["source"]["storageSource"] = self._convert_storage_url_to_dict(source)

-    def _load_body_to_dict(self):
-        """
-        :param file:
-            file path to YAML build config
-        :return: dict
-        """
-        try:
-            with open(self.body, 'r') as f:
-                self.body = yaml.safe_load(f)
-        except yaml.YAMLError as e:
-            raise AirflowException("Exception when loading resource definition: %s\n" % e)

     def process_body(self):
         """
@@ -104,10 +94,6 @@ class BuildProcessor:
         :return: the body.
         :type: dict
         """
-
-        if isinstance(self.body, str):
-            self._load_body_to_dict()
-            return self.body
         self._verify_source()
         self._reformat_source()
         return self.body
@@ -193,6 +179,7 @@ class CloudBuildCreateOperator(BaseOperator):
     """

     template_fields = ("body", "gcp_conn_id", "api_version")  # type: Iterable[str]
+    template_ext = ['.yml', '.yaml', '.json']

     @apply_defaults
     def __init__(self,
@@ -203,11 +190,22 @@ class CloudBuildCreateOperator(BaseOperator):
                  *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
         self.body = body
+        # Not template fields to keep original value
+        self.body_raw = body
         self.project_id = project_id
         self.gcp_conn_id = gcp_conn_id
         self.api_version = api_version
         self._validate_inputs()

+    def prepare_template(self) -> None:
+        # If no file is specified, skip
+        if not isinstance(self.body_raw, str):
+            return
+        if any(self.body_raw.endswith(ext) for ext in ['.yml', '.yaml']):
+            self.body = yaml.load(self.body)
+        if self.body_raw.endswith('.json'):
+            self.body = json.loads(self.body)
+
     def _validate_inputs(self):
         if not self.body:
             raise AirflowException("The required parameter 'body' is missing")

If you agree with this idea, could you add tests to this PR?

joppevos · 2020-05-11T11:17:15Z

@mik-laj that's a great implementation. I was not aware of prepare_template but is it suited for it.
Should I take over your implementation in the PR? I will also add the rest of the feedback

mik-laj · 2020-05-11T12:19:18Z

@joppevos Yes. Go ahead and use it.

chmod x chmod

joppevos · 2020-05-14T08:45:25Z

Added the feedback. The only thing I have to make now is the test. I assume the test would check if it is able to work correctly given a YAML or JSON build config. How would I approach this? Something like the code below? New to testing to be honest.
I appreciate the given help @mik-laj.

    @mock.patch("airflow.providers.google.cloud.operators.cloud_build.CloudBuildHook")
    def test_load_yaml(self, hook_mock):
        with tempfile.NamedTemporaryFile(suffix='.yaml', mode='w+t') as build:
            build.writelines("""
            steps:
                - name: 'ubuntu'
                  args: ['echo', 'hello world, the day is {{ ds }} ']
            """)
            body_path = build.name

            operator = CloudBuildCreateOperator(
                body=body_path, project_id=TEST_PROJECT_ID, task_id="task-id"
            )
            return_value = operator.execute({})
             # TODO: assert given yaml values are same as return

mik-laj · 2020-05-14T08:52:13Z

@joppevos It looks good for me, but before calling the execute method, you must call the dag.resolve_template_files() method.

mik-laj · 2020-05-16T06:29:53Z

@joppevos Github action is sad. Can you fix it?

docs/howto/operator/gcp/cloud_build.rst

mik-laj · 2020-05-18T07:31:36Z

Travis is sad. Do you need any help?

joppevos · 2020-05-18T08:04:48Z

@mik-laj You are helping me at every step ;) thanks. It seems that the example_build.yaml cannot be found. Currently, the file is in the same folder as the example. Should it get an absolute path to be found in the tests?

mik-laj · 2020-05-18T08:21:30Z

@joppevos Yes. Here is example: #8527

joppevos · 2020-05-18T17:30:45Z

@mik-laj The absolute path did indeed the trick. Build is passing now 👍

airflow/providers/google/cloud/example_dags/example_cloud_build.py

airflow/providers/google/cloud/operators/cloud_build.py

added yaml file for the example build operator

0c2fa00

removed spaces

boring-cyborg bot added the provider:google Google (including GCP) related issues label May 10, 2020

mik-laj reviewed May 11, 2020

View reviewed changes

airflow/providers/google/cloud/example_dags/example_cloud_build.py Outdated Show resolved Hide resolved

mik-laj reviewed May 11, 2020

View reviewed changes

airflow/providers/google/cloud/example_dags/example_cloud_build.yaml Outdated Show resolved Hide resolved

mik-laj reviewed May 11, 2020

View reviewed changes

joppevos added 2 commits May 11, 2020 21:39

adjusted yaml and json implementation. Complemented the docs

500f43c

chmod x chmod

moving documentation code insertion

0d78de0

joppevos added 2 commits May 16, 2020 11:06

fix for mypy static checks failing in CI

ddbb766

Adding test, adjusting docs

092dfb6

mik-laj reviewed May 18, 2020

View reviewed changes

docs/howto/operator/gcp/cloud_build.rst Show resolved Hide resolved

joppevos added 2 commits May 18, 2020 13:21

adding relative path to example yaml input

2643ab5

removed redundant information from docs

17029e7

mik-laj reviewed May 19, 2020

View reviewed changes

airflow/providers/google/cloud/example_dags/example_cloud_build.py Outdated Show resolved Hide resolved

mik-laj reviewed May 19, 2020

View reviewed changes

airflow/providers/google/cloud/operators/cloud_build.py Show resolved Hide resolved

Adding doc strings about new filepath option

bf2758d

mik-laj approved these changes May 19, 2020

View reviewed changes

mik-laj merged commit cf5cf45 into apache:master May 23, 2020

joppevos deleted the yaml_support_for_cloudbuild_operator branch May 24, 2020 09:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support YAML input for CloudBuildCreateOperator #8808

Support YAML input for CloudBuildCreateOperator #8808

joppevos commented May 10, 2020 •

edited

mik-laj May 11, 2020

mik-laj May 11, 2020

mik-laj May 11, 2020

mik-laj May 11, 2020

joppevos May 11, 2020

mik-laj May 11, 2020

mik-laj commented May 11, 2020 •

edited

joppevos commented May 11, 2020

mik-laj commented May 11, 2020

joppevos commented May 14, 2020

mik-laj commented May 14, 2020 •

edited

mik-laj commented May 16, 2020

mik-laj commented May 18, 2020

joppevos commented May 18, 2020

mik-laj commented May 18, 2020

joppevos commented May 18, 2020

Support YAML input for CloudBuildCreateOperator #8808

Support YAML input for CloudBuildCreateOperator #8808

Conversation

joppevos commented May 10, 2020 • edited

mik-laj May 11, 2020

Choose a reason for hiding this comment

mik-laj May 11, 2020

Choose a reason for hiding this comment

mik-laj May 11, 2020

Choose a reason for hiding this comment

mik-laj May 11, 2020

Choose a reason for hiding this comment

joppevos May 11, 2020

Choose a reason for hiding this comment

mik-laj May 11, 2020

Choose a reason for hiding this comment

mik-laj commented May 11, 2020 • edited

joppevos commented May 11, 2020

mik-laj commented May 11, 2020

joppevos commented May 14, 2020

mik-laj commented May 14, 2020 • edited

mik-laj commented May 16, 2020

mik-laj commented May 18, 2020

joppevos commented May 18, 2020

mik-laj commented May 18, 2020

joppevos commented May 18, 2020

joppevos commented May 10, 2020 •

edited

mik-laj commented May 11, 2020 •

edited

mik-laj commented May 14, 2020 •

edited