Bug fixes for GCP modules (#56766)

This commit is contained in:
The Magician 2019-05-28 10:41:20 -07:00 committed by ansibot
parent 532de89b44
commit 2220b9c851
6 changed files with 31 additions and 77 deletions

View file

@ -59,7 +59,7 @@ options:
your databases in this instance. It determines where your data is stored. Values your databases in this instance. It determines where your data is stored. Values
are typically of the form `regional-europe-west1` , `us-central` etc. are typically of the form `regional-europe-west1` , `us-central` etc.
- In order to obtain a valid list please consult the [Configuration section of - In order to obtain a valid list please consult the [Configuration section of
the docs](U(https://cloud.google.com/spanner/docs/instances).) the docs](U(https://cloud.google.com/spanner/docs/instances)).
required: true required: true
display_name: display_name:
description: description:
@ -111,7 +111,7 @@ config:
databases in this instance. It determines where your data is stored. Values are databases in this instance. It determines where your data is stored. Values are
typically of the form `regional-europe-west1` , `us-central` etc. typically of the form `regional-europe-west1` , `us-central` etc.
- In order to obtain a valid list please consult the [Configuration section of the - In order to obtain a valid list please consult the [Configuration section of the
docs](U(https://cloud.google.com/spanner/docs/instances).) docs](U(https://cloud.google.com/spanner/docs/instances)).
returned: success returned: success
type: str type: str
displayName: displayName:

View file

@ -71,7 +71,7 @@ resources:
your databases in this instance. It determines where your data is stored. your databases in this instance. It determines where your data is stored.
Values are typically of the form `regional-europe-west1` , `us-central` etc. Values are typically of the form `regional-europe-west1` , `us-central` etc.
- In order to obtain a valid list please consult the [Configuration section - In order to obtain a valid list please consult the [Configuration section
of the docs](U(https://cloud.google.com/spanner/docs/instances).) of the docs](U(https://cloud.google.com/spanner/docs/instances)).
returned: success returned: success
type: str type: str
displayName: displayName:

View file

@ -54,11 +54,8 @@ options:
- "* FIRST_GEN: First Generation instance. MySQL only." - "* FIRST_GEN: First Generation instance. MySQL only."
- "* SECOND_GEN: Second Generation instance or PostgreSQL instance." - "* SECOND_GEN: Second Generation instance or PostgreSQL instance."
- "* EXTERNAL: A database server that is not managed by Google." - "* EXTERNAL: A database server that is not managed by Google."
- 'Some valid choices include: "FIRST_GEN", "SECOND_GEN", "EXTERNAL"'
required: false required: false
choices:
- FIRST_GEN
- SECOND_GEN
- EXTERNAL
connection_name: connection_name:
description: description:
- Connection name of the Cloud SQL instance used in connection strings. - Connection name of the Cloud SQL instance used in connection strings.
@ -70,12 +67,8 @@ options:
MYSQL_5_7. Defaults to MYSQL_5_6. MYSQL_5_7. Defaults to MYSQL_5_6.
- 'PostgreSQL instances: POSTGRES_9_6 The databaseVersion property can not be - 'PostgreSQL instances: POSTGRES_9_6 The databaseVersion property can not be
changed after instance creation.' changed after instance creation.'
- 'Some valid choices include: "MYSQL_5_5", "MYSQL_5_6", "MYSQL_5_7", "POSTGRES_9_6"'
required: false required: false
choices:
- MYSQL_5_5
- MYSQL_5_6
- MYSQL_5_7
- POSTGRES_9_6
failover_replica: failover_replica:
description: description:
- The name and status of the failover replica. This property is applicable only - The name and status of the failover replica. This property is applicable only
@ -94,11 +87,8 @@ options:
- "* CLOUD_SQL_INSTANCE: A Cloud SQL instance that is not replicating from a master." - "* CLOUD_SQL_INSTANCE: A Cloud SQL instance that is not replicating from a master."
- "* ON_PREMISES_INSTANCE: An instance running on the customer's premises." - "* ON_PREMISES_INSTANCE: An instance running on the customer's premises."
- "* READ_REPLICA_INSTANCE: A Cloud SQL instance configured as a read-replica." - "* READ_REPLICA_INSTANCE: A Cloud SQL instance configured as a read-replica."
- 'Some valid choices include: "CLOUD_SQL_INSTANCE", "ON_PREMISES_INSTANCE", "READ_REPLICA_INSTANCE"'
required: false required: false
choices:
- CLOUD_SQL_INSTANCE
- ON_PREMISES_INSTANCE
- READ_REPLICA_INSTANCE
ipv6_address: ipv6_address:
description: description:
- The IPv6 address assigned to the instance. This property is applicable only - The IPv6 address assigned to the instance. This property is applicable only
@ -255,10 +245,8 @@ options:
availability_type: availability_type:
description: description:
- The availabilityType define if your postgres instance is run zonal or regional. - The availabilityType define if your postgres instance is run zonal or regional.
- 'Some valid choices include: "ZONAL", "REGIONAL"'
required: false required: false
choices:
- ZONAL
- REGIONAL
backup_configuration: backup_configuration:
description: description:
- The daily backup configuration for the instance. - The daily backup configuration for the instance.
@ -607,11 +595,11 @@ def main():
module = GcpModule( module = GcpModule(
argument_spec=dict( argument_spec=dict(
state=dict(default='present', choices=['present', 'absent'], type='str'), state=dict(default='present', choices=['present', 'absent'], type='str'),
backend_type=dict(type='str', choices=['FIRST_GEN', 'SECOND_GEN', 'EXTERNAL']), backend_type=dict(type='str'),
connection_name=dict(type='str'), connection_name=dict(type='str'),
database_version=dict(type='str', choices=['MYSQL_5_5', 'MYSQL_5_6', 'MYSQL_5_7', 'POSTGRES_9_6']), database_version=dict(type='str'),
failover_replica=dict(type='dict', options=dict(name=dict(type='str'))), failover_replica=dict(type='dict', options=dict(name=dict(type='str'))),
instance_type=dict(type='str', choices=['CLOUD_SQL_INSTANCE', 'ON_PREMISES_INSTANCE', 'READ_REPLICA_INSTANCE']), instance_type=dict(type='str'),
ipv6_address=dict(type='str'), ipv6_address=dict(type='str'),
master_instance_name=dict(type='str'), master_instance_name=dict(type='str'),
max_disk_size=dict(type='int'), max_disk_size=dict(type='int'),
@ -654,7 +642,7 @@ def main():
), ),
), ),
tier=dict(type='str'), tier=dict(type='str'),
availability_type=dict(type='str', choices=['ZONAL', 'REGIONAL']), availability_type=dict(type='str'),
backup_configuration=dict( backup_configuration=dict(
type='dict', options=dict(enabled=dict(type='bool'), binary_log_enabled=dict(type='bool'), start_time=dict(type='str')) type='dict', options=dict(enabled=dict(type='bool'), binary_log_enabled=dict(type='bool'), start_time=dict(type='str'))
), ),

View file

@ -92,19 +92,13 @@ options:
team: team:
description: description:
- The team. - The team.
- 'Some valid choices include: "editors", "owners", "viewers"'
required: false required: false
choices:
- editors
- owners
- viewers
role: role:
description: description:
- The access permission for the entity. - The access permission for the entity.
- 'Some valid choices include: "OWNER", "READER", "WRITER"'
required: false required: false
choices:
- OWNER
- READER
- WRITER
cors: cors:
description: description:
- The bucket's Cross-Origin Resource Sharing (CORS) configuration. - The bucket's Cross-Origin Resource Sharing (CORS) configuration.
@ -161,10 +155,8 @@ options:
role: role:
description: description:
- The access permission for the entity. - The access permission for the entity.
- 'Some valid choices include: "OWNER", "READER"'
required: true required: true
choices:
- OWNER
- READER
lifecycle: lifecycle:
description: description:
- The bucket's lifecycle configuration. - The bucket's lifecycle configuration.
@ -190,10 +182,8 @@ options:
description: description:
- Type of the action. Currently, only Delete and SetStorageClass are - Type of the action. Currently, only Delete and SetStorageClass are
supported. supported.
- 'Some valid choices include: "Delete", "SetStorageClass"'
required: false required: false
choices:
- Delete
- SetStorageClass
condition: condition:
description: description:
- The condition(s) under which the action will be taken. - The condition(s) under which the action will be taken.
@ -274,14 +264,9 @@ options:
- Values include MULTI_REGIONAL, REGIONAL, STANDARD, NEARLINE, COLDLINE, and DURABLE_REDUCED_AVAILABILITY. - Values include MULTI_REGIONAL, REGIONAL, STANDARD, NEARLINE, COLDLINE, and DURABLE_REDUCED_AVAILABILITY.
If this value is not specified when the bucket is created, it will default to If this value is not specified when the bucket is created, it will default to
STANDARD. For more information, see storage classes. STANDARD. For more information, see storage classes.
- 'Some valid choices include: "MULTI_REGIONAL", "REGIONAL", "STANDARD", "NEARLINE",
"COLDLINE", "DURABLE_REDUCED_AVAILABILITY"'
required: false required: false
choices:
- MULTI_REGIONAL
- REGIONAL
- STANDARD
- NEARLINE
- COLDLINE
- DURABLE_REDUCED_AVAILABILITY
versioning: versioning:
description: description:
- The bucket's versioning configuration. - The bucket's versioning configuration.
@ -329,14 +314,9 @@ options:
- '- "projectPrivate": Object owner gets OWNER access, and project team members - '- "projectPrivate": Object owner gets OWNER access, and project team members
get access according to their roles.' get access according to their roles.'
- '- "publicRead": Object owner gets OWNER access, and allUsers get READER access.' - '- "publicRead": Object owner gets OWNER access, and allUsers get READER access.'
- 'Some valid choices include: "authenticatedRead", "bucketOwnerFullControl",
"bucketOwnerRead", "private", "projectPrivate", "publicRead"'
required: false required: false
choices:
- authenticatedRead
- bucketOwnerFullControl
- bucketOwnerRead
- private
- projectPrivate
- publicRead
extends_documentation_fragment: gcp extends_documentation_fragment: gcp
''' '''
@ -745,10 +725,8 @@ def main():
bucket=dict(required=True, type='dict'), bucket=dict(required=True, type='dict'),
entity=dict(required=True, type='str'), entity=dict(required=True, type='str'),
entity_id=dict(type='str'), entity_id=dict(type='str'),
project_team=dict( project_team=dict(type='dict', options=dict(project_number=dict(type='str'), team=dict(type='str'))),
type='dict', options=dict(project_number=dict(type='str'), team=dict(type='str', choices=['editors', 'owners', 'viewers'])) role=dict(type='str'),
),
role=dict(type='str', choices=['OWNER', 'READER', 'WRITER']),
), ),
), ),
cors=dict( cors=dict(
@ -768,7 +746,7 @@ def main():
bucket=dict(required=True, type='dict'), bucket=dict(required=True, type='dict'),
entity=dict(required=True, type='str'), entity=dict(required=True, type='str'),
object=dict(type='str'), object=dict(type='str'),
role=dict(required=True, type='str', choices=['OWNER', 'READER']), role=dict(required=True, type='str'),
), ),
), ),
lifecycle=dict( lifecycle=dict(
@ -778,9 +756,7 @@ def main():
type='list', type='list',
elements='dict', elements='dict',
options=dict( options=dict(
action=dict( action=dict(type='dict', options=dict(storage_class=dict(type='str'), type=dict(type='str'))),
type='dict', options=dict(storage_class=dict(type='str'), type=dict(type='str', choices=['Delete', 'SetStorageClass']))
),
condition=dict( condition=dict(
type='dict', type='dict',
options=dict( options=dict(
@ -800,13 +776,11 @@ def main():
metageneration=dict(type='int'), metageneration=dict(type='int'),
name=dict(type='str'), name=dict(type='str'),
owner=dict(type='dict', options=dict(entity=dict(type='str'))), owner=dict(type='dict', options=dict(entity=dict(type='str'))),
storage_class=dict(type='str', choices=['MULTI_REGIONAL', 'REGIONAL', 'STANDARD', 'NEARLINE', 'COLDLINE', 'DURABLE_REDUCED_AVAILABILITY']), storage_class=dict(type='str'),
versioning=dict(type='dict', options=dict(enabled=dict(type='bool'))), versioning=dict(type='dict', options=dict(enabled=dict(type='bool'))),
website=dict(type='dict', options=dict(main_page_suffix=dict(type='str'), not_found_page=dict(type='str'))), website=dict(type='dict', options=dict(main_page_suffix=dict(type='str'), not_found_page=dict(type='str'))),
project=dict(type='str'), project=dict(type='str'),
predefined_default_object_acl=dict( predefined_default_object_acl=dict(type='str'),
type='str', choices=['authenticatedRead', 'bucketOwnerFullControl', 'bucketOwnerRead', 'private', 'projectPrivate', 'publicRead']
),
) )
) )

View file

@ -90,19 +90,13 @@ options:
team: team:
description: description:
- The team. - The team.
- 'Some valid choices include: "editors", "owners", "viewers"'
required: false required: false
choices:
- editors
- owners
- viewers
role: role:
description: description:
- The access permission for the entity. - The access permission for the entity.
- 'Some valid choices include: "OWNER", "READER", "WRITER"'
required: false required: false
choices:
- OWNER
- READER
- WRITER
extends_documentation_fragment: gcp extends_documentation_fragment: gcp
''' '''
@ -207,8 +201,8 @@ def main():
bucket=dict(required=True, type='dict'), bucket=dict(required=True, type='dict'),
entity=dict(required=True, type='str'), entity=dict(required=True, type='str'),
entity_id=dict(type='str'), entity_id=dict(type='str'),
project_team=dict(type='dict', options=dict(project_number=dict(type='str'), team=dict(type='str', choices=['editors', 'owners', 'viewers']))), project_team=dict(type='dict', options=dict(project_number=dict(type='str'), team=dict(type='str'))),
role=dict(type='str', choices=['OWNER', 'READER', 'WRITER']), role=dict(type='str'),
) )
) )

View file

@ -50,10 +50,8 @@ options:
action: action:
description: description:
- Upload or download from the bucket. - Upload or download from the bucket.
- 'Some valid choices include: "download", "upload"'
required: false required: false
choices:
- download
- upload
overwrite: overwrite:
description: description:
- "'Overwrite the file on the bucket/local machine. If overwrite is false and - "'Overwrite the file on the bucket/local machine. If overwrite is false and
@ -140,7 +138,7 @@ def main():
module = GcpModule( module = GcpModule(
argument_spec=dict( argument_spec=dict(
state=dict(default='present', choices=['present', 'absent'], type='str'), state=dict(default='present', choices=['present', 'absent'], type='str'),
action=dict(type='str', choices=['download', 'upload']), action=dict(type='str'),
overwrite=dict(type='bool'), overwrite=dict(type='bool'),
src=dict(type='path'), src=dict(type='path'),
dest=dict(type='path'), dest=dict(type='path'),