Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ansible.Basic - fix when deserialising a json string of an array #55691

Merged
merged 2 commits into from May 1, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/ps-basic-json.yaml
@@ -0,0 +1,2 @@
bugfixes:
- Ansible.Basic - Fix issue when deserilizing a JSON string that is not a dictionary - https://github.com/ansible/ansible/pull/55691
4 changes: 2 additions & 2 deletions lib/ansible/module_utils/csharp/Ansible.Basic.cs
Expand Up @@ -334,7 +334,7 @@ public void Warn(string message)
LogEvent(String.Format("[WARNING] {0}", message), EventLogEntryType.Warning);
}

public static Dictionary<string, object> FromJson(string json) { return FromJson<Dictionary<string, object>>(json); }
public static object FromJson(string json) { return FromJson<object>(json); }
public static T FromJson<T>(string json)
{
#if CORECLR
Expand Down Expand Up @@ -375,7 +375,7 @@ public static IDictionary GetParams(string[] args)
if (args.Length > 0)
{
string inputJson = File.ReadAllText(args[0]);
Dictionary<string, object> rawParams = FromJson(inputJson);
Dictionary<string, object> rawParams = FromJson<Dictionary<string, object>>(inputJson);
if (!rawParams.ContainsKey("ANSIBLE_MODULE_ARGS"))
throw new ArgumentException("Module was unable to get ANSIBLE_MODULE_ARGS value from the argument path json");
return (IDictionary)rawParams["ANSIBLE_MODULE_ARGS"];
Expand Down
Expand Up @@ -58,7 +58,7 @@ Function Assert-DictionaryEquals {

if ($actual_value -is [System.Collections.IDictionary]) {
$actual_value | Assert-DictionaryEquals -Expected $expected_value
} elseif ($actual_value -is [System.Collections.ArrayList]) {
} elseif ($actual_value -is [System.Collections.ArrayList] -or $actual_value -is [Array]) {
for ($i = 0; $i -lt $actual_value.Count; $i++) {
$actual_entry = $actual_value[$i]
$expected_entry = $expected_value[$i]
Expand Down Expand Up @@ -2347,6 +2347,23 @@ test_no_log - Invoked with:
$actual.invocation | Assert-DictionaryEquals -Expected @{module_args = @{}}
$actual.output | Assert-DictionaryEquals -Expected @{a = "a"; b = "b"}
}

"String json array to object" = {
$input_json = '["abc", "def"]'
$actual = [Ansible.Basic.AnsibleModule]::FromJson($input_json)
$actual -is [Array] | Assert-Equals -Expected $true
$actual.Length | Assert-Equals -Expected 2
$actual[0] | Assert-Equals -Expected "abc"
$actual[1] | Assert-Equals -Expected "def"
}

"String json array of dictionaries to object" = {
$input_json = '[{"abc":"def"}]'
$actual = [Ansible.Basic.AnsibleModule]::FromJson($input_json)
$actual -is [Array] | Assert-Equals -Expected $true
$actual.Length | Assert-Equals -Expected 1
$actual[0] | Assert-DictionaryEquals -Expected @{"abc" = "def"}
}
}

try {
Expand Down
14 changes: 14 additions & 0 deletions test/integration/targets/win_uri/tasks/main.yml
Expand Up @@ -429,3 +429,17 @@
that:
- not request_status_code_comma.changed
- request_status_code_comma.status_code == 202

# https://github.com/ansible/ansible/issues/55294
- name: get json content that is an array
win_uri:
url: https://{{httpbin_host}}/base64/{{ '[{"abc":"def"}]' | b64encode }}
return_content: yes
register: content_array

- name: assert content of json array
assert:
that:
- not content_array is changed
- content_array.content == '[{"abc":"def"}]'
- content_array.json == [{"abc":"def"}]