Bug fixes for GCP modules (#60920)

lib/ansible/modules/cloud/google/gcp_mlengine_version.py

@@ -202,12 +202,6 @@ description:
   - The description specified for the version when it was created.
   returned: success
   type: str
-isDefault:
-  description:
-  - If true, this version will be used to handle prediction requests that do not specify
-    a version.
-  returned: success
-  type: bool
 deploymentUri:
   description:
   - The Cloud Storage location of the trained model used to create the version.
@@ -314,6 +308,12 @@ model:
   - The model that this version belongs to.
   returned: success
   type: dict
+isDefault:
+  description:
+  - If true, this version will be used to handle prediction requests that do not specify
+    a version.
+  returned: success
+  type: bool
 '''
 
 ################################################################################
@@ -486,7 +486,6 @@ def response_to_hash(module, response):
     return {
         u'name': response.get(u'name'),
         u'description': response.get(u'description'),
-        u'isDefault': response.get(u'isDefault'),
         u'deploymentUri': response.get(u'deploymentUri'),
         u'createTime': response.get(u'createTime'),
         u'lastUseTime': response.get(u'lastUseTime'),

lib/ansible/modules/cloud/google/gcp_mlengine_version_info.py

@@ -79,12 +79,6 @@ resources:
       - The description specified for the version when it was created.
       returned: success
       type: str
-    isDefault:
-      description:
-      - If true, this version will be used to handle prediction requests that do not
-        specify a version.
-      returned: success
-      type: bool
     deploymentUri:
       description:
       - The Cloud Storage location of the trained model used to create the version.
@@ -192,6 +186,12 @@ resources:
       - The model that this version belongs to.
       returned: success
       type: dict
+    isDefault:
+      description:
+      - If true, this version will be used to handle prediction requests that do not
+        specify a version.
+      returned: success
+      type: bool
 '''
 
 ################################################################################

lib/ansible/modules/cloud/google/gcp_sql_database.py

@@ -50,12 +50,18 @@ options:
     type: str
   charset:
     description:
-    - The MySQL charset value.
+    - The charset value. See MySQL's [Supported Character Sets and Collations](U(https://dev.mysql.com/doc/refman/5.7/en/charset-charsets.html))
+      and Postgres' [Character Set Support](U(https://www.postgresql.org/docs/9.6/static/multibyte.html))
+      for more details and supported values. Postgres databases only support a value
+      of `UTF8` at creation time.
     required: false
     type: str
   collation:
     description:
-    - The MySQL collation value.
+    - The collation value. See MySQL's [Supported Character Sets and Collations](U(https://dev.mysql.com/doc/refman/5.7/en/charset-charsets.html))
+      and Postgres' [Collation Support](U(https://www.postgresql.org/docs/9.6/static/collation.html))
+      for more details and supported values. Postgres databases only support a value
+      of `en_US.UTF8` at creation time.
     required: false
     type: str
   name:
@@ -103,12 +109,18 @@ EXAMPLES = '''
 RETURN = '''
 charset:
   description:
-  - The MySQL charset value.
+  - The charset value. See MySQL's [Supported Character Sets and Collations](U(https://dev.mysql.com/doc/refman/5.7/en/charset-charsets.html))
+    and Postgres' [Character Set Support](U(https://www.postgresql.org/docs/9.6/static/multibyte.html))
+    for more details and supported values. Postgres databases only support a value
+    of `UTF8` at creation time.
   returned: success
   type: str
 collation:
   description:
-  - The MySQL collation value.
+  - The collation value. See MySQL's [Supported Character Sets and Collations](U(https://dev.mysql.com/doc/refman/5.7/en/charset-charsets.html))
+    and Postgres' [Collation Support](U(https://www.postgresql.org/docs/9.6/static/collation.html))
+    for more details and supported values. Postgres databases only support a value
+    of `en_US.UTF8` at creation time.
   returned: success
   type: str
 name:

lib/ansible/modules/cloud/google/gcp_sql_database_info.py

@@ -67,12 +67,18 @@ resources:
   contains:
     charset:
       description:
-      - The MySQL charset value.
+      - The charset value. See MySQL's [Supported Character Sets and Collations](U(https://dev.mysql.com/doc/refman/5.7/en/charset-charsets.html))
+        and Postgres' [Character Set Support](U(https://www.postgresql.org/docs/9.6/static/multibyte.html))
+        for more details and supported values. Postgres databases only support a value
+        of `UTF8` at creation time.
       returned: success
       type: str
     collation:
       description:
-      - The MySQL collation value.
+      - The collation value. See MySQL's [Supported Character Sets and Collations](U(https://dev.mysql.com/doc/refman/5.7/en/charset-charsets.html))
+        and Postgres' [Collation Support](U(https://www.postgresql.org/docs/9.6/static/collation.html))
+        for more details and supported values. Postgres databases only support a value
+        of `en_US.UTF8` at creation time.
       returned: success
       type: str
     name: