fixed _merge_dictionaries calls in GcpSession class

[itaimalek]

SUMMARY

This is the same issue as in #57140 ,
in lib/ansible/module_utils/gcp_utils.py file there are two classes:

GcpSession and GcpModule both are using similar private methods with same name _merge_dictionaries

the problem is that GcpSession calls for that method with merge_dictionaries and not _merge_dictionaries , this causes any interaction with gcp to fail with:

fatal: [localhost]: FAILED! => {
    "changed": false,
    "module_stderr": "/home/ansible/.ansible/tmp/ansible-tmp-1559152385.660594-245273378382856/AnsiballZ_gcp_storage_object.py:68: DeprecationWarning: the imp module is deprecated in favour of importlib; see the module's documentation for alternative uses\n  import imp\nTraceback (most recent call last):\n  File \"/home/ansible/.ansible/tmp/ansible-tmp-1559152385.660594-245273378382856/AnsiballZ_gcp_storage_object.py\", line 262, in <module>\n    _ansiballz_main()\n  File \"/home/ansible/.ansible/tmp/ansible-tmp-1559152385.660594-245273378382856/AnsiballZ_gcp_storage_object.py\", line 252, in _ansiballz_main\n    invoke_module(zipped_mod, temp_path, ANSIBALLZ_PARAMS)\n  File \"/home/ansible/.ansible/tmp/ansible-tmp-1559152385.660594-245273378382856/AnsiballZ_gcp_storage_object.py\", line 120, in invoke_module\n    imp.load_module('__main__', mod, module, MOD_DESC)\n  File \"/usr/lib/python3.7/imp.py\", line 234, in load_module\n    return load_source(name, filename, file)\n  File \"/usr/lib/python3.7/imp.py\", line 169, in load_source\n    module = _exec(spec, sys.modules[name])\n  File \"<frozen importlib._bootstrap>\", line 630, in _exec\n  File \"<frozen importlib._bootstrap_external>\", line 728, in exec_module\n  File \"<frozen importlib._bootstrap>\", line 219, in _call_with_frames_removed\n  File \"/tmp/ansible_gcp_storage_object_payload_pk1f5ss7/__main__.py\", line 284, in <module>\n  File \"/tmp/ansible_gcp_storage_object_payload_pk1f5ss7/__main__.py\", line 188, in main\n  File \"/tmp/ansible_gcp_storage_object_payload_pk1f5ss7/__main__.py\", line 204, in upload_file\n  File \"/tmp/ansible_gcp_storage_object_payload_pk1f5ss7/ansible_gcp_storage_object_payload.zip/ansible/module_utils/gcp_utils.py\", line 96, in post_contents\nAttributeError: 'GcpSession' object has no attribute 'merge_dictionaries'\n",
    "module_stdout": "",
    "msg": "MODULE FAILURE\nSee stdout/stderr for the exact error",
    "rc": 1
}

ISSUE TYPE

• Bugfix Pull Request

COMPONENT NAME

gcp_storage_object

ADDITIONAL INFORMATION

see above

[ansibot]

cc @erjohnso @rambleraptor
click here for bot help

[Akasurde]

shipit

[Akasurde]

@rambleraptor Could you please take a look at this ? Thanks in advance.

[flaper87]

Will this be backported to 2.8? Thanks!

[Akasurde]

@flaper87 Backport 2.8 - #59782