Skip to content

Commit e135799

Browse files
yoshi-automationBenjamin E. Coe
authored andcommitted
fix: DEADLINE_EXCEEDED is no longer retried
1 parent 2cb8aeb commit e135799

File tree

6 files changed

+181
-171
lines changed

6 files changed

+181
-171
lines changed

packages/google-cloud-kms/src/v1/doc/google/protobuf/doc_field_mask.js

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -84,57 +84,49 @@
8484
* describe the updated values, the API ignores the values of all
8585
* fields not covered by the mask.
8686
*
87-
* If a repeated field is specified for an update operation, the existing
88-
* repeated values in the target resource will be overwritten by the new values.
89-
* Note that a repeated field is only allowed in the last position of a `paths`
90-
* string.
87+
* If a repeated field is specified for an update operation, new values will
88+
* be appended to the existing repeated field in the target resource. Note that
89+
* a repeated field is only allowed in the last position of a `paths` string.
9190
*
9291
* If a sub-message is specified in the last position of the field mask for an
93-
* update operation, then the existing sub-message in the target resource is
94-
* overwritten. Given the target message:
92+
* update operation, then new value will be merged into the existing sub-message
93+
* in the target resource.
94+
*
95+
* For example, given the target message:
9596
*
9697
* f {
9798
* b {
98-
* d : 1
99-
* x : 2
99+
* d: 1
100+
* x: 2
100101
* }
101-
* c : 1
102+
* c: [1]
102103
* }
103104
*
104105
* And an update message:
105106
*
106107
* f {
107108
* b {
108-
* d : 10
109+
* d: 10
109110
* }
111+
* c: [2]
110112
* }
111113
*
112114
* then if the field mask is:
113115
*
114-
* paths: "f.b"
116+
* paths: ["f.b", "f.c"]
115117
*
116118
* then the result will be:
117119
*
118120
* f {
119121
* b {
120-
* d : 10
122+
* d: 10
123+
* x: 2
121124
* }
122-
* c : 1
125+
* c: [1, 2]
123126
* }
124127
*
125-
* However, if the update mask was:
126-
*
127-
* paths: "f.b.d"
128-
*
129-
* then the result would be:
130-
*
131-
* f {
132-
* b {
133-
* d : 10
134-
* x : 2
135-
* }
136-
* c : 1
137-
* }
128+
* An implementation may provide options to override this default behavior for
129+
* repeated and message fields.
138130
*
139131
* In order to reset a field's value to the default, the field must
140132
* be in the mask and set to the default value in the provided resource.

packages/google-cloud-kms/src/v1/doc/google/protobuf/doc_timestamp.js

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,19 @@
1616
// to be loaded as the JS file.
1717

1818
/**
19-
* A Timestamp represents a point in time independent of any time zone
20-
* or calendar, represented as seconds and fractions of seconds at
21-
* nanosecond resolution in UTC Epoch time. It is encoded using the
22-
* Proleptic Gregorian Calendar which extends the Gregorian calendar
23-
* backwards to year one. It is encoded assuming all minutes are 60
24-
* seconds long, i.e. leap seconds are "smeared" so that no leap second
25-
* table is needed for interpretation. Range is from
26-
* 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z.
27-
* By restricting to that range, we ensure that we can convert to
28-
* and from RFC 3339 date strings.
29-
* See [https://www.ietf.org/rfc/rfc3339.txt](https://www.ietf.org/rfc/rfc3339.txt).
19+
* A Timestamp represents a point in time independent of any time zone or local
20+
* calendar, encoded as a count of seconds and fractions of seconds at
21+
* nanosecond resolution. The count is relative to an epoch at UTC midnight on
22+
* January 1, 1970, in the proleptic Gregorian calendar which extends the
23+
* Gregorian calendar backwards to year one.
24+
*
25+
* All minutes are 60 seconds long. Leap seconds are "smeared" so that no leap
26+
* second table is needed for interpretation, using a [24-hour linear
27+
* smear](https://developers.google.com/time/smear).
28+
*
29+
* The range is from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. By
30+
* restricting to that range, we ensure that we can convert to and from [RFC
31+
* 3339](https://www.ietf.org/rfc/rfc3339.txt) date strings.
3032
*
3133
* # Examples
3234
*
@@ -91,7 +93,7 @@
9193
* method. In Python, a standard `datetime.datetime` object can be converted
9294
* to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime)
9395
* with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one
94-
* can use the Joda Time's [`ISODateTimeFormat.dateTime()`](https://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime--) to obtain a formatter capable of generating timestamps in this format.
96+
* can use the Joda Time's [`ISODateTimeFormat.dateTime()`](https://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D) to obtain a formatter capable of generating timestamps in this format.
9597
*
9698
* @property {number} seconds
9799
* Represents seconds of UTC time since Unix epoch
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// Copyright 2019 Google LLC
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// https://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
// Note: this file is purely for documentation. Any contents are not expected
16+
// to be loaded as the JS file.

0 commit comments

Comments
 (0)