Bug fixes for gcp_compute_target_ssl_proxy (#42826)

This commit is contained in:
Alex Stephen 2018-08-14 06:52:57 -07:00 committed by Ryan Brown
commit 569e094efd
2 changed files with 84 additions and 107 deletions

View file

@ -15,18 +15,16 @@
# Pre-test setup
- name: create a instance group
gcp_compute_instance_group:
name: 'instancegroup-targetsslproxy'
zone: 'us-central1-a'
name: "instancegroup-targetsslproxy"
zone: us-central1-a
project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}"
scopes:
- https://www.googleapis.com/auth/compute
state: present
register: instancegroup
- name: create a health check
gcp_compute_health_check:
name: 'healthcheck-targetsslproxy'
name: "healthcheck-targetsslproxy"
type: TCP
tcp_health_check:
port_name: service-health
@ -38,30 +36,25 @@
project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}"
scopes:
- https://www.googleapis.com/auth/compute
state: present
register: healthcheck
- name: create a backend service
gcp_compute_backend_service:
name: 'backendservice-targetsslproxy'
name: "backendservice-targetsslproxy"
backends:
- group: "{{ instancegroup }}"
- group: "{{ instancegroup }}"
health_checks:
- "{{ healthcheck.selfLink }}"
protocol: 'SSL'
- "{{ healthcheck.selfLink }}"
protocol: SSL
project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}"
scopes:
- https://www.googleapis.com/auth/compute
state: present
register: backendservice
- name: create a ssl certificate
gcp_compute_ssl_certificate:
name: 'sslcert-targetsslproxy'
description: |
"A certificate for testing. Do not use this certificate in production"
name: "sslcert-targetsslproxy"
description: A certificate for testing. Do not use this certificate in production
certificate: |
-----BEGIN CERTIFICATE-----
MIICqjCCAk+gAwIBAgIJAIuJ+0352Kq4MAoGCCqGSM49BAMCMIGwMQswCQYDVQQG
@ -89,34 +82,28 @@
project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}"
scopes:
- https://www.googleapis.com/auth/compute
state: present
register: sslcert
- name: delete a target ssl proxy
gcp_compute_target_ssl_proxy:
name: "{{ resource_name }}"
ssl_certificates:
- "{{ sslcert }}"
- "{{ sslcert }}"
service: "{{ backendservice }}"
project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}"
scopes:
- https://www.googleapis.com/auth/compute
state: absent
#----------------------------------------------------------
- name: create a target ssl proxy
gcp_compute_target_ssl_proxy:
name: "{{ resource_name }}"
ssl_certificates:
- "{{ sslcert }}"
- "{{ sslcert }}"
service: "{{ backendservice }}"
project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}"
scopes:
- https://www.googleapis.com/auth/compute
state: present
register: result
- name: assert changed is true
@ -125,25 +112,29 @@
- result.changed == true
- "result.kind == 'compute#targetSslProxy'"
- name: verify that target_ssl_proxy was created
shell: |
gcloud compute target-ssl-proxies describe --project="{{ gcp_project}}" "{{ resource_name }}"
register: results
- name: verify that command succeeded
assert:
that:
- results.rc == 0
# ----------------------------------------------------------------------------
- name: create a target ssl proxy that already exists
gcp_compute_target_ssl_proxy:
name: "{{ resource_name }}"
ssl_certificates:
- "{{ sslcert }}"
service: "{{ backendservice }}"
gcp_compute_target_ssl_proxy_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['items'] | length == 1
# ----------------------------------------------------------------------------
- name: create a target ssl proxy that already exists
gcp_compute_target_ssl_proxy:
name: "{{ resource_name }}"
ssl_certificates:
- "{{ sslcert }}"
service: "{{ backendservice }}"
project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}"
state: present
register: result
- name: assert changed is false
@ -156,13 +147,11 @@
gcp_compute_target_ssl_proxy:
name: "{{ resource_name }}"
ssl_certificates:
- "{{ sslcert }}"
- "{{ sslcert }}"
service: "{{ backendservice }}"
project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}"
scopes:
- https://www.googleapis.com/auth/compute
state: absent
register: result
- name: assert changed is true
@ -171,27 +160,29 @@
- result.changed == true
- result.has_key('kind') == False
- name: verify that target_ssl_proxy was deleted
shell: |
gcloud compute target-ssl-proxies describe --project="{{ gcp_project}}" "{{ resource_name }}"
register: results
failed_when: results.rc == 0
- name: verify that command succeeded
assert:
that:
- results.rc == 1
- "\"'projects/{{ gcp_project }}/global/targetSslProxies/{{ resource_name }}' was not found\" in results.stderr"
# ----------------------------------------------------------------------------
- name: delete a target ssl proxy that does not exist
gcp_compute_target_ssl_proxy:
name: "{{ resource_name }}"
ssl_certificates:
- "{{ sslcert }}"
service: "{{ backendservice }}"
gcp_compute_target_ssl_proxy_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['items'] | length == 0
# ----------------------------------------------------------------------------
- name: delete a target ssl proxy that does not exist
gcp_compute_target_ssl_proxy:
name: "{{ resource_name }}"
ssl_certificates:
- "{{ sslcert }}"
service: "{{ backendservice }}"
project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}"
state: absent
register: result
- name: assert changed is false
@ -203,9 +194,8 @@
# Post-test teardown
- name: delete a ssl certificate
gcp_compute_ssl_certificate:
name: 'sslcert-targetsslproxy'
description: |
"A certificate for testing. Do not use this certificate in production"
name: "sslcert-targetsslproxy"
description: A certificate for testing. Do not use this certificate in production
certificate: |
-----BEGIN CERTIFICATE-----
MIICqjCCAk+gAwIBAgIJAIuJ+0352Kq4MAoGCCqGSM49BAMCMIGwMQswCQYDVQQG
@ -233,28 +223,24 @@
project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}"
scopes:
- https://www.googleapis.com/auth/compute
state: absent
register: sslcert
- name: delete a backend service
gcp_compute_backend_service:
name: 'backendservice-targetsslproxy'
name: "backendservice-targetsslproxy"
backends:
- group: "{{ instancegroup }}"
- group: "{{ instancegroup }}"
health_checks:
- "{{ healthcheck.selfLink }}"
protocol: 'SSL'
- "{{ healthcheck.selfLink }}"
protocol: SSL
project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}"
scopes:
- https://www.googleapis.com/auth/compute
state: absent
register: backendservice
- name: delete a health check
gcp_compute_health_check:
name: 'healthcheck-targetsslproxy'
name: "healthcheck-targetsslproxy"
type: TCP
tcp_health_check:
port_name: service-health
@ -266,18 +252,14 @@
project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}"
scopes:
- https://www.googleapis.com/auth/compute
state: absent
register: healthcheck
- name: delete a instance group
gcp_compute_instance_group:
name: 'instancegroup-targetsslproxy'
zone: 'us-central1-a'
name: "instancegroup-targetsslproxy"
zone: us-central1-a
project: "{{ gcp_project }}"
auth_kind: "{{ gcp_cred_kind }}"
service_account_file: "{{ gcp_cred_file }}"
scopes:
- https://www.googleapis.com/auth/compute
state: absent
register: instancegroup