From 30ad73f1c189c6c978cdc79c97aa7d97704dfd20 Mon Sep 17 00:00:00 2001 From: The Magician Date: Fri, 9 Aug 2019 16:17:44 -0700 Subject: [PATCH] Bug fixes for GCP modules (#60339) --- .../cloud/google/gcp_compute_target_ssl_proxy.py | 4 ++-- .../cloud/google/gcp_compute_target_tcp_proxy.py | 2 +- .../google/gcp_compute_target_vpn_gateway_info.py | 2 +- .../modules/cloud/google/gcp_compute_url_map.py | 4 ++-- .../cloud/google/gcp_compute_url_map_info.py | 2 +- .../cloud/google/gcp_compute_vpn_tunnel_info.py | 2 +- .../gcp_compute_target_ssl_proxy/tasks/main.yml | 14 +++++++------- .../gcp_compute_target_tcp_proxy/tasks/main.yml | 10 +++++----- .../targets/gcp_compute_url_map/tasks/main.yml | 14 +++++++------- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/lib/ansible/modules/cloud/google/gcp_compute_target_ssl_proxy.py b/lib/ansible/modules/cloud/google/gcp_compute_target_ssl_proxy.py index 6f58d4135ec..ce0367ca49b 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_target_ssl_proxy.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_target_ssl_proxy.py @@ -149,7 +149,7 @@ EXAMPLES = ''' state: present register: backendservice -- name: create a ssl certificate +- name: create a SSL certificate gcp_compute_ssl_certificate: name: sslcert-targetsslproxy description: A certificate for testing. Do not use this certificate in production @@ -183,7 +183,7 @@ EXAMPLES = ''' state: present register: sslcert -- name: create a target ssl proxy +- name: create a target SSL proxy gcp_compute_target_ssl_proxy: name: test_object ssl_certificates: diff --git a/lib/ansible/modules/cloud/google/gcp_compute_target_tcp_proxy.py b/lib/ansible/modules/cloud/google/gcp_compute_target_tcp_proxy.py index b7ced27643b..2ed892406b7 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_target_tcp_proxy.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_target_tcp_proxy.py @@ -129,7 +129,7 @@ EXAMPLES = ''' state: present register: backendservice -- name: create a target tcp proxy +- name: create a target TCP proxy gcp_compute_target_tcp_proxy: name: test_object proxy_header: PROXY_V1 diff --git a/lib/ansible/modules/cloud/google/gcp_compute_target_vpn_gateway_info.py b/lib/ansible/modules/cloud/google/gcp_compute_target_vpn_gateway_info.py index b14bb3fcd9c..797f0f44f4b 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_target_vpn_gateway_info.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_target_vpn_gateway_info.py @@ -57,7 +57,7 @@ extends_documentation_fragment: gcp ''' EXAMPLES = ''' -- name: get info on a target VPN gateway +- name: get info on a target vpn gateway gcp_compute_target_vpn_gateway_info: region: us-west1 filters: diff --git a/lib/ansible/modules/cloud/google/gcp_compute_url_map.py b/lib/ansible/modules/cloud/google/gcp_compute_url_map.py index f747e6ec708..5b4895f0673 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_url_map.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_url_map.py @@ -198,7 +198,7 @@ EXAMPLES = ''' state: present register: instancegroup -- name: create a http health check +- name: create a HTTP health check gcp_compute_http_health_check: name: httphealthcheck-urlmap healthy_threshold: 10 @@ -225,7 +225,7 @@ EXAMPLES = ''' state: present register: backendservice -- name: create a url map +- name: create a URL map gcp_compute_url_map: name: test_object default_service: "{{ backendservice }}" diff --git a/lib/ansible/modules/cloud/google/gcp_compute_url_map_info.py b/lib/ansible/modules/cloud/google/gcp_compute_url_map_info.py index 3d06b6b60a0..5ab2e6d6e23 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_url_map_info.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_url_map_info.py @@ -52,7 +52,7 @@ extends_documentation_fragment: gcp ''' EXAMPLES = ''' -- name: get info on a URL map +- name: get info on an URL map gcp_compute_url_map_info: filters: - name = test_object diff --git a/lib/ansible/modules/cloud/google/gcp_compute_vpn_tunnel_info.py b/lib/ansible/modules/cloud/google/gcp_compute_vpn_tunnel_info.py index 2d9d0b5cff9..6ae88cdfaaf 100644 --- a/lib/ansible/modules/cloud/google/gcp_compute_vpn_tunnel_info.py +++ b/lib/ansible/modules/cloud/google/gcp_compute_vpn_tunnel_info.py @@ -57,7 +57,7 @@ extends_documentation_fragment: gcp ''' EXAMPLES = ''' -- name: get info on a VPN tunnel +- name: get info on a vpn tunnel gcp_compute_vpn_tunnel_info: region: us-west1 filters: diff --git a/test/integration/targets/gcp_compute_target_ssl_proxy/tasks/main.yml b/test/integration/targets/gcp_compute_target_ssl_proxy/tasks/main.yml index f1f31f32628..f9da704f7e1 100644 --- a/test/integration/targets/gcp_compute_target_ssl_proxy/tasks/main.yml +++ b/test/integration/targets/gcp_compute_target_ssl_proxy/tasks/main.yml @@ -51,7 +51,7 @@ service_account_file: "{{ gcp_cred_file }}" state: present register: backendservice -- name: create a ssl certificate +- name: create a SSL certificate gcp_compute_ssl_certificate: name: sslcert-targetsslproxy description: A certificate for testing. Do not use this certificate in production @@ -84,7 +84,7 @@ service_account_file: "{{ gcp_cred_file }}" state: present register: sslcert -- name: delete a target ssl proxy +- name: delete a target SSL proxy gcp_compute_target_ssl_proxy: name: "{{ resource_name }}" ssl_certificates: @@ -95,7 +95,7 @@ service_account_file: "{{ gcp_cred_file }}" state: absent #---------------------------------------------------------- -- name: create a target ssl proxy +- name: create a target SSL proxy gcp_compute_target_ssl_proxy: name: "{{ resource_name }}" ssl_certificates: @@ -125,7 +125,7 @@ that: - results['resources'] | length == 1 # ---------------------------------------------------------------------------- -- name: create a target ssl proxy that already exists +- name: create a target SSL proxy that already exists gcp_compute_target_ssl_proxy: name: "{{ resource_name }}" ssl_certificates: @@ -141,7 +141,7 @@ that: - result.changed == false #---------------------------------------------------------- -- name: delete a target ssl proxy +- name: delete a target SSL proxy gcp_compute_target_ssl_proxy: name: "{{ resource_name }}" ssl_certificates: @@ -171,7 +171,7 @@ that: - results['resources'] | length == 0 # ---------------------------------------------------------------------------- -- name: delete a target ssl proxy that does not exist +- name: delete a target SSL proxy that does not exist gcp_compute_target_ssl_proxy: name: "{{ resource_name }}" ssl_certificates: @@ -189,7 +189,7 @@ #--------------------------------------------------------- # Post-test teardown # If errors happen, don't crash the playbook! -- name: delete a ssl certificate +- name: delete a SSL certificate gcp_compute_ssl_certificate: name: sslcert-targetsslproxy description: A certificate for testing. Do not use this certificate in production diff --git a/test/integration/targets/gcp_compute_target_tcp_proxy/tasks/main.yml b/test/integration/targets/gcp_compute_target_tcp_proxy/tasks/main.yml index 8f246756998..8385d591b73 100644 --- a/test/integration/targets/gcp_compute_target_tcp_proxy/tasks/main.yml +++ b/test/integration/targets/gcp_compute_target_tcp_proxy/tasks/main.yml @@ -51,7 +51,7 @@ service_account_file: "{{ gcp_cred_file }}" state: present register: backendservice -- name: delete a target tcp proxy +- name: delete a target TCP proxy gcp_compute_target_tcp_proxy: name: "{{ resource_name }}" proxy_header: PROXY_V1 @@ -61,7 +61,7 @@ service_account_file: "{{ gcp_cred_file }}" state: absent #---------------------------------------------------------- -- name: create a target tcp proxy +- name: create a target TCP proxy gcp_compute_target_tcp_proxy: name: "{{ resource_name }}" proxy_header: PROXY_V1 @@ -90,7 +90,7 @@ that: - results['resources'] | length == 1 # ---------------------------------------------------------------------------- -- name: create a target tcp proxy that already exists +- name: create a target TCP proxy that already exists gcp_compute_target_tcp_proxy: name: "{{ resource_name }}" proxy_header: PROXY_V1 @@ -105,7 +105,7 @@ that: - result.changed == false #---------------------------------------------------------- -- name: delete a target tcp proxy +- name: delete a target TCP proxy gcp_compute_target_tcp_proxy: name: "{{ resource_name }}" proxy_header: PROXY_V1 @@ -134,7 +134,7 @@ that: - results['resources'] | length == 0 # ---------------------------------------------------------------------------- -- name: delete a target tcp proxy that does not exist +- name: delete a target TCP proxy that does not exist gcp_compute_target_tcp_proxy: name: "{{ resource_name }}" proxy_header: PROXY_V1 diff --git a/test/integration/targets/gcp_compute_url_map/tasks/main.yml b/test/integration/targets/gcp_compute_url_map/tasks/main.yml index 1aec572f699..b05a23a18b4 100644 --- a/test/integration/targets/gcp_compute_url_map/tasks/main.yml +++ b/test/integration/targets/gcp_compute_url_map/tasks/main.yml @@ -22,7 +22,7 @@ service_account_file: "{{ gcp_cred_file }}" state: present register: instancegroup -- name: create a http health check +- name: create a HTTP health check gcp_compute_http_health_check: name: httphealthcheck-urlmap healthy_threshold: 10 @@ -47,7 +47,7 @@ service_account_file: "{{ gcp_cred_file }}" state: present register: backendservice -- name: delete a url map +- name: delete a URL map gcp_compute_url_map: name: "{{ resource_name }}" default_service: "{{ backendservice }}" @@ -56,7 +56,7 @@ service_account_file: "{{ gcp_cred_file }}" state: absent #---------------------------------------------------------- -- name: create a url map +- name: create a URL map gcp_compute_url_map: name: "{{ resource_name }}" default_service: "{{ backendservice }}" @@ -84,7 +84,7 @@ that: - results['resources'] | length == 1 # ---------------------------------------------------------------------------- -- name: create a url map that already exists +- name: create a URL map that already exists gcp_compute_url_map: name: "{{ resource_name }}" default_service: "{{ backendservice }}" @@ -98,7 +98,7 @@ that: - result.changed == false #---------------------------------------------------------- -- name: delete a url map +- name: delete a URL map gcp_compute_url_map: name: "{{ resource_name }}" default_service: "{{ backendservice }}" @@ -126,7 +126,7 @@ that: - results['resources'] | length == 0 # ---------------------------------------------------------------------------- -- name: delete a url map that does not exist +- name: delete a URL map that does not exist gcp_compute_url_map: name: "{{ resource_name }}" default_service: "{{ backendservice }}" @@ -156,7 +156,7 @@ state: absent register: backendservice ignore_errors: true -- name: delete a http health check +- name: delete a HTTP health check gcp_compute_http_health_check: name: httphealthcheck-urlmap healthy_threshold: 10