From cdcc6df78b716da3e3c879ce5acc48f03571b226 Mon Sep 17 00:00:00 2001 From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com> Date: Wed, 1 Jul 2020 18:03:25 +0000 Subject: [PATCH 1/3] fix(credential-provider-imds): update DEFAULT_MAX_RETRIES to 3 --- .../src/remoteProvider/RemoteProviderInit.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/credential-provider-imds/src/remoteProvider/RemoteProviderInit.ts b/packages/credential-provider-imds/src/remoteProvider/RemoteProviderInit.ts index 5bed00aee067..17ccd7bed4ad 100644 --- a/packages/credential-provider-imds/src/remoteProvider/RemoteProviderInit.ts +++ b/packages/credential-provider-imds/src/remoteProvider/RemoteProviderInit.ts @@ -1,5 +1,5 @@ export const DEFAULT_TIMEOUT = 1000; -export const DEFAULT_MAX_RETRIES = 0; +export const DEFAULT_MAX_RETRIES = 3; export interface RemoteProviderConfig { /** From 3f651e186af48876099f1380d793b506d3a9ecb8 Mon Sep 17 00:00:00 2001 From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com> Date: Wed, 1 Jul 2020 18:07:52 +0000 Subject: [PATCH 2/3] chore: convert providerConfigFromInit to arrow function --- .../src/remoteProvider/RemoteProviderInit.ts | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/credential-provider-imds/src/remoteProvider/RemoteProviderInit.ts b/packages/credential-provider-imds/src/remoteProvider/RemoteProviderInit.ts index 17ccd7bed4ad..7e8e5f5ceff5 100644 --- a/packages/credential-provider-imds/src/remoteProvider/RemoteProviderInit.ts +++ b/packages/credential-provider-imds/src/remoteProvider/RemoteProviderInit.ts @@ -15,10 +15,7 @@ export interface RemoteProviderConfig { export type RemoteProviderInit = Partial; -export function providerConfigFromInit( - init: RemoteProviderInit -): RemoteProviderConfig { - const { timeout = DEFAULT_TIMEOUT, maxRetries = DEFAULT_MAX_RETRIES } = init; - - return { maxRetries, timeout }; -} +export const providerConfigFromInit = ({ + maxRetries = DEFAULT_MAX_RETRIES, + timeout = DEFAULT_TIMEOUT +}: RemoteProviderInit): RemoteProviderConfig => ({ maxRetries, timeout }); From d735a50c70d1c5752ec14efb8e15c6c4363272a9 Mon Sep 17 00:00:00 2001 From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com> Date: Wed, 1 Jul 2020 18:17:04 +0000 Subject: [PATCH 3/3] fix: revert to 0 default retries with comment --- .../src/remoteProvider/RemoteProviderInit.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/credential-provider-imds/src/remoteProvider/RemoteProviderInit.ts b/packages/credential-provider-imds/src/remoteProvider/RemoteProviderInit.ts index 7e8e5f5ceff5..6499c9d8e3a5 100644 --- a/packages/credential-provider-imds/src/remoteProvider/RemoteProviderInit.ts +++ b/packages/credential-provider-imds/src/remoteProvider/RemoteProviderInit.ts @@ -1,5 +1,8 @@ export const DEFAULT_TIMEOUT = 1000; -export const DEFAULT_MAX_RETRIES = 3; + +// The default in AWS SDK for Python and CLI (botocore) is no retry or one attempt +// https://github.com/boto/botocore/blob/646c61a7065933e75bab545b785e6098bc94c081/botocore/utils.py#L273 +export const DEFAULT_MAX_RETRIES = 0; export interface RemoteProviderConfig { /**