@newskit-render/core 2.26.0 → 2.27.0

package/.ci/trigger-circleci-workflow.sh

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+# vim: et sr sw=2 ts=2 smartindent:
+# You must set up a Personal API Key in CircleCi for this to work and place it in your context as CIRCLE_TOKEN_CI_USER
+
+set -x
+
+REPOSITORY_TYPE=github
+
+deploy() {
+  WORKFLOW_NAME=$1
+  TAG=$2
+
+  PARAMETERS="\"run_build_workflow\":false, \"run_${WORKFLOW_NAME}\":true"
+
+  DATA="{ \"tag\": \"${TAG}\", \"parameters\": { ${PARAMETERS} } }"
+  echo "Triggering pipeline with data:"
+  echo -e "  $DATA"
+
+  URL="https://circleci.com/api/v2/project/${REPOSITORY_TYPE}/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}/pipeline"
+  HTTP_RESPONSE=$(curl -u "${CIRCLE_TOKEN_CI_USER}:" -o response.txt -w "%{http_code}" --silent --fail --show-error -X POST --header "Content-Type: application/json" -d "$DATA" $URL)
+
+  if [ $? -eq 0 ]; then
+      echo -e "\e[92mReceived status code: ${HTTP_RESPONSE}\e[0m"
+      echo "API call succeeded."
+      echo "Response:"
+      cat response.txt
+  else
+      echo -e "\e[93mReceived status code: ${HTTP_RESPONSE}\e[0m"
+      echo "Response:"
+      cat response.txt
+      exit 1
+  fi
+}
+
+(
+  deploy $1 $2
+)

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.26.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@2.26.0-alpha.0...@newskit-render/core@2.26.0) (2022-11-29)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
 ## [2.25.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@2.25.1-alpha.0...@newskit-render/core@2.25.1) (2022-11-28)
 
 **Note:** Version bump only for package @newskit-render/core

package/infrastructure/.circleci/config.yml

@@ -1,5 +1,19 @@
 version: 2.1
 
+parameters:
+  run_build_workflow:
+    type: boolean
+    default: true
+  run_deploy_to_dev_workflow:
+    type: boolean
+    default: false
+  run_deploy_to_staging_workflow:
+    type: boolean
+    default: false
+  run_deploy_to_prod_workflow:
+    type: boolean
+    default: false
+
 orbs:
   slack: circleci/slack@3.4.2
   browser-tools: circleci/browser-tools@1.3.0
@@ -654,65 +668,6 @@ jobs:
                   APP_ID=$(curl -s -X GET "https://api.newrelic.com/v2/applications.json" -H "X-Api-Key:${TF_VAR_newrelic_api_key}" -G -d "filter[name]=<% PROJECT_PREFIX >:<% PROJECT_NAME >:<< parameters.environment >>" | jq -r '.applications[]' | jq -r '.id')
                   curl -X POST "https://api.newrelic.com/v2/applications/$APP_ID/deployments.json" -H "Api-Key:${TF_VAR_newrelic_api_key}" -i -H "Content-Type: application/json" -d '{ "deployment": { "revision": "'$CURRENT_VERSION'" } }'
 
-  create_release:
-    executor: helm
-    working_directory: ~/project
-    steps:
-      - run:
-          name: Install ssh client and npm
-          command: apk add openssh-client npm
-      - add_ssh_keys:
-          fingerprints:
-            - '<% SSH_KEY >'
-      - checkout
-      - attach_workspace:
-          at: ~/project
-      - aws_assume_role:
-          aws_access_key_id: ${RELEASE_AWS_ACCESS_KEY_ID}
-          aws_secret_key: ${RELEASE_AWS_SECRET_ACCESS_KEY}
-          aws_assume_role_arn: ${BOOK_RELEASE_ROLE_ARN}
-          job_type: release
-      - run:
-          name: Create release request
-          command: |
-            source $BASH_ENV
-            CURRENT_VERSION=$(jq -r .version ./package.json)
-
-            npm install --no-save release-documentation-cli@5.2.4
-
-            # If your tags are prefixed (i.e. lerna) check the --tagFilter parameter
-            echo "Creating a release request for $CURRENT_VERSION to be deployed to production."
-            # Instead of booking real releases in the production google sheet and RoD, post rows to the debug google sheet (found next to the the production sheet)
-            # Useful when first setting up booking releases
-            # Remove when all config is validated
-            $(npm bin)/release new --isDebug --productOwner "$PRODUCT_OWNER" --runOnCi --bookRelease
-
-  promote_release:
-    executor: node
-    working_directory: ~/project
-    steps:
-      - add_ssh_keys:
-          fingerprints:
-            - '<% SSH_KEY >'
-      - checkout
-      - attach_workspace:
-          at: ~/project
-      - run:
-          name: Promote release
-          command: |
-            export CURRENT_VERSION=$(jq -r .version ./package.json)
-            echo "export CURRENT_VERSION=$CURRENT_VERSION" >> $BASH_ENV
-
-            npm install --no-save release-documentation-cli@5.2.4
-
-            # If your tags are prefixed (i.e. lerna) check the --tagFilter parameter
-            $(npm bin)/release promote
-            echo "$CURRENT_VERSION published to npm"
-      - slack/notify:
-          color: '#42e2f4'
-          message: "Hi all, \n <% PROJECT_NAME > version <% GIT_REPO >/releases/tag/${CURRENT_VERSION} has been released."
-          webhook: ${SLACK_RELEASES_WEBHOOK}
-
   bump_version:
     executor: node
     working_directory: ~/project
@@ -756,6 +711,69 @@ jobs:
              "body": "This PR has been automatically deployed [here]('https://pr-${PR_NUMBER}-<% PROJECT_NAME >.ceng-dev.newsuk.tech')."
             }'
 
+  slack_deploy_approval:
+    parameters:
+      approval:
+        type: boolean
+        default: false
+      version:
+        type: string
+        default: ${CIRCLE_TAG}
+      package_name:
+        type: string
+        default: <% PROJECT_NAME >
+      environment:
+        type: string
+    executor: node
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ~/project
+      - when:
+          condition: << parameters.approval >>
+          steps:
+            - slack/approval:
+                message: 'Deployment of << parameters.package_name >>@<< parameters.version >> to << parameters.environment >> requires approval'
+                webhook: ${SLACK_CIRCLECI_DEPLOYMENTS_WEBHOOK}
+                color: '#32a852'
+      - unless:
+          condition: << parameters.approval >>
+          steps:
+            - slack/approval:
+                message: '<< parameters.package_name >>@<< parameters.version >> is being deployed to << parameters.environment >>'
+                webhook: ${SLACK_CIRCLECI_DEPLOYMENTS_WEBHOOK}
+                color: '#32a852'
+
+  trigger_workflow_by_workspace:
+    parameters:
+      workflow:
+        type: string
+    executor: node
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ~/project
+      - run:
+          command: cat package.json | jq -r .version
+      - run:
+          name: Trigger << parameters.workflow >>
+          command: |
+            set -x
+            VERSION=v$(cat package.json | jq -r .version)
+            .ci/trigger-circleci-workflow.sh << parameters.workflow >> $VERSION
+
+  trigger_workflow_by_circle_tag:
+    parameters:
+      workflow:
+        type: string
+    executor: node
+    steps:
+      - checkout
+      - run:
+          name: Trigger << parameters.workflow >>
+          command: |
+            .ci/trigger-circleci-workflow.sh << parameters.workflow >> $CIRCLE_TAG
+
 # Optional filters assuming trunk based development
 ## For PR workflow
 only_on_pr_branch: &only_on_pr_branch
@@ -776,6 +794,11 @@ only_on_master_branch: &only_on_master_branch
         - master
         - main
 
+only_on_tags: &only_on_tags
+  filters:
+    tags:
+      only: /^v.*/
+
 workflows:
   pull_request:
     jobs:
@@ -860,8 +883,10 @@ workflows:
 
   build_and_deploy:
     when:
-      not:
-        equal: [scheduled_pipeline, << pipeline.trigger_source >>]
+      and:
+        - equal: [ true, << pipeline.parameters.run_build_workflow >> ]
+        - not:
+            equal: [ scheduled_pipeline, << pipeline.trigger_source >> ]
     jobs:
       - install_deps:
           name: install_deps
@@ -916,18 +941,59 @@ workflows:
             - e2e_test
             - init_aws
             - deploy_terraform_ecr
-      - upgrade_helm:
+      - trigger_workflow_by_workspace:
           <<: *only_on_master_branch
           context: <% PROJECT_NAME >-dev
+          name: trigger_deploy_to_dev_workflow
+          workflow: deploy_to_dev_workflow
+          requires:
+            - publish_docker
+
+  deploy_to_dev_workflow:
+    when:
+      and:
+        - equal: [ true, << pipeline.parameters.run_deploy_to_dev_workflow >> ]
+        - not:
+            equal: [ scheduled_pipeline, << pipeline.trigger_source >> ]
+    jobs:
+      - slack_deploy_approval:
+          <<: *only_on_tags
+          context: <% PROJECT_NAME >-dev
+          approval: false
+          environment: DEV 
+      - install_deps:
+          name: install_deps
+          context: <% PROJECT_NAME >-dev
+          <<: *only_on_tags 
+      - init_aws:
+          <<: *only_on_tags
+          context: <% PROJECT_NAME >-dev
+          name: init_aws_eks_dev
+          job_type: 'eks_dev'
+          requires:
+            - install_deps
+      - init_aws:
+          <<: *only_on_tags
+          context: <% PROJECT_NAME >-dev
+          name: init_aws
+          aws_access_key_id: ${ECR_AWS_ACCESS_KEY_ID}
+          aws_secret_key: ${ECR_AWS_SECRET_ACCESS_KEY}
+          aws_assume_role_arn: ${ECR_AWS_ASSUME_ROLE_ARN}
+          update_kubeconfig: false
+          requires:
+            - install_deps  
+      - upgrade_helm:
+          <<: *only_on_tags
+          context: <% PROJECT_NAME >-dev
           name: deploy_to_dev
           create: true
           environment: dev
           node_env: development
           requires:
+            - init_aws
             - init_aws_eks_dev
-            - publish_docker
       - deploy_terraform:
-          <<: *only_on_master_branch
+          <<: *only_on_tags
           context: <% PROJECT_NAME >-dev
           name: deploy_terraform_newrelic_dev
           project: '<% PROJECT_NAME >'
@@ -936,13 +1002,32 @@ workflows:
           apply: true
           requires:
             - deploy_to_dev
+      - trigger_workflow_by_circle_tag:
+          <<: *only_on_tags
+          context: <% PROJECT_NAME >-dev
+          name: trigger_deploy_to_staging_workflow
+          workflow: deploy_to_staging_workflow
+          requires:
+            - deploy_terraform_newrelic_dev
+
+  deploy_to_staging_workflow:
+    when:
+      and:
+        - equal: [ true, << pipeline.parameters.run_deploy_to_staging_workflow >> ]
+        - not:
+            equal: [ scheduled_pipeline, << pipeline.trigger_source >> ]
+    jobs:
+      - slack_deploy_approval:
+          <<: *only_on_tags
+          context: <% PROJECT_NAME >-dev
+          name: slack_deploy_approval
+          approval: true
+          environment: STAGING
       - approve_deploy_to_staging:
-          <<: *only_on_master_branch
+          <<: *only_on_tags
           type: approval
-          requires:
-            - deploy_to_dev
       - init_aws:
-          <<: *only_on_master_branch
+          <<: *only_on_tags
           context: <% PROJECT_NAME >-dev
           name: init_aws_staging
           aws_access_key_id: ${ECR_AWS_ACCESS_KEY_ID}
@@ -952,21 +1037,21 @@ workflows:
           requires:
             - approve_deploy_to_staging
       - init_aws:
-          <<: *only_on_master_branch
+          <<: *only_on_tags
           name: init_aws_eks_staging
           context: <% PROJECT_NAME >-stage
           job_type: 'eks_staging'
           requires:
             - init_aws_staging
       - upgrade_helm:
-          <<: *only_on_master_branch
+          <<: *only_on_tags
           name: deploy_to_staging
           context: <% PROJECT_NAME >-stage
           environment: staging
           requires:
             - init_aws_eks_staging
       - deploy_terraform:
-          <<: *only_on_master_branch
+          <<: *only_on_tags
           context: <% PROJECT_NAME >-stage
           name: deploy_terraform_newrelic_staging
           project: '<% PROJECT_NAME >'
@@ -975,13 +1060,32 @@ workflows:
           apply: true
           requires:
             - deploy_to_staging
-      - approve_deploy_to_prod:
-          <<: *only_on_master_branch
-          type: approval
+      - trigger_workflow_by_circle_tag:
+          <<: *only_on_tags
+          context: <% PROJECT_NAME >-dev
+          name: trigger_deploy_to_prod_workflow
+          workflow: deploy_to_prod_workflow
           requires:
             - deploy_to_staging
+
+  deploy_to_prod_workflow:
+    when:
+      and:
+        - equal: [ true, << pipeline.parameters.run_deploy_to_prod_workflow >> ]
+        - not:
+            equal: [ scheduled_pipeline, << pipeline.trigger_source >> ]
+    jobs:
+      - slack_deploy_approval:
+          <<: *only_on_tags
+          context: <% PROJECT_NAME >-dev
+          name: slack_deploy_approval
+          approval: true
+          environment: PROD
+      - approve_deploy_to_prod:
+          <<: *only_on_tags
+          type: approval
       - init_aws:
-          <<: *only_on_master_branch
+          <<: *only_on_tags
           context: <% PROJECT_NAME >-dev
           name: init_aws_prod
           aws_access_key_id: ${ECR_AWS_ACCESS_KEY_ID}
@@ -990,29 +1094,22 @@ workflows:
           update_kubeconfig: false
           requires:
             - approve_deploy_to_prod
-      - create_release:
-          <<: *only_on_master_branch
-          name: create_release
-          context: <% PROJECT_NAME >-prod
-          requires:
-            - bump_version
-            - approve_deploy_to_prod
       - init_aws:
-          <<: *only_on_master_branch
+          <<: *only_on_tags
           name: init_aws_eks_prod
           context: <% PROJECT_NAME >-prod
           job_type: 'eks_prod'
           requires:
             - init_aws_prod
       - upgrade_helm:
-          <<: *only_on_master_branch
+          <<: *only_on_tags
           name: deploy_to_prod
           context: <% PROJECT_NAME >-prod
           environment: prod
           requires:
             - init_aws_eks_prod
       - deploy_terraform:
-          <<: *only_on_master_branch
+          <<: *only_on_tags
           context: <% PROJECT_NAME >-prod
           name: deploy_terraform_newrelic_prod
           project: '<% PROJECT_NAME >'
@@ -1021,12 +1118,6 @@ workflows:
           apply: true
           requires:
             - deploy_to_prod
-      - promote_release:
-          <<: *only_on_master_branch
-          name: promote_release
-          context: <% PROJECT_NAME >-prod
-          requires:
-            - deploy_to_prod
 
   # You must go to project setting > triggers and add a trigger call remove_old_environments
   # in CircleCi. This should be set to be triggered at midnight or around that time.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "2.26.0",
+  "version": "2.27.0",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",