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

Bug fixes for GCP modules (#63941)

Browse source
This commit is contained in:
The Magician 2019-10-25 10:40:41 -07:00 committed by ansibot
parent 88af9f6470
commit 1d5413a6ce
2 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/ansible/modules/cloud/google/gcp_pubsub_subscription.py
View file

@ -175,7 +175,8 @@ options:
- A subscription is considered active as long as any connected subscriber is successfully - A subscription is considered active as long as any connected subscriber is successfully
consuming messages from the subscription or is issuing operations on the subscription. consuming messages from the subscription or is issuing operations on the subscription.
If expirationPolicy is not set, a default policy with ttl of 31 days will be If expirationPolicy is not set, a default policy with ttl of 31 days will be
used. The minimum allowed value for expirationPolicy.ttl is 1 day. used. If it is set but left empty, the resource never expires. The minimum allowed
value for expirationPolicy.ttl is 1 day.
required: false required: false
type: dict type: dict
version_added: '2.9' version_added: '2.9'
@ -183,10 +184,8 @@ options:
ttl: ttl:
description: description:
- Specifies the "time-to-live" duration for an associated resource. The resource - Specifies the "time-to-live" duration for an associated resource. The resource
expires if it is not active for a period of ttl. The definition of "activity" expires if it is not active for a period of ttl.
depends on the type of the associated resource. The minimum and maximum - If ttl is not set, the associated resource never expires.
allowed values for ttl depend on the type of the associated resource, as
well. If ttl is not set, the associated resource never expires.
- A duration in seconds with up to nine fractional digits, terminated by 's'. - A duration in seconds with up to nine fractional digits, terminated by 's'.
- Example - "3.5s". - Example - "3.5s".
required: false required: false
@ -380,17 +379,16 @@ expirationPolicy:
- A subscription is considered active as long as any connected subscriber is successfully - A subscription is considered active as long as any connected subscriber is successfully
consuming messages from the subscription or is issuing operations on the subscription. consuming messages from the subscription or is issuing operations on the subscription.
If expirationPolicy is not set, a default policy with ttl of 31 days will be used. If expirationPolicy is not set, a default policy with ttl of 31 days will be used.
The minimum allowed value for expirationPolicy.ttl is 1 day. If it is set but left empty, the resource never expires. The minimum allowed value
for expirationPolicy.ttl is 1 day.
returned: success returned: success
type: complex type: complex
contains: contains:
ttl: ttl:
description: description:
- Specifies the "time-to-live" duration for an associated resource. The resource - Specifies the "time-to-live" duration for an associated resource. The resource
expires if it is not active for a period of ttl. The definition of "activity" expires if it is not active for a period of ttl.
depends on the type of the associated resource. The minimum and maximum allowed - If ttl is not set, the associated resource never expires.
values for ttl depend on the type of the associated resource, as well. If
ttl is not set, the associated resource never expires.
- A duration in seconds with up to nine fractional digits, terminated by 's'. - A duration in seconds with up to nine fractional digits, terminated by 's'.
- Example - "3.5s". - Example - "3.5s".
returned: success returned: success

10
lib/ansible/modules/cloud/google/gcp_pubsub_subscription_info.py
View file

@ -221,18 +221,16 @@ resources:
- A subscription is considered active as long as any connected subscriber is - A subscription is considered active as long as any connected subscriber is
successfully consuming messages from the subscription or is issuing operations successfully consuming messages from the subscription or is issuing operations
on the subscription. If expirationPolicy is not set, a default policy with on the subscription. If expirationPolicy is not set, a default policy with
ttl of 31 days will be used. The minimum allowed value for expirationPolicy.ttl ttl of 31 days will be used. If it is set but left empty, the resource never
is 1 day. expires. The minimum allowed value for expirationPolicy.ttl is 1 day.
returned: success returned: success
type: complex type: complex
contains: contains:
ttl: ttl:
description: description:
- Specifies the "time-to-live" duration for an associated resource. The - Specifies the "time-to-live" duration for an associated resource. The
resource expires if it is not active for a period of ttl. The definition resource expires if it is not active for a period of ttl.
of "activity" depends on the type of the associated resource. The minimum - If ttl is not set, the associated resource never expires.
and maximum allowed values for ttl depend on the type of the associated
resource, as well. If ttl is not set, the associated resource never expires.
- A duration in seconds with up to nine fractional digits, terminated by - A duration in seconds with up to nine fractional digits, terminated by
's'. 's'.
- Example - "3.5s". - Example - "3.5s".