Bug fixes for GCP modules (as of 2019-01-22T12:43:52-08:00) (#51247)

plugins/modules/gcp_spanner_instance_facts.py

@@ -18,15 +18,14 @@
 # ----------------------------------------------------------------------------
 
 from __future__ import absolute_import, division, print_function
+
 __metaclass__ = type
 
 ################################################################################
 # Documentation
 ################################################################################
 
-ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ["preview"],
-                    'supported_by': 'community'}
+ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported_by': 'community'}
 
 DOCUMENTATION = '''
 ---
@@ -61,13 +60,17 @@ items:
     name:
       description:
       - A unique identifier for the instance, which cannot be changed after the instance
-        is created. Values are of the form projects/<project>/instances/[a-z][-a-z0-9]*[a-z0-9].
-        The final segment of the name must be between 6 and 30 characters in length.
+        is created. The name must be between 6 and 30 characters in length.
       returned: success
       type: str
     config:
       description:
-      - A reference to the instance configuration.
+      - The name of the instance's configuration (similar but not quite the same as
+        a region) which defines defines the geographic placement and replication of
+        your databases in this instance. It determines where your data is stored.
+        Values are typically of the form `regional-europe-west1` , `us-central` etc.
+      - In order to obtain a valid list please consult the [Configuration section
+        of the docs](U(https://cloud.google.com/spanner/docs/instances).)
       returned: success
       type: str
     displayName:
@@ -83,23 +86,6 @@ items:
       type: int
     labels:
       description:
-      - Cloud Labels are a flexible and lightweight mechanism for organizing cloud
-        resources into groups that reflect a customer's organizational needs and deployment
-        strategies. Cloud Labels can be used to filter collections of resources. They
-        can be used to control how resource metrics are aggregated. And they can be
-        used as arguments to policy management rules (e.g. route, firewall, load balancing,
-        etc.).
-      - 'Label keys must be between 1 and 63 characters long and must conform to the
-        following regular expression: `[a-z]([-a-z0-9]*[a-z0-9])?`.'
-      - Label values must be between 0 and 63 characters long and must conform to
-        the regular expression `([a-z]([-a-z0-9]*[a-z0-9])?)?`.
-      - No more than 64 labels can be associated with a given resource.
-      - See U(https://goo.gl/xmQnxf) for more information on and examples of labels.
-      - 'If you plan to use labels in your own code, please note that additional characters
-        may be allowed in the future. And so you are advised to use an internal label
-        representation, such as JSON, which doesn''t rely upon specific characters
-        being disallowed. For example, representing labels as the string: name + "_"
-        + value would prove problematic if we were to allow "_" in a future release.'
       - 'An object containing a list of "key": value pairs.'
       - 'Example: { "name": "wrench", "mass": "1.3kg", "count": "3" }.'
       returned: success
@@ -118,10 +104,7 @@ import json
 
 
 def main():
-    module = GcpModule(
-        argument_spec=dict(
-        )
-    )
+    module = GcpModule(argument_spec=dict())
 
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/spanner.admin']
@@ -131,9 +114,7 @@ def main():
         items = items.get('instances')
     else:
         items = []
-    return_value = {
-        'items': items
-    }
+    return_value = {'items': items}
     module.exit_json(**return_value)