Skip to content

Commit 37ce7aa

Browse files
feat(cdn): fix Duration type value
1 parent 02c4f45 commit 37ce7aa

2 files changed

Lines changed: 8 additions & 10 deletions

File tree

src/services/cdnBackendService/format.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {
1010
GcpCdnBackendServiceCdnPolicyNegativeCachingPolicy,
1111
GcpCdnBackendServiceOutlierDetection,
1212
} from '../../types/generated'
13-
import { toISOString } from '../../utils/dateutils'
1413

1514
const formatBackend = ({
1615
balancingMode,
@@ -104,13 +103,13 @@ const formatOutlierDetection = ({
104103
successRateStdevFactor,
105104
}: google.cloud.compute.v1.IOutlierDetection): GcpCdnBackendServiceOutlierDetection => {
106105
return {
107-
baseEjectionTime: toISOString(baseEjectionTime?.seconds?.toString()) || '',
106+
baseEjectionTime: baseEjectionTime?.seconds?.toString() || '',
108107
consecutiveErrors,
109108
consecutiveGatewayFailure,
110109
enforcingConsecutiveErrors,
111110
enforcingConsecutiveGatewayFailure,
112111
enforcingSuccessRate,
113-
interval: toISOString(interval?.seconds?.toString()) || '',
112+
interval: interval?.seconds?.toString() || '',
114113
maxEjectionPercent,
115114
successRateMinimumHosts,
116115
successRateRequestVolume,
@@ -177,7 +176,7 @@ export default ({
177176
connectionDrainingTimeoutSec: connectionDraining?.drainingTimeoutSec || 0,
178177
consistentHashLoadBalancerSettingHttpCookieName: consistentHash?.httpCookie?.name || '',
179178
consistentHashLoadBalancerSettingHttpCookiePath: consistentHash?.httpCookie?.path || '',
180-
consistentHashLoadBalancerSettingHttpCookie: toISOString(consistentHash?.httpCookie?.ttl.seconds?.toString()) || '',
179+
consistentHashLoadBalancerSettingHttpCookie: consistentHash?.httpCookie?.ttl.seconds?.toString() || '',
181180
consistentHashLoadBalancerSettingHttpHeaderName: consistentHash?.httpHeaderName || '',
182181
consistentHashLoadBalancerSettingMinimumRingSize: consistentHash?.minimumRingSize?.toString() || '',
183182
creationTimestamp,
@@ -200,7 +199,7 @@ export default ({
200199
localityLbPolicy: enumKeyToString(google.cloud.compute.v1.BackendService.LocalityLbPolicy, localityLbPolicy),
201200
logConfigEnable: logConfig?.enable || false,
202201
logConfigSampleRate: logConfig?.sampleRate || 0,
203-
maxStreamDuration: toISOString(maxStreamDuration?.seconds?.toString()),
202+
maxStreamDuration: maxStreamDuration?.seconds?.toString() || '',
204203
outlierDetection: formatOutlierDetection(outlierDetection),
205204
port,
206205
portName,

src/services/cdnUrlMap/format.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import {
1616
GcpCdnUrlMapRouteActionWeightedBackendService,
1717
GcpCdnUrlMapTest,
1818
} from '../../types/generated'
19-
import { toISOString } from '../../utils/dateutils'
2019

2120
const formatWeightedBackendService = ({
2221
backendService,
@@ -77,14 +76,14 @@ const formatRouteAction = ({
7776
corsPolicyMaxAge: corsPolicy?.maxAge || 0,
7877
faultInjectionPolicyAbortHttpStatus: faultInjectionPolicy?.abort?.httpStatus || 0,
7978
faultInjectionPolicyAbortPercentage: faultInjectionPolicy?.abort?.percentage || 0,
80-
faultInjectionPolicyDelayFixedDelay: toISOString(faultInjectionPolicy?.delay?.fixedDelay?.seconds?.toString()) || '',
79+
faultInjectionPolicyDelayFixedDelay: faultInjectionPolicy?.delay?.fixedDelay?.seconds?.toString() || '',
8180
faultInjectionPolicyDelayPercentage: faultInjectionPolicy?.delay?.percentage || 0,
82-
maxStreamDuration: toISOString(maxStreamDuration?.seconds?.toString()) || '',
81+
maxStreamDuration: maxStreamDuration?.seconds?.toString() || '',
8382
requestMirrorPolicyBackendService: requestMirrorPolicy?.backendService || '',
8483
retryPolicyNumRetries: retryPolicy?.numRetries || 0,
85-
retryPolicyPerTryTimeout: toISOString(retryPolicy?.perTryTimeout?.seconds?.toString()) || '',
84+
retryPolicyPerTryTimeout: retryPolicy?.perTryTimeout?.seconds?.toString() || '',
8685
retryPolicyRetryConditions: retryPolicy?.retryConditions || [],
87-
timeout: toISOString(timeout?.seconds?.toString()) || '',
86+
timeout: timeout?.seconds?.toString() || '',
8887
urlRewriteHostRewrite: urlRewrite?.hostRewrite || '',
8988
urlRewritePathPrefixRewrite: urlRewrite?.pathPrefixRewrite || '',
9089
weightedBackendServices: weightedBackendServices?.map(backendService => formatWeightedBackendService(backendService))

0 commit comments

Comments
 (0)