mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Bug fixes for gcp_compute_backend_bucket (#42804)
This commit is contained in:
parent
4ecdf11aaa
commit
476e98e0cf
2 changed files with 42 additions and 44 deletions
|
@ -74,31 +74,30 @@ options:
|
|||
be a dash.
|
||||
required: true
|
||||
extends_documentation_fragment: gcp
|
||||
notes:
|
||||
- "API Reference: U(https://cloud.google.com/compute/docs/reference/latest/backendBuckets)"
|
||||
- "Using a Cloud Storage bucket as a load balancer backend: U(https://cloud.google.com/compute/docs/load-balancing/http/backend-bucket)"
|
||||
'''
|
||||
|
||||
EXAMPLES = '''
|
||||
- name: create a bucket
|
||||
gcp_storage_bucket:
|
||||
name: 'bucket-backendbucket'
|
||||
name: "bucket-backendbucket"
|
||||
project: "{{ gcp_project }}"
|
||||
auth_kind: "{{ gcp_cred_kind }}"
|
||||
service_account_file: "{{ gcp_cred_file }}"
|
||||
scopes:
|
||||
- https://www.googleapis.com/auth/devstorage.full_control
|
||||
state: present
|
||||
register: bucket
|
||||
|
||||
- name: create a backend bucket
|
||||
gcp_compute_backend_bucket:
|
||||
name: testObject
|
||||
name: "test_object"
|
||||
bucket_name: "{{ bucket.name }}"
|
||||
description: "A BackendBucket to connect LNB w/ Storage Bucket"
|
||||
description: A BackendBucket to connect LNB w/ Storage Bucket
|
||||
enable_cdn: true
|
||||
project: testProject
|
||||
auth_kind: service_account
|
||||
service_account_file: /tmp/auth.pem
|
||||
scopes:
|
||||
- https://www.googleapis.com/auth/cloud-platform
|
||||
project: "test_project"
|
||||
auth_kind: "service_account"
|
||||
service_account_file: "/tmp/auth.pem"
|
||||
state: present
|
||||
'''
|
||||
|
||||
|
@ -167,6 +166,9 @@ def main():
|
|||
)
|
||||
)
|
||||
|
||||
if not module.params['scopes']:
|
||||
module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
|
||||
|
||||
state = module.params['state']
|
||||
kind = 'compute#backendBucket'
|
||||
|
||||
|
@ -176,10 +178,10 @@ def main():
|
|||
if fetch:
|
||||
if state == 'present':
|
||||
if is_different(module, fetch):
|
||||
fetch = update(module, self_link(module), kind, fetch)
|
||||
fetch = update(module, self_link(module), kind)
|
||||
changed = True
|
||||
else:
|
||||
delete(module, self_link(module), kind, fetch)
|
||||
delete(module, self_link(module), kind)
|
||||
fetch = {}
|
||||
changed = True
|
||||
else:
|
||||
|
@ -199,12 +201,12 @@ def create(module, link, kind):
|
|||
return wait_for_operation(module, auth.post(link, resource_to_request(module)))
|
||||
|
||||
|
||||
def update(module, link, kind, fetch):
|
||||
def update(module, link, kind):
|
||||
auth = GcpSession(module, 'compute')
|
||||
return wait_for_operation(module, auth.put(link, resource_to_request(module)))
|
||||
|
||||
|
||||
def delete(module, link, kind, fetch):
|
||||
def delete(module, link, kind):
|
||||
auth = GcpSession(module, 'compute')
|
||||
return wait_for_operation(module, auth.delete(link))
|
||||
|
||||
|
@ -304,7 +306,7 @@ def async_op_url(module, extra_data=None):
|
|||
def wait_for_operation(module, response):
|
||||
op_result = return_if_object(module, response, 'compute#operation')
|
||||
if op_result is None:
|
||||
return None
|
||||
return {}
|
||||
status = navigate_hash(op_result, ['status'])
|
||||
wait_done = wait_for_completion(status, op_result, module)
|
||||
return fetch_resource(module, navigate_hash(wait_done, ['targetLink']), 'compute#backendBucket')
|
||||
|
|
|
@ -15,38 +15,32 @@
|
|||
# Pre-test setup
|
||||
- name: create a bucket
|
||||
gcp_storage_bucket:
|
||||
name: 'bucket-backendbucket'
|
||||
name: "bucket-backendbucket"
|
||||
project: "{{ gcp_project }}"
|
||||
auth_kind: "{{ gcp_cred_kind }}"
|
||||
service_account_file: "{{ gcp_cred_file }}"
|
||||
scopes:
|
||||
- https://www.googleapis.com/auth/devstorage.full_control
|
||||
state: present
|
||||
register: bucket
|
||||
- name: delete a backend bucket
|
||||
gcp_compute_backend_bucket:
|
||||
name: "{{ resource_name }}"
|
||||
bucket_name: "{{ bucket.name }}"
|
||||
description: "A BackendBucket to connect LNB w/ Storage Bucket"
|
||||
description: A BackendBucket to connect LNB w/ Storage Bucket
|
||||
enable_cdn: true
|
||||
project: "{{ gcp_project }}"
|
||||
auth_kind: "{{ gcp_cred_kind }}"
|
||||
service_account_file: "{{ gcp_cred_file }}"
|
||||
scopes:
|
||||
- https://www.googleapis.com/auth/cloud-platform
|
||||
state: absent
|
||||
#----------------------------------------------------------
|
||||
- name: create a backend bucket
|
||||
gcp_compute_backend_bucket:
|
||||
name: "{{ resource_name }}"
|
||||
bucket_name: "{{ bucket.name }}"
|
||||
description: "A BackendBucket to connect LNB w/ Storage Bucket"
|
||||
description: A BackendBucket to connect LNB w/ Storage Bucket
|
||||
enable_cdn: true
|
||||
project: "{{ gcp_project }}"
|
||||
auth_kind: "{{ gcp_cred_kind }}"
|
||||
service_account_file: "{{ gcp_cred_file }}"
|
||||
scopes:
|
||||
- https://www.googleapis.com/auth/cloud-platform
|
||||
state: present
|
||||
register: result
|
||||
- name: assert changed is true
|
||||
|
@ -55,25 +49,29 @@
|
|||
- result.changed == true
|
||||
- "result.kind == 'compute#backendBucket'"
|
||||
- name: verify that backend_bucket was created
|
||||
shell: |
|
||||
gcloud compute backend-buckets describe --project="{{ gcp_project}}" "{{ resource_name }}"
|
||||
gcp_compute_backend_bucket_facts:
|
||||
filters:
|
||||
- name = {{ resource_name }}
|
||||
project: "{{ gcp_project }}"
|
||||
auth_kind: "{{ gcp_cred_kind }}"
|
||||
service_account_file: "{{ gcp_cred_file }}"
|
||||
scopes:
|
||||
- https://www.googleapis.com/auth/compute
|
||||
register: results
|
||||
- name: verify that command succeeded
|
||||
assert:
|
||||
that:
|
||||
- results.rc == 0
|
||||
- results['items'] | length == 1
|
||||
# ----------------------------------------------------------------------------
|
||||
- name: create a backend bucket that already exists
|
||||
gcp_compute_backend_bucket:
|
||||
name: "{{ resource_name }}"
|
||||
bucket_name: "{{ bucket.name }}"
|
||||
description: "A BackendBucket to connect LNB w/ Storage Bucket"
|
||||
description: A BackendBucket to connect LNB w/ Storage Bucket
|
||||
enable_cdn: true
|
||||
project: "{{ gcp_project }}"
|
||||
auth_kind: "{{ gcp_cred_kind }}"
|
||||
service_account_file: "{{ gcp_cred_file }}"
|
||||
scopes:
|
||||
- https://www.googleapis.com/auth/cloud-platform
|
||||
state: present
|
||||
register: result
|
||||
- name: assert changed is false
|
||||
|
@ -86,13 +84,11 @@
|
|||
gcp_compute_backend_bucket:
|
||||
name: "{{ resource_name }}"
|
||||
bucket_name: "{{ bucket.name }}"
|
||||
description: "A BackendBucket to connect LNB w/ Storage Bucket"
|
||||
description: A BackendBucket to connect LNB w/ Storage Bucket
|
||||
enable_cdn: true
|
||||
project: "{{ gcp_project }}"
|
||||
auth_kind: "{{ gcp_cred_kind }}"
|
||||
service_account_file: "{{ gcp_cred_file }}"
|
||||
scopes:
|
||||
- https://www.googleapis.com/auth/cloud-platform
|
||||
state: absent
|
||||
register: result
|
||||
- name: assert changed is true
|
||||
|
@ -101,27 +97,29 @@
|
|||
- result.changed == true
|
||||
- result.has_key('kind') == False
|
||||
- name: verify that backend_bucket was deleted
|
||||
shell: |
|
||||
gcloud compute backend-buckets describe --project="{{ gcp_project}}" "{{ resource_name }}"
|
||||
gcp_compute_backend_bucket_facts:
|
||||
filters:
|
||||
- name = {{ resource_name }}
|
||||
project: "{{ gcp_project }}"
|
||||
auth_kind: "{{ gcp_cred_kind }}"
|
||||
service_account_file: "{{ gcp_cred_file }}"
|
||||
scopes:
|
||||
- https://www.googleapis.com/auth/compute
|
||||
register: results
|
||||
failed_when: results.rc == 0
|
||||
- name: verify that command succeeded
|
||||
assert:
|
||||
that:
|
||||
- results.rc == 1
|
||||
- "\"'projects/{{ gcp_project }}/global/backendBuckets/{{ resource_name }}' was not found\" in results.stderr"
|
||||
- results['items'] | length == 0
|
||||
# ----------------------------------------------------------------------------
|
||||
- name: delete a backend bucket that does not exist
|
||||
gcp_compute_backend_bucket:
|
||||
name: "{{ resource_name }}"
|
||||
bucket_name: "{{ bucket.name }}"
|
||||
description: "A BackendBucket to connect LNB w/ Storage Bucket"
|
||||
description: A BackendBucket to connect LNB w/ Storage Bucket
|
||||
enable_cdn: true
|
||||
project: "{{ gcp_project }}"
|
||||
auth_kind: "{{ gcp_cred_kind }}"
|
||||
service_account_file: "{{ gcp_cred_file }}"
|
||||
scopes:
|
||||
- https://www.googleapis.com/auth/cloud-platform
|
||||
state: absent
|
||||
register: result
|
||||
- name: assert changed is false
|
||||
|
@ -133,11 +131,9 @@
|
|||
# Post-test teardown
|
||||
- name: delete a bucket
|
||||
gcp_storage_bucket:
|
||||
name: 'bucket-backendbucket'
|
||||
name: "bucket-backendbucket"
|
||||
project: "{{ gcp_project }}"
|
||||
auth_kind: "{{ gcp_cred_kind }}"
|
||||
service_account_file: "{{ gcp_cred_file }}"
|
||||
scopes:
|
||||
- https://www.googleapis.com/auth/devstorage.full_control
|
||||
state: absent
|
||||
register: bucket
|
||||
|
|
Loading…
Reference in a new issue