cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Bug fixes for GCP modules (#60092)

Browse source
This commit is contained in:
The Magician 2019-08-05 15:25:49 -07:00 committed by ansibot
parent de8d428157
commit 0234937ca3
20 changed files with 5 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/ansible/modules/cloud/google/gcp_pubsub_subscription_facts.py
View file

@ -49,7 +49,6 @@ EXAMPLES = '''
project: test_project
auth_kind: serviceaccount
service_account_file: "/tmp/auth.pem"
state: facts
'''
RETURN = '''

1
lib/ansible/modules/cloud/google/gcp_pubsub_topic_facts.py
View file

@ -49,7 +49,6 @@ EXAMPLES = '''
project: test_project
auth_kind: serviceaccount
service_account_file: "/tmp/auth.pem"
state: facts
'''
RETURN = '''

1
lib/ansible/modules/cloud/google/gcp_redis_instance_facts.py
View file

@ -55,7 +55,6 @@ EXAMPLES = '''
project: test_project
auth_kind: serviceaccount
service_account_file: "/tmp/auth.pem"
state: facts
'''
RETURN = '''

1
lib/ansible/modules/cloud/google/gcp_resourcemanager_project_facts.py
View file

@ -49,7 +49,6 @@ EXAMPLES = '''
project: test_project
auth_kind: serviceaccount
service_account_file: "/tmp/auth.pem"
state: facts
'''
RETURN = '''

1
lib/ansible/modules/cloud/google/gcp_sourcerepo_repository_facts.py
View file

@ -49,7 +49,6 @@ EXAMPLES = '''
project: test_project
auth_kind: serviceaccount
service_account_file: "/tmp/auth.pem"
state: facts
'''
RETURN = '''

3
lib/ansible/modules/cloud/google/gcp_spanner_database.py
View file

@ -186,8 +186,7 @@ def create(module, link):
def update(module, link):
delete(module, self_link(module))
create(module, collection(module))
module.fail_json(msg="Spanner objects can't be updated to ensure data safety")
def delete(module, link):

1
lib/ansible/modules/cloud/google/gcp_spanner_database_facts.py
View file

@ -60,7 +60,6 @@ EXAMPLES = '''
project: test_project
auth_kind: serviceaccount
service_account_file: "/tmp/auth.pem"
state: facts
'''
RETURN = '''

3
lib/ansible/modules/cloud/google/gcp_spanner_instance.py
View file

@ -202,8 +202,7 @@ def create(module, link):
def update(module, link):
auth = GcpSession(module, 'spanner')
return wait_for_operation(module, auth.patch(link, resource_to_update(module)))
module.fail_json(msg="Spanner objects can't be updated to ensure data safety")
def delete(module, link):

1
lib/ansible/modules/cloud/google/gcp_spanner_instance_facts.py
View file

@ -49,7 +49,6 @@ EXAMPLES = '''
project: test_project
auth_kind: serviceaccount
service_account_file: "/tmp/auth.pem"
state: facts
'''
RETURN = '''

3
lib/ansible/modules/cloud/google/gcp_sql_database.py
View file

@ -187,8 +187,7 @@ def create(module, link, kind):
def update(module, link, kind):
auth = GcpSession(module, 'sql')
return wait_for_operation(module, auth.put(link, resource_to_request(module)))
module.fail_json(msg="SQL objects can't be updated to ensure data safety")
def delete(module, link, kind):

1
lib/ansible/modules/cloud/google/gcp_sql_database_facts.py
View file

@ -55,7 +55,6 @@ EXAMPLES = '''
project: test_project
auth_kind: serviceaccount
service_account_file: "/tmp/auth.pem"
state: facts
'''
RETURN = '''

3
lib/ansible/modules/cloud/google/gcp_sql_instance.py
View file

@ -763,8 +763,7 @@ def create(module, link, kind):
def update(module, link, kind, fetch):
auth = GcpSession(module, 'sql')
return wait_for_operation(module, auth.put(link, resource_to_request(module)))
module.fail_json(msg="SQL objects can't be updated to ensure data safety")
def delete(module, link, kind, fetch):

1
lib/ansible/modules/cloud/google/gcp_sql_instance_facts.py
View file

@ -49,7 +49,6 @@ EXAMPLES = '''
project: test_project
auth_kind: serviceaccount
service_account_file: "/tmp/auth.pem"
state: facts
'''
RETURN = '''

2
lib/ansible/modules/cloud/google/gcp_sql_user.py
View file

@ -215,7 +215,7 @@ def resource_to_request(module):
def unwrap_resource_filter(module):
return {'host': module.params['host'], 'name': module.params['name']}
return {'name': module.params['name'], 'host': module.params['host']}
def unwrap_resource(result, module):

1
lib/ansible/modules/cloud/google/gcp_sql_user_facts.py
View file

@ -60,7 +60,6 @@ EXAMPLES = '''
project: test_project
auth_kind: serviceaccount
service_account_file: "/tmp/auth.pem"
state: facts
'''
RETURN = '''

2
test/integration/targets/gcp_sql_database/tasks/main.yml
View file

@ -52,7 +52,6 @@
assert:
that:
- result.changed == true
- "result.kind == 'sql#database'"
- name: verify that database was created
gcp_sql_database_facts:
instance: "{{ instance }}"
@ -81,7 +80,6 @@
assert:
that:
- result.changed == false
- "result.kind == 'sql#database'"
#----------------------------------------------------------
- name: delete a database
gcp_sql_database:

2
test/integration/targets/gcp_sql_instance/tasks/main.yml
View file

@ -47,7 +47,6 @@
assert:
that:
- result.changed == true
- "result.kind == 'sql#instance'"
- name: verify that instance was created
gcp_sql_instance_facts:
project: "{{ gcp_project }}"
@ -80,7 +79,6 @@
assert:
that:
- result.changed == false
- "result.kind == 'sql#instance'"
#----------------------------------------------------------
- name: delete a instance
gcp_sql_instance:

2
test/integration/targets/gcp_sql_user/tasks/main.yml
View file

@ -54,7 +54,6 @@
assert:
that:
- result.changed == true
- "result.kind == 'sql#user'"
- name: verify that user was created
gcp_sql_user_facts:
instance: "{{ instance }}"
@ -84,7 +83,6 @@
assert:
that:
- result.changed == false
- "result.kind == 'sql#user'"
#----------------------------------------------------------
- name: delete a user
gcp_sql_user:

2
test/integration/targets/gcp_storage_bucket/tasks/main.yml
View file

@ -33,7 +33,6 @@
assert:
that:
- result.changed == true
- "result.kind == 'storage#bucket'"
# ----------------------------------------------------------------------------
- name: create a bucket that already exists
gcp_storage_bucket:
@ -47,7 +46,6 @@
assert:
that:
- result.changed == false
- "result.kind == 'storage#bucket'"
#----------------------------------------------------------
- name: delete a bucket
gcp_storage_bucket:

2
test/integration/targets/gcp_storage_bucket_access_control/tasks/main.yml
View file

@ -45,7 +45,6 @@
assert:
that:
- result.changed == true
- "result.kind == 'storage#bucketAccessControl'"
# ----------------------------------------------------------------------------
- name: create a bucket access control that already exists
gcp_storage_bucket_access_control:
@ -61,7 +60,6 @@
assert:
that:
- result.changed == false
- "result.kind == 'storage#bucketAccessControl'"
#----------------------------------------------------------
- name: delete a bucket access control
gcp_storage_bucket_access_control: