ansible-collections/google.cloud
1
0
Fork 0
mirror of https://github.com/ansible-collections/google.cloud.git synced 2025-06-28 11:40:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

test passes

Browse source
This commit is contained in:
Alex Stephen 2019-11-05 16:23:32 -08:00
parent 4ed44df624
commit c1becca3e9
2 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
plugins/modules/gcp_storage_object.py
View file

@ -184,6 +184,7 @@ import hashlib
import base64 import base64
try: try:
import google.cloud
from google.cloud import storage from google.cloud import storage
from google.api_core.client_info import ClientInfo from google.api_core.client_info import ClientInfo
from google.cloud.storage import Blob from google.cloud.storage import Blob
@ -218,12 +219,13 @@ def main():
creds = GcpSession(module, "storage")._credentials() creds = GcpSession(module, "storage")._credentials()
client = storage.Client( client = storage.Client(
project=module.params['project'],
credentials=creds, client_info=ClientInfo(user_agent="Google-Ansible-MM-object") credentials=creds, client_info=ClientInfo(user_agent="Google-Ansible-MM-object")
) )
remote_file_exists = Blob( bucket = client.get_bucket(module.params['bucket'])
remote_file_path(module), module.params["bucket"]
).exists() remote_file_exists = Blob(remote_file_path(module), bucket).exists()
local_file_exists = os.path.isfile(local_file_path(module)) local_file_exists = os.path.isfile(local_file_path(module))
# Check if files exist. # Check if files exist.
@ -261,27 +263,30 @@ def main():
def download_file(module, client, name, dest): def download_file(module, client, name, dest):
try: try:
blob = Blob(name, module.params["bucket"]) bucket = client.get_bucket(module.params['bucket'])
blob = Blob(name, bucket)
with open(dest, "wb") as file_obj: with open(dest, "wb") as file_obj:
blob.download_to_file(file_obj) blob.download_to_file(file_obj)
return blob.__dict__ return {}
except google.cloud.exceptions.NotFound as e: except google.cloud.exceptions.NotFound as e:
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))
def upload_file(module, client, src, dest): def upload_file(module, client, src, dest):
try: try:
blob = Blob(dest, module.params["bucket"]) bucket = client.get_bucket(module.params['bucket'])
with open(src, "wb") as file_obj: blob = Blob(dest, bucket)
with open(src, "r") as file_obj:
blob.upload_from_file(file_obj) blob.upload_from_file(file_obj)
return blob.__dict__ return {}
except GoogleCloudError as e: except google.cloud.exceptions.GoogleCloudError as e:
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))
def delete_file(module, client, name): def delete_file(module, client, name):
try: try:
blob = Blob(name, module.params["bucket"]) bucket = client.get_bucket(module.params['bucket'])
blob = Blob(name, bucket)
blob.delete() blob.delete()
return {} return {}
except google.cloud.exceptions.NotFound as e: except google.cloud.exceptions.NotFound as e:
@ -298,6 +303,8 @@ def local_file_path(module):
def remote_file_path(module): def remote_file_path(module):
if module.params["action"] == "download": if module.params["action"] == "download":
return module.params["src"] return module.params["src"]
elif module.params["action"] == "delete":
return module.params["src"]
else: else:
return module.params["dest"] return module.params["dest"]

3
tests/integration/targets/gcp_storage_object/tasks/main.yml
View file

@ -30,7 +30,6 @@
project: "{{ gcp_project }}" project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}" auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}" service_account_file: "{{ gcp_cred_file }}"
state: present
register: result register: result
- name: assert changed is true - name: assert changed is true
assert: assert:
@ -46,7 +45,6 @@
project: "{{ gcp_project }}" project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}" auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}" service_account_file: "{{ gcp_cred_file }}"
state: present
register: result register: result
- name: assert changed is true - name: assert changed is true
assert: assert:
@ -61,7 +59,6 @@
project: "{{ gcp_project }}" project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}" auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}" service_account_file: "{{ gcp_cred_file }}"
state: present
register: result register: result
- name: assert changed is true - name: assert changed is true
assert: assert: