Merge pull request #8136 from neoaggelos/awxkit-import-yaml-loader

Support `!import` and `!include` in `awx import -f yaml` command

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul

awxkit/awxkit/cli/resource.py

@@ -2,7 +2,7 @@ import yaml
 import json
 import os
 
-from awxkit import api, config
+from awxkit import api, config, yaml_file
 from awxkit.exceptions import ImportExportError
 from awxkit.utils import to_str
 from awxkit.api.pages import Page
@@ -140,7 +140,7 @@ class Import(CustomCommand):
         if fmt == 'json':
             data = json.load(client.stdin)
         elif fmt == 'yaml':
-            data = yaml.safe_load(client.stdin)
+            data = yaml.load(client.stdin, Loader=yaml_file.Loader)
         else:
             raise ImportExportError("Unsupported format for Import: " + fmt)
 

awxkit/test/cli/test_format.py

@@ -63,6 +63,7 @@ def test_yaml_import():
           - name: Workflow1
         """
     )
+    yaml_fd.name = 'file.yaml'
     cli = CLI(stdin=yaml_fd)
     cli.parse_args(['--conf.format', 'yaml'])
     cli.v2 = MockedV2()