mirror of
https://github.com/ansible-collections/google.cloud.git
synced 2025-07-25 14:20:29 -07:00
GCP MagicModules bug fixes (#47285)
Closes: #46930 #46929 #46928 #46927 #46926 #46925 #46924 #46923 #46922 #46921 #46920 #46919 #46918 #46917 #46916 #46915 #46914 #46913 #46912 #46911 #46910 #46909 #46908 #46907 #46906 #46905 #46903 #46902 #46901 #46900 #46899 #46898 #46897 #46896 #46895 #46894 #46893 #46892 #46891 #46890 #46889 #46888 #46887 #46886 #46885 #46884 #46883 #46882 #46881 #46880 #46879 #46878 #46877 #46876 #46875 #46874 #46873 #46872 #46871 #46870 #46869 #46868 #46867 #46866 #46865 #46864 #46863 #46862 #46861 #46860 #46859 #46858 #46857 #46856 #46855 #46854 #46853 #46852
This commit is contained in:
Ryan Brown
Alex Stephen
parent
84f0e2c5b2
commit
5c97cc1da0
78 changed files with 2531 additions and 1137 deletions
|
|
@ -32,8 +32,9 @@ DOCUMENTATION = '''
|
|||
---
|
||||
module: gcp_compute_ssl_certificate
|
||||
description:
|
||||
- An SslCertificate resource. This resource provides a mechanism to upload an SSL
|
||||
key and certificate to the load balancer to serve secure connections from the user.
|
||||
- An SslCertificate resource, used for HTTPS load balancing. This resource provides
|
||||
a mechanism to upload an SSL key and certificate to the load balancer to serve secure
|
||||
connections from the user.
|
||||
short_description: Creates a GCP SslCertificate
|
||||
version_added: 2.6
|
||||
author: Google Inc. (@googlecloudplatform)
|
||||
|
|
@ -52,7 +53,7 @@ options:
|
|||
- The certificate in PEM format.
|
||||
- The certificate chain must be no greater than 5 certs long.
|
||||
- The chain must include at least one intermediate cert.
|
||||
required: false
|
||||
required: true
|
||||
description:
|
||||
description:
|
||||
- An optional description of this resource.
|
||||
|
|
@ -68,9 +69,12 @@ options:
|
|||
required: false
|
||||
private_key:
|
||||
description:
|
||||
- The private key in PEM format.
|
||||
required: false
|
||||
- The write-only private key in PEM format.
|
||||
required: true
|
||||
extends_documentation_fragment: gcp
|
||||
notes:
|
||||
- "API Reference: U(https://cloud.google.com/compute/docs/reference/rest/v1/sslCertificates)"
|
||||
- "Official Documentation: U(https://cloud.google.com/load-balancing/docs/ssl-certificates)"
|
||||
'''
|
||||
|
||||
EXAMPLES = '''
|
||||
|
|
@ -103,7 +107,7 @@ EXAMPLES = '''
|
|||
OGN02HtkpBOZzzvUARTR10JQoSe2/5PIwQ==
|
||||
-----END EC PRIVATE KEY-----
|
||||
project: "test_project"
|
||||
auth_kind: "service_account"
|
||||
auth_kind: "serviceaccount"
|
||||
service_account_file: "/tmp/auth.pem"
|
||||
state: present
|
||||
'''
|
||||
|
|
@ -116,7 +120,7 @@ RETURN = '''
|
|||
- The chain must include at least one intermediate cert.
|
||||
returned: success
|
||||
type: str
|
||||
creation_timestamp:
|
||||
creationTimestamp:
|
||||
description:
|
||||
- Creation timestamp in RFC3339 text format.
|
||||
returned: success
|
||||
|
|
@ -141,9 +145,9 @@ RETURN = '''
|
|||
be a dash.
|
||||
returned: success
|
||||
type: str
|
||||
private_key:
|
||||
privateKey:
|
||||
description:
|
||||
- The private key in PEM format.
|
||||
- The write-only private key in PEM format.
|
||||
returned: success
|
||||
type: str
|
||||
'''
|
||||
|
|
@ -167,10 +171,10 @@ def main():
|
|||
module = GcpModule(
|
||||
argument_spec=dict(
|
||||
state=dict(default='present', choices=['present', 'absent'], type='str'),
|
||||
certificate=dict(type='str'),
|
||||
certificate=dict(required=True, type='str'),
|
||||
description=dict(type='str'),
|
||||
name=dict(type='str'),
|
||||
private_key=dict(type='str')
|
||||
private_key=dict(required=True, type='str')
|
||||
)
|
||||
)
|
||||
|
||||
|
|
@ -186,7 +190,8 @@ def main():
|
|||
if fetch:
|
||||
if state == 'present':
|
||||
if is_different(module, fetch):
|
||||
fetch = update(module, self_link(module), kind)
|
||||
update(module, self_link(module), kind)
|
||||
fetch = fetch_resource(module, self_link(module), kind)
|
||||
changed = True
|
||||
else:
|
||||
delete(module, self_link(module), kind)
|
||||
|
|
@ -210,8 +215,7 @@ def create(module, link, kind):
|
|||
|
||||
|
||||
def update(module, link, kind):
|
||||
auth = GcpSession(module, 'compute')
|
||||
return wait_for_operation(module, auth.put(link, resource_to_request(module)))
|
||||
module.fail_json(msg="SslCertificate cannot be edited")
|
||||
|
||||
|
||||
def delete(module, link, kind):
|
||||
|
|
@ -235,9 +239,9 @@ def resource_to_request(module):
|
|||
return return_vals
|
||||
|
||||
|
||||
def fetch_resource(module, link, kind):
|
||||
def fetch_resource(module, link, kind, allow_not_found=True):
|
||||
auth = GcpSession(module, 'compute')
|
||||
return return_if_object(module, auth.get(link), kind)
|
||||
return return_if_object(module, auth.get(link), kind, allow_not_found)
|
||||
|
||||
|
||||
def self_link(module):
|
||||
|
|
@ -248,9 +252,9 @@ def collection(module):
|
|||
return "https://www.googleapis.com/compute/v1/projects/{project}/global/sslCertificates".format(**module.params)
|
||||
|
||||
|
||||
def return_if_object(module, response, kind):
|
||||
def return_if_object(module, response, kind, allow_not_found=False):
|
||||
# If not found, return nothing.
|
||||
if response.status_code == 404:
|
||||
if allow_not_found and response.status_code == 404:
|
||||
return None
|
||||
|
||||
# If no content, return nothing.
|
||||
|
|
@ -265,8 +269,6 @@ def return_if_object(module, response, kind):
|
|||
|
||||
if navigate_hash(result, ['error', 'errors']):
|
||||
module.fail_json(msg=navigate_hash(result, ['error', 'errors']))
|
||||
if result['kind'] != kind:
|
||||
module.fail_json(msg="Incorrect result: {kind}".format(**result))
|
||||
|
||||
return result
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue