@newskit-render/core 4.4.1-alpha.0 → 4.5.0-alpha.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/cypress/e2e/account/account-subscription.cy.js +1 -1
  2. package/cypress/e2e/account/payment-failer.cy.js +1 -1
  3. package/infrastructure/.circleci/config.yml +49 -38
  4. package/package.json +5 -5
package/cypress/e2e/account/account-subscription.cy.js CHANGED
@@ -44,7 +44,7 @@ describe('Account Subscription & Cancellation', () => {
44
44
  cy.contains(
45
45
  `On ${date.toLocaleDateString(
46
46
  'en-GB'
47
- )} your Digital subscription expired. You can can re-subscribe by confirming a few details or view other packages that are available.`
47
+ )} your Digital subscription expired. You can re-subscribe by confirming a few details or view other packages that are available.`
48
48
  )
49
49
  cy.get('[data-testid="primary-button"]')
50
50
  .should('have.attr', 'href', '/title-re-subscribe')
package/cypress/e2e/account/payment-failer.cy.js CHANGED
@@ -90,7 +90,7 @@ describe('Payment Failer', () => {
90
90
  cy.contains(
91
91
  `On ${date.toLocaleDateString(
92
92
  'en-GB'
93
- )} your Digital subscription expired. You can can re-subscribe by confirming a few details or view other packages that are available.`
93
+ )} your Digital subscription expired. You can re-subscribe by confirming a few details or view other packages that are available.`
94
94
  )
95
95
  cy.get('[data-testid="primary-button"]')
96
96
  .should('have.attr', 'href', '/title-re-subscribe')
package/infrastructure/.circleci/config.yml CHANGED
@@ -18,6 +18,7 @@ orbs:
18
18
  slack: circleci/slack@3.4.2
19
19
  browser-tools: circleci/browser-tools@1.3.0
20
20
  release-api: nukengprod/release-api@0.5.8
21
+ aws-cli: circleci/aws-cli@3.1
21
22
 
22
23
  executors:
23
24
  helm:
@@ -315,6 +316,34 @@ jobs:
315
316
  aws_assume_role_arn: << parameters.aws_assume_role_arn >>
316
317
  job_type: << parameters.job_type >>
317
318
  update_kubeconfig: << parameters.update_kubeconfig >>
319
+ init_aws_oidc:
320
+ parameters:
321
+ aws_oidc_role_arn:
322
+ description: AWS Access Key Id
323
+ type: string
324
+ default: ${AWS_OIDC_ROLE_ARN_ECR}
325
+ job_type:
326
+ type: string
327
+ default: 'default'
328
+ executor: aws-cli/default
329
+ working_directory: ~/project
330
+ steps:
331
+ - checkout
332
+ - aws-cli/setup:
333
+ profile-name: cci-ecr
334
+ role-arn: << parameters.aws_oidc_role_arn >>
335
+ role-session-name: cci-ecr-session
336
+ - run:
337
+ name: save to file
338
+ command: |
339
+ source $BASH_ENV
340
+ cat $BASH_ENV | grep AWS_ACCESS_KEY_ID >> assume_role_creds_<< parameters.job_type >>.txt
341
+ cat $BASH_ENV | grep AWS_SECRET_ACCESS_KEY >> assume_role_creds_<< parameters.job_type >>.txt
342
+ cat $BASH_ENV | grep AWS_SESSION_TOKEN >> assume_role_creds_<< parameters.job_type >>.txt
343
+ - persist_to_workspace:
344
+ root: ./
345
+ paths:
346
+ - assume_role_creds_<< parameters.job_type >>.txt
318
347
 
319
348
  deploy_terraform:
320
349
  parameters:
@@ -827,16 +856,14 @@ workflows:
827
856
  job_type: 'eks_pr'
828
857
  requires:
829
858
  - install_deps
830
- - init_aws:
859
+ - init_aws_oidc:
831
860
  <<: *only_on_pr_branch
832
861
  context: <% PROJECT_NAME >-dev
833
- name: init_aws
834
- aws_access_key_id: ${ECR_AWS_ACCESS_KEY_ID}
835
- aws_secret_key: ${ECR_AWS_SECRET_ACCESS_KEY}
836
- aws_assume_role_arn: ${ECR_AWS_ASSUME_ROLE_ARN}
837
- update_kubeconfig: false
862
+ name: aws_oidc
838
863
  requires:
839
864
  - install_deps
865
+ - test_unit
866
+ - lint
840
867
  - deploy_terraform:
841
868
  <<: *only_on_pr_branch
842
869
  context: <% PROJECT_NAME >-dev
@@ -847,14 +874,14 @@ workflows:
847
874
  project: '<% PROJECT_NAME >'
848
875
  apply: false
849
876
  requires:
850
- - init_aws
877
+ - aws_oidc
851
878
  - publish_docker:
852
879
  <<: *only_on_pr_branch
853
880
  context: <% PROJECT_NAME >-dev
854
881
  name: publish_docker
855
882
  requires:
856
883
  - install_deps
857
- - init_aws
884
+ - aws_oidc
858
885
  - upgrade_helm:
859
886
  <<: *only_on_pr_branch
860
887
  context: <% PROJECT_NAME >-dev
@@ -919,14 +946,10 @@ workflows:
919
946
  job_type: 'eks_dev'
920
947
  requires:
921
948
  - install_deps
922
- - init_aws:
949
+ - init_aws_oidc:
923
950
  <<: *only_on_master_branch
924
951
  context: <% PROJECT_NAME >-dev
925
- name: init_aws
926
- aws_access_key_id: ${ECR_AWS_ACCESS_KEY_ID}
927
- aws_secret_key: ${ECR_AWS_SECRET_ACCESS_KEY}
928
- aws_assume_role_arn: ${ECR_AWS_ASSUME_ROLE_ARN}
929
- update_kubeconfig: false
952
+ name: aws_oidc
930
953
  requires:
931
954
  - install_deps
932
955
  - deploy_terraform:
@@ -938,7 +961,7 @@ workflows:
938
961
  environment: dev
939
962
  apply: true
940
963
  requires:
941
- - init_aws
964
+ - aws_oidc
942
965
  - publish_docker:
943
966
  <<: *only_on_master_branch
944
967
  context: <% PROJECT_NAME >-dev
@@ -946,7 +969,7 @@ workflows:
946
969
  requires:
947
970
  - install_deps
948
971
  - e2e_test
949
- - init_aws
972
+ - aws_oidc
950
973
  - deploy_terraform_ecr
951
974
  - trigger_workflow_by_workspace:
952
975
  <<: *only_on_master_branch
@@ -979,16 +1002,12 @@ workflows:
979
1002
  job_type: 'eks_dev'
980
1003
  requires:
981
1004
  - install_deps
982
- - init_aws:
1005
+ - init_aws_oidc:
983
1006
  <<: *only_on_tags
984
1007
  context: <% PROJECT_NAME >-dev
985
- name: init_aws
986
- aws_access_key_id: ${ECR_AWS_ACCESS_KEY_ID}
987
- aws_secret_key: ${ECR_AWS_SECRET_ACCESS_KEY}
988
- aws_assume_role_arn: ${ECR_AWS_ASSUME_ROLE_ARN}
989
- update_kubeconfig: false
1008
+ name: aws_oidc_dev
990
1009
  requires:
991
- - install_deps
1010
+ - slack_deploy_approval
992
1011
  - upgrade_helm:
993
1012
  <<: *only_on_tags
994
1013
  context: <% PROJECT_NAME >-dev
@@ -997,7 +1016,7 @@ workflows:
997
1016
  environment: dev
998
1017
  node_env: development
999
1018
  requires:
1000
- - init_aws
1019
+ - aws_oidc_dev
1001
1020
  - init_aws_eks_dev
1002
1021
  - deploy_terraform:
1003
1022
  <<: *only_on_tags
