ansible-collections/google.cloud
1
0
Fork 0
mirror of https://github.com/ansible-collections/google.cloud.git synced 2025-04-07 11:20:28 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #114 from modular-magician/codegen-pr-2826

Browse source 
Update inspec container for new rubocop and terraform versions
This commit is contained in:
Sam Levenick 2019-12-13 13:14:04 -08:00 • committed by GitHub
commit 38c1061328
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/modules/gcp_container_cluster.py
View file

@ -1618,7 +1618,7 @@ class Kubectl(object):
return { return {
'apiVersion': 'v1', 'apiVersion': 'v1',
'clusters': [ 'clusters': [
{'name': context, 'cluster': {'certificate-authority-data': str(self.fetch['masterAuth']['clusterCaCertificate']), 'server': endpoint}} {'name': context, 'cluster': {'certificate-authority-data': str(self.fetch['masterAuth']['clusterCaCertificate']), 'server': endpoint,}}
], ],
'contexts': [{'name': context, 'context': {'cluster': context, 'user': context}}], 'contexts': [{'name': context, 'context': {'cluster': context, 'user': context}}],
'current-context': context, 'current-context': context,

5
plugins/modules/gcp_pubsub_subscription.py
View file

@ -609,7 +609,10 @@ def topic_pattern(name, module):
regex = r"projects/.*/topics/.*" regex = r"projects/.*/topics/.*"
if not re.match(regex, name): if not re.match(regex, name):
formatted_params = {'project': module.params['project'], 'topic': replace_resource_dict(module.params['topic'], 'name')} formatted_params = {
'project': module.params['project'],
'topic': replace_resource_dict(module.params['topic'], 'name'),
}
name = "projects/{project}/topics/{topic}".format(**formatted_params) name = "projects/{project}/topics/{topic}".format(**formatted_params)
return name return name