Bug fixes for gcp_compute_backend_bucket (#42804)

This commit is contained in:
Alex Stephen 2018-08-13 07:54:56 -07:00
commit 1bdadb4f3f
2 changed files with 42 additions and 44 deletions

View file

@ -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