Merge pull request #491 from reactioncommerce/release-v2.0.0-rc.9

Release v2.0.0 rc.9

Author: spencern

.babelrc

@@ -1,8 +1,7 @@
 {
   "presets": [
-    ["next/babel", {
+    [ "next/babel", {
       "preset-env": {
-        "modules": "commonjs",
         "targets": {
           "node": "current",
           "browsers": [
@@ -11,31 +10,22 @@
           ]
         }
       }
-    }]
+    } ]
+  ],
+  "plugins": [
+    "babel-plugin-styled-components",
+    [ "module-resolver", { "root": [ "./src" ] } ],
+    [ "@babel/plugin-proposal-decorators", { "legacy": true } ],
+    [ "@babel/plugin-proposal-class-properties", { "loose": true } ]
   ],
   "env": {
-    "development": {
-      "plugins": [
-        "babel-plugin-styled-components",
-        ["module-resolver", {"root": ["./src", "./config"]}],
-        "transform-decorators-legacy",
-        "transform-class-properties"
-      ]
-    },
-    "production": {
-      "plugins": [
-        "babel-plugin-styled-components",
-        ["module-resolver", {"root": ["./src", "./config"]}],
-        ["@babel/plugin-proposal-decorators", { "legacy": true }],
-        ["@babel/plugin-proposal-class-properties", { "loose": true }]
-      ]
-    },
     "jesttest": {
       "plugins": [
         "babel-plugin-styled-components",
-        ["module-resolver", {"root": ["./src", "./config"]}],
-        ["@babel/plugin-proposal-decorators", { "legacy": true }],
-        ["@babel/plugin-proposal-class-properties", { "loose": true }]
+        [ "module-resolver", { "root": [ "./src" ] } ],
+        [ "@babel/plugin-proposal-decorators", { "legacy": true } ],
+        [ "@babel/plugin-proposal-class-properties", { "loose": true } ],
+        "dynamic-import-node"
       ]
     }
   }

.circleci/bin/ecs-deploy.sh

@@ -1,34 +1,67 @@
 #!/bin/bash
 
-sudo apt-get -y install python3-pip wget
+sudo apt-get -y install python3-pip wget jq
 sudo pip3 install awscli
 wget https://github.com/mikefarah/yq/releases/download/2.0.1/yq_linux_amd64 -O /tmp/yq
 sudo mv /tmp/yq /usr/local/bin/yq
 sudo chmod +x /usr/local/bin/yq
 
 if [ -z "${AWS_REGION}" ]; then
-	AWS_REGION=us-west-2
+        AWS_REGION=us-west-2
 fi
 
-if [ "${CLOUDFORMATION_AWS_ACCESS_KEY_ID}" ]; then
-	AWS_ACCESS_KEY_ID=${CLOUDFORMATION_AWS_ACCESS_KEY_ID}
-fi
+ENVIRONMENT=staging
+SERVICE_DIR_NAME=.reaction/devops/aws/services
+export storefront_CIRCLE_SHA1=$CIRCLE_SHA1
 
-if [ "${CLOUDFORMATION_AWS_SECRET_ACCESS_KEY}" ]; then
-	AWS_SECRET_ACCESS_KEY=${CLOUDFORMATION_AWS_SECRET_ACCESS_KEY}
-fi
+SERVICES=$(ls ${SERVICE_DIR_NAME})
+
+for SERVICE in $SERVICES; do
+        DISABLED=$(echo $SERVICE | grep disabled)
+        if [ "${DISABLED}" == "${SERVICE}" ]; then
+            continue
+        fi
+	echo "START PROCESSING SERVICE ${SERVICE}"
+
+	cd ${SERVICE_DIR_NAME}/${SERVICE}
+
+	PROPEL_CONFIG_FILE="propel-${ENVIRONMENT}.yaml"
+	if [ ! -f ${PROPEL_CONFIG_FILE} ]; then
+	    echo "Propel configuration file not found!"
+	    exit 1
+	fi
+
+	ENV_NAME_UPPERCASE=$(echo $ENVIRONMENT | awk '{print toupper($0)}')
+	AWS_ACCESS_KEY_ID_VAR_NAME=CLOUDFORMATION_${ENV_NAME_UPPERCASE}_AWS_ACCESS_KEY_ID
+	AWS_SECRET_ACCESS_KEY_VAR_NAME=CLOUDFORMATION_${ENV_NAME_UPPERCASE}_AWS_SECRET_ACCESS_KEY
+
+	if [ "${!AWS_ACCESS_KEY_ID_VAR_NAME}" ]; then
+		AWS_ACCESS_KEY_ID=${!AWS_ACCESS_KEY_ID_VAR_NAME}
+	fi
+
+	if [ "${!AWS_SECRET_ACCESS_KEY_VAR_NAME}" ]; then
+		AWS_SECRET_ACCESS_KEY=${!AWS_SECRET_ACCESS_KEY_VAR_NAME}
+	fi
 
+	mkdir -p ~/.aws
+	echo "[default]" > ~/.aws/credentials
+	echo "aws_access_key_id = ${AWS_ACCESS_KEY_ID}" >> ~/.aws/credentials
+	echo "aws_secret_access_key = ${AWS_SECRET_ACCESS_KEY}" >> ~/.aws/credentials
 
-mkdir ~/.aws
-echo "[default]" > ~/.aws/credentials
-echo "aws_access_key_id = ${AWS_ACCESS_KEY_ID}" >> ~/.aws/credentials
-echo "aws_secret_access_key = ${AWS_SECRET_ACCESS_KEY}" >> ~/.aws/credentials
+	echo "[default]" > ~/.aws/config
+	echo "region = ${AWS_REGION}" >> ~/.aws/config
 
-echo "[default]" > ~/.aws/config
-echo "region = ${AWS_REGION}" >> ~/.aws/config
+	echo Running aws s3 cp s3://${S3_PROPEL_ARTIFACTS_BUCKET}/propel-linux-amd64 ./propel
+	aws s3 cp s3://${S3_PROPEL_ARTIFACTS_BUCKET}/propel-linux-amd64 ./propel
 
-aws s3 cp --recursive s3://${S3_ECS_DEPLOY_BUCKET}/staging/devops .
+	sudo mv propel /usr/local/bin/propel
+	sudo chmod +x /usr/local/bin/propel
 
-find aws -name \*sh | xargs chmod +x
-cd aws/app-starterkit
-./update-app-stack.sh sk-service
+	RELEASE_DESCRIPTION="CircleCI build URL: ${CIRCLE_BUILD_URL}"
+        echo storefront_CIRCLE_SHA1=$storefront_CIRCLE_SHA1
+        propel release create --deploy --descr "${RELEASE_DESCRIPTION}" -f ${PROPEL_CONFIG_FILE}
+	
+	echo "END PROCESSING SERVICE ${SERVICE}"
+	
+	cd -
+done

.circleci/config.yml

@@ -197,22 +197,6 @@ jobs:
               --name reactionapp_next_starterkit \
               "$DOCKER_REPOSITORY:$CIRCLE_SHA1" \
               yarn run test:ci
-      - run:
-          name: Integration Test
-          command: |
-            docker run \
-              --env-file docker-cache/.env \
-              --name reactionapp_next_starterkit_int \
-              "$DOCKER_REPOSITORY:$CIRCLE_SHA1" \
-              yarn run test:integration
-      # - run:
-      #     name: Install Broken Link Checker
-      #     command: |
-      #       yarn add broken-link-checker
-      # - run:
-      #     name: Broken Link Test
-      #     command: |
-      #       ./node_modules/.bin/blc ${STAGING_URL} -ro -filter=3 -e
       - run:
           name: Copy test artifacts from Remote Docker
           command: |
@@ -224,6 +208,29 @@ jobs:
       - store_artifacts:
           path: reports
 
+  e2e-test:
+    <<: *defaults
+    steps:
+      - setup_remote_docker
+      - attach_workspace:
+          at: docker-cache
+      - run:
+          name: Load Docker Image
+          command: |
+            docker load < docker-cache/docker-image.tar
+      - run:
+          name: Integration Test
+          command: |
+            docker run -e URL=${STAGING_URL} --env-file docker-cache/.env --name reaction_app_next_starterkit "$DOCKER_REPOSITORY:$CIRCLE_SHA1" yarn run test:integration
+      - run:
+          name: Install Broken Link Checker
+          command: |
+            yarn add broken-link-checker
+      - run:
+          name: Broken Link Test
+          command: |
+            ./node_modules/.bin/blc ${STAGING_URL} -ro -filter=3 -e
+
   snyk-security:
     <<: *defaults
     steps:
@@ -278,4 +285,8 @@ workflows:
             - docker-push
           filters:
             branches:
-              only: /^master$/
+              only: /^develop$/
+      - e2e-test:
+          requires: 
+            - deploy-to-ecs
+            

.env.example

@@ -1,20 +1,19 @@
-NODE_ENV=development
-INTERNAL_GRAPHQL_URL=http://reaction.api.reaction.localhost:3000/graphql-alpha
+CANONICAL_URL=http://localhost:4000
+ENABLE_SPA_ROUTING=true
 EXTERNAL_GRAPHQL_URL=http://localhost:3000/graphql-alpha
-FAVICON_URL=https://assets.reactioncommerce.com/favicon
-PLACEHOLDER_IMAGE_URL_GALLERY=/resources/placeholder.gif
-PLACEHOLDER_IMAGE_URL_GRID=/resources/placeholder.gif
-SEGMENT_ANALYTICS_SKIP_MINIMIZE=true
-SEGMENT_ANALYTICS_WRITE_KEY=ENTER_KEY_HERE
-KEYCLOAK_REALM=default
-KEYCLOAK_CLIENT_ID=reaction-next-starterkit
-KEYCLOAK_URL=http://localhost:8080/auth
-KEYCLOAK_REDIRECT_URI=http://localhost:4000/auth
-STRIPE_PUBLIC_API_KEY=ENTER_STRIPE_PUBLIC_KEY_HERE
+INTERNAL_GRAPHQL_URL=http://reaction.api.reaction.localhost:3000/graphql-alpha
+NODE_ENV=development
+OAUTH2_ADMIN_PORT=4445
 OAUTH2_AUTH_URL=http://localhost:4444/oauth2/auth
-OAUTH2_TOKEN_URL=http://hydra:4444/oauth2/token
 OAUTH2_CLIENT_ID=reaction-next-starterkit
 OAUTH2_CLIENT_SECRET=CHANGEME
+OAUTH2_HOST=hydra.auth.reaction.localhost
+OAUTH2_IDP_HOST_URL=http://reaction.api.reaction.localhost:3000/
 OAUTH2_REDIRECT_URL=http://localhost:4000/callback
-PASSPORT_SESSION_SECRET=CHANGEME
-CANONICAL_URL=http://example.com
+OAUTH2_TOKEN_URL=http://hydra.auth.reaction.localhost:4444/oauth2/token
+PORT=4000
+SEGMENT_ANALYTICS_SKIP_MINIMIZE=true
+SEGMENT_ANALYTICS_WRITE_KEY=ENTER_KEY_HERE
+SESSION_MAX_AGE_MS=2592000000
+SESSION_SECRET=CHANGEME
+STRIPE_PUBLIC_API_KEY=ENTER_STRIPE_PUBLIC_KEY_HERE

.eslintignore

@@ -1 +1,3 @@
+build/*
+node_modules/*
 reports/*

.gitignore

@@ -3,7 +3,8 @@
 .vscode
 .idea
 .c9
-.env
+.env*
+!.env.example*
 *.csv
 *.dat
 *.gz

.graphqlrc

@@ -1,5 +1,5 @@
 {
   "request": {
-    "url": "http://localhost:3030/graphql-alpha"
+    "url": "http://localhost:3000/graphql-alpha"
   }
 }

.reaction/devops/aws/services/service-storefront/propel-staging.yaml

@@ -0,0 +1,43 @@
+environment:
+  name: staging
+  service:
+    name: sk-storefront
+    cluster: core
+    certificate_arn: arn:aws:acm:us-west-2:773713188930:certificate/c2979a7a-7b84-43ed-b3a7-24b0256a1b9f
+    root_domain: staging.reactioncommerce.com
+    dns_name: storefront
+    desired_task_count: 1
+    min_task_count: 0
+    max_task_count: 8
+    min_healthy_percent: 100
+    max_percent: 200
+    alb_listener_port: 80
+    alb_listener_path: /
+    alb_health_check_path: /
+    task-definition:
+      name: staging-storefront
+      containers:
+      - name: storefront
+        cpu: 500
+        memory: 1800
+        port_mappings:
+        - container_port: 4000
+          host_port: 4000
+        image: reactioncommerce/reaction-next-starterkit
+        image_tag: develop
+        env_params:
+        - name: INTERNAL_GRAPHQL_URL
+        - name: EXTERNAL_GRAPHQL_URL
+        - name: FAVICON_URL
+        - name: PLACEHOLDER_IMAGE_URL_GALLERY
+        - name: PLACEHOLDER_IMAGE_URL_GRID
+        - name: SEGMENT_ANALYTICS_SKIP_MINIMIZE
+        - name: SEGMENT_ANALYTICS_WRITE_KEY
+        - name: STRIPE_PUBLIC_API_KEY
+        - name: OAUTH2_AUTH_URL
+        - name: OAUTH2_TOKEN_URL
+        - name: OAUTH2_CLIENT_ID
+        - name: OAUTH2_CLIENT_SECRET
+        - name: OAUTH2_REDIRECT_URL
+        - name: PASSPORT_SESSION_SECRET
+        - name: CANONICAL_URL

.yarnrc .reaction/yarnrc-docker.template.yarnrc renamed to .reaction/yarnrc-docker.template

@@ -2,16 +2,8 @@
 version: v1.12.0
 # ignores vulnerabilities until expiry date; change duration by modifying expiry date
 ignore:
-  'npm:braces:20180219':
-    - '*':
-        reason: Waiting for Next.js 6 to update to Babel 7 beta.47 (https://github.com/babel/babel/issues/8034)
-        expires: 2018-09-30T00:00:00.000Z
   'npm:chownr:20180731':
     - '*':
-        reason: Waiting on next-routes(https://github.com/fridays/next-routes) to fix this vulnerability
-        expires: 2018-09-30T00:00:00.000Z
-  'npm:mem:20180117':
-    - '*':
-        reason: Waiting on next-routes(https://github.com/fridays/next-routes) to fix this vulnerability
-        expires: 2018-09-30T00:00:00.000Z
+        reason: This vulnerability only affects packages used in development, such as webpack, more details at https://github.com/isaacs/chownr/issues/14#issuecomment-421662375
+        expires: 2019-01-31T00:00:00.000Z
 patch: {}