ci(storybook): Auto-deploy Storybook to storybook.core-patch (#4590)

fredboyle · web-flow · commit 2e18625c9f72 · 2021-03-10T11:13:05.000-08:00
* ci(api): Tweak to address API update on tag (#4585)
* ci(build): Fix Storybook build output path
* ci(build): Add needed files
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -56,15 +56,10 @@ commands:
             export CURRENT_DEFAULT_BRANCH=`git remote show origin | grep "HEAD branch" | cut -d ":" -f 2 | xargs`
             echo 'export HEROKU_RELEASE_STORYBOOK_APP_NAME=false' >> $BASH_ENV
             if [[ "${CIRCLE_BRANCH}" = "${CURRENT_DEFAULT_BRANCH}" ]] ; then
-              if [[ "${CIRCLE_TAG}" =~ ^v\d+\.\d+\.\d+-.+$ ]] ; then
-                echo "Publishing to CORE-MAIN..."
-                echo 'export HEROKU_APP_NAME=${HEROKU_APP_CORE_MAIN}' >> $BASH_ENV
-              else
-                echo "Publishing to UPCOMING..."
-                echo 'export HEROKU_APP_NAME=${HEROKU_APP_UPCOMING}' >> $BASH_ENV
-                echo 'export HEROKU_RELEASE_STORYBOOK_APP_NAME=storybook-upcoming' >> $BASH_ENV
-              fi
-            elif [[ "${CIRCLE_TAG}" =~ ^v\d+\.\d+\.\d+$ ]] ; then
+              echo "Publishing to UPCOMING..."
+              echo "Publishing to CORE-MAIN..."
+              echo 'export HEROKU_APP_NAME=${HEROKU_APP_CORE_MAIN}' >> $BASH_ENV
+            elif [[ ${CIRCLE_TAG} =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] ; then
               echo "Publishing to CORE-PATCH..."
               echo 'export HEROKU_APP_NAME=${HEROKU_APP_CORE_PATCH}' >> $BASH_ENV
               echo 'export HEROKU_RELEASE_STORYBOOK_APP_NAME=storybook-core-patch' >> $BASH_ENV
@@ -157,7 +152,7 @@ commands:
           command: 'tar -xvf workspace/storybook.tar.gz'
       - run:
           name: Start server
-          command: 'npx http-server .out'
+          command: 'npx http-server .www'
           background: true
       - run:
           name: Poll until server is up
@@ -275,7 +270,7 @@ jobs:
             export VERSION_FROM_TAG=$([[ ${CIRCLE_TAG} -eq "v" ]] && echo ${CIRCLE_TAG:1:20} || echo ${CIRCLE_TAG})
             export SALESFORCE_VERSION=$(cat package.json | jq -r .slds.id)
             export VERSION_FROM_PACKAGE=$(cat package.json | jq -r .version)
-            curl --location --request PATCH 'https://design-systems-api.herokuapp.com/v1/release' \
+            curl --location --request PATCH 'https://api.lightningdesignsystem.com/v1/release' \
             --header 'Content-Type: application/json' \
             --header 'Authorization: Bearer ${DSE_API_RELEASE_TOKEN}' \
             --data-raw '{
@@ -300,24 +295,9 @@ jobs:
           name: Build static Storybook
           command: 'npm run storybook:build'
 
-      - run:
-          name: 'Generate custom Nginx config'
-          command: |
-            cat > nginx_app.conf\<<'EOF'
-            # Redirect all non-SSL requests
-            if ($http_x_forwarded_proto != 'https') {
-              return 301 https://$host$request_uri;
-            }
-
-            location / {
-              index  index.php index.html index.htm;
-            }
-            EOF
-            cat nginx_app.conf
-
       - run:
           name: Archive static Storybook
-          command: 'tar -czvf workspace/storybook.tar.gz .out/ Procfile composer.json nginx_app.conf'
+          command: 'tar -czvf workspace/storybook.tar.gz .www/ Procfile config/nginx.conf.erb heroku-start.sh app.json'
 
       - persist_to_workspace:
           root: workspace
@@ -361,7 +341,7 @@ jobs:
             echo "=============================="
             echo ${PUBLISH_STORYBOOK_TO}
             echo "=============================="
-            heroku buildpacks -a ${PUBLISH_STORYBOOK_TO} | grep "heroku/php" || heroku buildpacks:set heroku/php -a ${PUBLISH_STORYBOOK_TO}
+            heroku buildpacks -a ${PUBLISH_STORYBOOK_TO} | grep "https://github.com/salesforce-ux/heroku-buildpack-nginx.git#dse" || heroku buildpacks:set https://github.com/salesforce-ux/heroku-buildpack-nginx.git#dse -a ${PUBLISH_STORYBOOK_TO}
             heroku builds:create --source-tar workspace/storybook.tar.gz -a ${PUBLISH_STORYBOOK_TO}
 
       - install-gh-cli
@@ -417,20 +397,7 @@ jobs:
       - run:
           name: 'Generate site tarball'
           command: |
-            echo '{}' > composer.json
-            echo 'web: vendor/bin/heroku-php-nginx -C nginx_app.conf .www' > Procfile
-            cat > nginx_app.conf\<<'EOF'
-            # Redirect all non-SSL requests
-            if ($http_x_forwarded_proto != 'https') {
-              return 301 https://$host$request_uri;
-            }
-
-            location / {
-              index  index.php index.html index.htm;
-            }
-            EOF
-            cat nginx_app.conf
-            tar -czvf site-next.tar.gz .www/ Procfile composer.json nginx_app.conf
+            tar -czvf site-next.tar.gz .www/ Procfile config/nginx.conf.erb heroku-start.sh app.json
 
       - run:
           name: 'Deploy to Heroku app'
@@ -439,7 +406,7 @@ jobs:
             echo "=============================="
             echo ${HEROKU_APP_NAME}
             echo "=============================="
-            heroku buildpacks -a ${HEROKU_APP_NAME} | grep "heroku/php" || heroku buildpacks:set heroku/php -a ${HEROKU_APP_NAME}
+            heroku buildpacks -a ${HEROKU_APP_NAME} | grep "https://github.com/salesforce-ux/heroku-buildpack-nginx.git#dse" || heroku buildpacks:set https://github.com/salesforce-ux/heroku-buildpack-nginx.git#dse -a ${HEROKU_APP_NAME}
             heroku builds:create --source-tar site-next.tar.gz -a ${HEROKU_APP_NAME}
 
       - install-gh-cli
@@ -538,10 +505,10 @@ workflows:
           context: ux-eng-keys
           requires:
             - framework-build
-          # only on the main version branches with a public release tag (X.X.X)
+          # update for all tagged versions (X.X.X[-*])
           filters:
             tags:
-              only: /^v\d+\.\d+\.\d+$/
+              only: /^v\d+\.\d+\.\d+.*/
             branches:
               ignore: /.*/
       - vrt-desktop:
diff --git a/Procfile b/Procfile
@@ -1 +1 @@
-web: vendor/bin/heroku-php-nginx -C nginx_app.conf .out
+web: ./heroku-start.sh
diff --git a/app.json b/app.json
@@ -5,6 +5,19 @@
   "env": {},
   "formation": {},
   "addons": [],
-  "buildpacks": [],
-  "stack": "heroku-18"
+  "buildpacks": [
+    {
+      "url": "https://github.com/salesforce-ux/heroku-buildpack-nginx.git#dse"
+    }
+  ],
+  "stack": "heroku-20",
+  "environments": {
+    "review": {
+      "buildpacks": [
+        {
+          "url": "https://github.com/salesforce-ux/heroku-buildpack-nginx.git#dse"
+        }
+      ]
+    }
+  }
 }
diff --git a/config/nginx.conf.erb b/config/nginx.conf.erb
@@ -0,0 +1,108 @@
+daemon off;
+# Heroku dynos have at least 4 cores
+worker_processes <%= ENV['NGINX_WORKERS'] || 4 %>;
+events {
+  use epoll;
+  accept_mutex on;
+  worker_connections <%= ENV['NGINX_WORKER_CONNECTIONS'] || 1024 %>;
+}
+
+http {
+  gzip on;
+  gzip_comp_level 2;
+  gzip_min_length 512;
+
+  server_tokens off;
+
+  log_format main '$time_iso8601 - $status $request - client IP: $http_x_forwarded_for - <%= ENV['DYNO'] %> to $upstream_addr - upstream status: $upstream_status, upstream_response_time $upstream_response_time, request_time $request_time';
+  access_log /dev/stdout main;
+  error_log /dev/stdout notice;
+  log_not_found on;
+  include mime.types;
+
+  default_type application/octet-stream;
+  sendfile on;
+
+  # Must read the body in 5 seconds.
+  client_body_timeout <%= ENV['NGINX_CLIENT_BODY_TIMEOUT'] || 5 %>;
+
+  # handle SNI
+  proxy_ssl_server_name on;
+  # resolver needs to be set because we're using dynamic proxy_pass
+  resolver 8.8.8.8;
+
+  # map possible Vouch destinations
+  map $host $vouch_destination {
+    default           vouch.lightningdesignsystem.com;
+  }
+
+  server {
+    listen <%= ENV["PORT"] %>;
+    server_name *.herokuapp.com;
+
+    error_page 404 /404.html;
+
+    port_in_redirect off;
+
+    # Redirect all non-SSL requests
+    if ($http_x_forwarded_proto != 'https') {
+      return 301 https://$host$request_uri;
+    }
+
+    root /app/.www;
+
+    location / {
+        index  index.html index.htm;
+    }
+  }
+
+  server {
+    listen <%= ENV["PORT"] %>;
+    server_name ~^storybook\..*\.lightningdesignsystem\.com$;
+
+    error_page 404 /404.html;
+
+    port_in_redirect off;
+
+    # Redirect all non-SSL requests
+    if ($http_x_forwarded_proto != 'https') {
+      return 301 https://$host$request_uri;
+    }
+
+    # auth request / SSO
+    auth_request /validate;
+
+    location = /validate {
+        # This address is where Vouch will be listening on
+        proxy_pass https://$vouch_destination/validate;
+        proxy_pass_request_body off; # no need to send the POST body
+
+        proxy_ssl_name $vouch_destination;
+        proxy_set_header x-forwarded-host $host;
+        proxy_set_header Host $vouch_destination;
+        proxy_set_header Content-Length "";
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+
+        # these return values are passed to the @error401 call
+        auth_request_set $auth_resp_jwt $upstream_http_x_vouch_jwt;
+        auth_request_set $auth_resp_err $upstream_http_x_vouch_err;
+        auth_request_set $auth_resp_failcount $upstream_http_x_vouch_failcount;
+    }
+
+    # if validate returns `401 not authorized` then forward the request to the error401block
+    error_page 401 = @error401;
+
+    # If the user is not logged in, redirect them to Vouch's login URL
+    location @error401 {
+        return 302 https://$vouch_destination/login?url=https://$http_host$request_uri&vouch-failcount=$auth_resp_failcount&X-Vouch-Token=$auth_resp_jwt&error=$auth_resp_err;
+    }
+
+    root /app/.www;
+
+    location / {
+      index  index.html index.htm;
+    }
+  }
+}
diff --git a/heroku-start.sh b/heroku-start.sh
@@ -0,0 +1 @@
+bin/start-nginx-solo
diff --git a/package.json b/package.json
@@ -217,7 +217,7 @@
     "compile-aura-tokens-map": "npm run gulp -- generate:auraTokensMap",
     "compile-token-component-map": "npm run gulp -- generate:tokenComponentMap",
     "storybook:heroku": "npm run storybook:prepare && start-storybook -c .storybook -p 9002",
-    "storybook:build": "npm run storybook:prepare && build-storybook -c .storybook -s .dist/ -o .out",
+    "storybook:build": "npm run storybook:prepare && build-storybook -c .storybook -s .dist/ -o .www",
     "release-notes:compile": "node ./scripts/release-notes/index.js",
     "release-notes:hook": "node ./scripts/release-notes/hook.js",
     "heroku-postbuild": "npm run build && npm run dist && npm run storybook:build"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-web: vendor/bin/heroku-php-nginx -C nginx_app.conf .out`
	`1`	`+web: ./heroku-start.sh`