@@ -1034,14 +1053,10 @@ workflows:
1034
1053
  - approve_deploy_to_staging:
1035
1054
  <<: *only_on_tags
1036
1055
  type: approval
1037
- - init_aws:
1056
+ - init_aws_oidc:
1038
1057
  <<: *only_on_tags
1039
1058
  context: <% PROJECT_NAME >-stage
1040
- name: init_aws_staging
1041
- aws_access_key_id: ${ECR_AWS_ACCESS_KEY_ID}
1042
- aws_secret_key: ${ECR_AWS_SECRET_ACCESS_KEY}
1043
- aws_assume_role_arn: ${ECR_AWS_ASSUME_ROLE_ARN}
1044
- update_kubeconfig: false
1059
+ name: aws_oidc_staging
1045
1060
  requires:
1046
1061
  - approve_deploy_to_staging
1047
1062
  - init_aws:
@@ -1050,7 +1065,7 @@ workflows:
1050
1065
  context: <% PROJECT_NAME >-stage
1051
1066
  job_type: 'eks_staging'
1052
1067
  requires:
1053
- - init_aws_staging
1068
+ - aws_oidc_staging
1054
1069
  - upgrade_helm:
1055
1070
  <<: *only_on_tags
1056
1071
  name: deploy_to_staging
@@ -1092,14 +1107,10 @@ workflows:
1092
1107
  - approve_deploy_to_prod:
1093
1108
  <<: *only_on_tags
1094
1109
  type: approval
1095
- - init_aws:
1110
+ - init_aws_oidc:
1096
1111
  <<: *only_on_tags
1097
1112
  context: <% PROJECT_NAME >-prod
1098
- name: init_aws_prod
1099
- aws_access_key_id: ${ECR_AWS_ACCESS_KEY_ID}
1100
- aws_secret_key: ${ECR_AWS_SECRET_ACCESS_KEY}
1101
- aws_assume_role_arn: ${ECR_AWS_ASSUME_ROLE_ARN}
1102
- update_kubeconfig: false
1113
+ name: aws_oidc_prod
1103
1114
  requires:
1104
1115
  - approve_deploy_to_prod
1105
1116
  - release-api/prerelease:
@@ -1126,7 +1137,7 @@ workflows:
1126
1137
  context: <% PROJECT_NAME >-prod
1127
1138
  job_type: 'eks_prod'
1128
1139
  requires:
1129
- - init_aws_prod
1140
+ - aws_oidc_prod
1130
1141
  - upgrade_helm:
1131
1142
  <<: *only_on_tags
1132
1143
  name: deploy_to_prod
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@newskit-render/core",
3
- "version": "4.4.1-alpha.0",
3
+ "version": "4.5.0-alpha.0",
4
4
  "description": "Newskit Render - Core package",
5
5
  "author": "",
6
6
  "license": "UNLICENSED",
@@ -41,12 +41,12 @@
41
41
  "@emotion/styled": "11.9.3",
42
42
  "@newskit-render/api": "^1.6.8",
43
43
  "@newskit-render/auth": "^1.3.11",
44
- "@newskit-render/checkout": "^3.1.5-alpha.0",
44
+ "@newskit-render/checkout": "^3.1.5-alpha.1",
45
45
  "@newskit-render/feature-flags": "^1.4.11",
46
46
  "@newskit-render/feed": "^1.4.18",
47
- "@newskit-render/my-account": "^6.5.0-alpha.0",
48
- "@newskit-render/shared-components": "^3.6.0-alpha.0",
49
- "@newskit-render/standalone-components": "^3.6.1-alpha.0",
47
+ "@newskit-render/my-account": "^6.5.0-alpha.1",
48
+ "@newskit-render/shared-components": "^3.6.0-alpha.1",
49
+ "@newskit-render/standalone-components": "^3.6.1-alpha.1",
50
50
  "@newskit-render/validation": "^1.6.0",
51
51
  "@next/font": "13.1.6",
52
52
  "cross-fetch": "3.1.5",