External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-09 18:37:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

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

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

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-09-15 18:56:06 +00:00
committed by GitHub
parent 432e167930 b8cf644959
commit 4b72630087
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awxkit/awxkit/cli/resource.py
View File

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

1
awxkit/test/cli/test_format.py
View File

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