Merge pull request #15820 from github/repo-sync

repo sync

Author: Octomerger

.github/workflows/azure-preview-env-deploy.yml

@@ -34,7 +34,7 @@ permissions:
 
 # This allows one deploy workflow to interrupt another
 concurrency:
-  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label }}'
+  group: 'preview-env @ ${{ github.head_ref || github.run_id }}'
   cancel-in-progress: true
 
 jobs:

.github/workflows/azure-preview-env-destroy.yml

@@ -19,6 +19,11 @@ on:
 permissions:
   contents: read
 
+# This allows one deploy workflow to interrupt another
+concurrency:
+  group: 'preview-env @ ${{ github.head_ref || github.run_id }}'
+  cancel-in-progress: true
+
 jobs:
   destory-azure-preview-env:
     name: Destroy

middleware/index.js

@@ -76,7 +76,7 @@ const asyncMiddleware = (fn) => (req, res, next) => {
 }
 
 // The IP address that Fastly regards as the true client making the request w/ fallback to req.ip
-morgan.token('client-ip', (req) => req.headers['Fastly-Client-IP'] || req.ip)
+morgan.token('client-ip', (req) => req.headers['fastly-client-ip'] || req.ip)
 const productionLogFormat = `:client-ip - ":method :url" :status - :response-time ms`
 
 export default function (app) {