From 91b1f13ceaffcf47230b6a07821fde4ac345b1c6 Mon Sep 17 00:00:00 2001 From: Ivan Artemiev <29709626+iartemiev@users.noreply.github.com> Date: Wed, 29 Apr 2020 15:41:52 -0400 Subject: [PATCH 1/4] ci: update cypress image to 12.16 --- .circleci/config.yml | 47 ++++++++++--------- .../AWSPinpointProvider-unit-test.ts | 4 +- .../src/Providers/AWSPinpointProvider.ts | 6 ++- .../analytics/src/Providers/EventBuffer.ts | 4 +- 4 files changed, 33 insertions(+), 28 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 84f15ace60a..fa3e68b0bd0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,12 +7,12 @@ version: 2.1 executors: build-executor: docker: - - image: cypress/base:10 + - image: cypress/base:12.16.1 resource_class: large js-test-executor: docker: - - image: cypress/base:10 + - image: cypress/base:12.16.1 - image: verdaccio/verdaccio resource_class: large @@ -424,8 +424,9 @@ releasable_branches: &releasable_branches only: - release - master - - ui-components/master #TODO: can we remove this? + - ui-components/master - 1.0-stable + - ci-update-cypress workflows: build_test_deploy: @@ -488,23 +489,23 @@ workflows: - build filters: <<: *releasable_branches - - deploy: - filters: - <<: *releasable_branches - requires: - - unit_test - - integ_react_predictions - - integ_react_auth - - integ_angular_auth - - integ_vue_auth - - integ_react_auth_ui - - integ_angular_auth_ui - - integ_vue_auth_ui - - integ_rn_ios_storage - - post_release: - filters: - branches: - only: - - release - requires: - - deploy + # - deploy: + # filters: + # <<: *releasable_branches + # requires: + # - unit_test + # - integ_react_predictions + # - integ_react_auth + # - integ_angular_auth + # - integ_vue_auth + # - integ_react_auth_ui + # - integ_angular_auth_ui + # - integ_vue_auth_ui + # - integ_rn_ios_storage + # - post_release: + # filters: + # branches: + # only: + # - release + # requires: + # - deploy diff --git a/packages/analytics/__tests__/Providers/AWSPinpointProvider-unit-test.ts b/packages/analytics/__tests__/Providers/AWSPinpointProvider-unit-test.ts index efc510a680a..4b60c7ed405 100644 --- a/packages/analytics/__tests__/Providers/AWSPinpointProvider-unit-test.ts +++ b/packages/analytics/__tests__/Providers/AWSPinpointProvider-unit-test.ts @@ -736,7 +736,9 @@ describe('AnalyticsProvider test', () => { test('Exceeded maximum endpoint per user count', async () => { const analytics = new AnalyticsProvider(); const mockExceededMaxError = { - statusCode: 400, + $metadata: { + httpStatusCode: 400, + }, message: 'Exceeded maximum endpoint per user count 10', }; diff --git a/packages/analytics/src/Providers/AWSPinpointProvider.ts b/packages/analytics/src/Providers/AWSPinpointProvider.ts index 1f92bf72c04..f415e95feeb 100644 --- a/packages/analytics/src/Providers/AWSPinpointProvider.ts +++ b/packages/analytics/src/Providers/AWSPinpointProvider.ts @@ -431,8 +431,9 @@ export class AWSPinpointProvider implements AnalyticsProvider { private async _handleEndpointUpdateFailure(failureData: EndpointFailureData) { const { err, endpointObject } = failureData; - const { statusCode } = err; - logger.debug('updateEndpoint failed', err); + const statusCode = err.$metadata && err.$metadata.httpStatusCode; + + logger.error('updateEndpoint failed', err); switch (statusCode) { case BAD_REQUEST_CODE: @@ -482,6 +483,7 @@ export class AWSPinpointProvider implements AnalyticsProvider { private _handleEndpointUpdateForbidden(failureData: EndpointFailureData) { const { err, endpointObject } = failureData; + const { code, retryable } = err; if (code !== EXPIRED_TOKEN_CODE && !retryable) { diff --git a/packages/analytics/src/Providers/EventBuffer.ts b/packages/analytics/src/Providers/EventBuffer.ts index 57ea943f1e2..405052666e8 100644 --- a/packages/analytics/src/Providers/EventBuffer.ts +++ b/packages/analytics/src/Providers/EventBuffer.ts @@ -150,8 +150,8 @@ export default class EventsBuffer { } private _handlePutEventsFailure(err, eventMap: EventMap) { - logger.debug('_putEvents Failed:', err); - const { statusCode } = err; + logger.error('_putEvents Failed: ', err); + const statusCode = err.$metadata && err.$metadata.httpStatusCode; if (RETRYABLE_CODES.includes(statusCode)) { const retryableEvents = Object.values(eventMap); From 9908769f438e09b62dc62edacd1ad762b69e8d8f Mon Sep 17 00:00:00 2001 From: Ivan Artemiev <29709626+iartemiev@users.noreply.github.com> Date: Wed, 29 Apr 2020 17:00:27 -0400 Subject: [PATCH 2/4] re-enable all steps after testing --- .circleci/config.yml | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fa3e68b0bd0..5a6232da348 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -426,7 +426,6 @@ releasable_branches: &releasable_branches - master - ui-components/master - 1.0-stable - - ci-update-cypress workflows: build_test_deploy: @@ -489,23 +488,23 @@ workflows: - build filters: <<: *releasable_branches - # - deploy: - # filters: - # <<: *releasable_branches - # requires: - # - unit_test - # - integ_react_predictions - # - integ_react_auth - # - integ_angular_auth - # - integ_vue_auth - # - integ_react_auth_ui - # - integ_angular_auth_ui - # - integ_vue_auth_ui - # - integ_rn_ios_storage - # - post_release: - # filters: - # branches: - # only: - # - release - # requires: - # - deploy + - deploy: + filters: + <<: *releasable_branches + requires: + - unit_test + - integ_react_predictions + - integ_react_auth + - integ_angular_auth + - integ_vue_auth + - integ_react_auth_ui + - integ_angular_auth_ui + - integ_vue_auth_ui + - integ_rn_ios_storage + - post_release: + filters: + branches: + only: + - release + requires: + - deploy From faab342552a24986594491086b12d9dfd02844c7 Mon Sep 17 00:00:00 2001 From: Ivan Artemiev <29709626+iartemiev@users.noreply.github.com> Date: Wed, 29 Apr 2020 17:13:55 -0400 Subject: [PATCH 3/4] run integ tests on branch --- .circleci/config.yml | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5a6232da348..fa3e68b0bd0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -426,6 +426,7 @@ releasable_branches: &releasable_branches - master - ui-components/master - 1.0-stable + - ci-update-cypress workflows: build_test_deploy: @@ -488,23 +489,23 @@ workflows: - build filters: <<: *releasable_branches - - deploy: - filters: - <<: *releasable_branches - requires: - - unit_test - - integ_react_predictions - - integ_react_auth - - integ_angular_auth - - integ_vue_auth - - integ_react_auth_ui - - integ_angular_auth_ui - - integ_vue_auth_ui - - integ_rn_ios_storage - - post_release: - filters: - branches: - only: - - release - requires: - - deploy + # - deploy: + # filters: + # <<: *releasable_branches + # requires: + # - unit_test + # - integ_react_predictions + # - integ_react_auth + # - integ_angular_auth + # - integ_vue_auth + # - integ_react_auth_ui + # - integ_angular_auth_ui + # - integ_vue_auth_ui + # - integ_rn_ios_storage + # - post_release: + # filters: + # branches: + # only: + # - release + # requires: + # - deploy From 977adae1aa6cacf33ec114b717ab0aec1f2aad00 Mon Sep 17 00:00:00 2001 From: Ivan Artemiev <29709626+iartemiev@users.noreply.github.com> Date: Wed, 29 Apr 2020 17:53:01 -0400 Subject: [PATCH 4/4] re-enable all jobs --- .circleci/config.yml | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fa3e68b0bd0..5a6232da348 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -426,7 +426,6 @@ releasable_branches: &releasable_branches - master - ui-components/master - 1.0-stable - - ci-update-cypress workflows: build_test_deploy: @@ -489,23 +488,23 @@ workflows: - build filters: <<: *releasable_branches - # - deploy: - # filters: - # <<: *releasable_branches - # requires: - # - unit_test - # - integ_react_predictions - # - integ_react_auth - # - integ_angular_auth - # - integ_vue_auth - # - integ_react_auth_ui - # - integ_angular_auth_ui - # - integ_vue_auth_ui - # - integ_rn_ios_storage - # - post_release: - # filters: - # branches: - # only: - # - release - # requires: - # - deploy + - deploy: + filters: + <<: *releasable_branches + requires: + - unit_test + - integ_react_predictions + - integ_react_auth + - integ_angular_auth + - integ_vue_auth + - integ_react_auth_ui + - integ_angular_auth_ui + - integ_vue_auth_ui + - integ_rn_ios_storage + - post_release: + filters: + branches: + only: + - release + requires: + - deploy