eip-s3-deploy 2.1.2 → 2.2.1

package/deploy.js

@@ -1,176 +1,281 @@
 #!/usr/bin/env node
 
-/**
- * --------------
- * DATE:            2020-06-18 @ 11:54
- * AUTHOR:          ollie
- * ORIGINAL NAME:   /./deploy
- * --------------
- * Created for the olivers-tools
- */
-
-const aws = require ( 'aws-sdk' );
 const path = require ( 'path' );
-const _ = require ( 'lodash' );
+const { s3 } = require ( 'eip-cloud-services' );
 const fs = require ( 'fs' ).promises;
-const s3 = new aws.S3 ( { region: 'eu-west-1' } );
-const cf = new aws.CloudFront ( { region: 'eu-west-1' } );
+const crypto = require ( 'crypto' );
 const recursive = require ( 'recursive-readdir' );
-const md5File = require ( 'md5-file' );
 const handlebars = require ( 'handlebars' );
 const mime = require ( 'mime' );
 const progress = require ( 'cli-progress' );
-const args = require ( 'minimist' ) ( process.argv.slice ( 2 ) );
+
+const COMMAND_OPTIONS = [ '-f', '--force', '-ff', '--folderFilter', '-e', '--env', '-v', '--verbose' ];
+const forceRedeploy = process.argv.includes ( '-f' ) || process.argv.includes ( '--force' );
+const verboseOutput = process.argv.includes ( '-v' ) || process.argv.includes ( '--verbose' );
+
+const getCommandOptions = ( options ) => {
+    const optionIndex = process.argv.findIndex ( arg => options.includes ( arg ) );
+    if ( optionIndex === -1 ) {
+        return null;
+    }
+
+    const option = process.argv[ optionIndex ];
+    const value = process.argv[ optionIndex + 1 ];
+
+    if ( !value || COMMAND_OPTIONS.includes ( value ) ) {
+        usage ( `Option "${option}" requires a value` );
+    }
+
+    return value;
+};
+
+const folderFilter = getCommandOptions ( [ '-ff', '--folderFilter' ] );
+const environment = getCommandOptions ( [ '-e', '--env' ] ) || process.argv[ 2 ];
 
 const loadDeploymentLock = async () => fs.access ( process.cwd () + '/deployment.lock' )
     .then ( () => fs.readFile ( path.join ( process.cwd (), 'deployment.lock' ), 'utf8' ) )
-    .then ( json => JSON.parse ( json )[ args._[ 0 ] ] || ( {} ) )
+    .then ( json => JSON.parse ( json )[ environment ] || ( {} ) )
     .catch ( () => ( {} ) );
 
 const writeDeploymentLock = async ( deploymentHash ) => fs.access ( process.cwd () + '/deployment.lock' )
     .then ( () => fs.readFile ( path.join ( process.cwd (), 'deployment.lock' ), 'utf8' ) )
     .then ( json => {
         const previousHash = JSON.parse ( json );
-        previousHash[ args._[ 0 ] ] = previousHash[ args._[ 0 ] ] ? _.merge ( previousHash[ args._[ 0 ] ], deploymentHash ) : deploymentHash;
+        previousHash[ environment ] = previousHash[ environment ] ? { ...previousHash[ environment ], ...deploymentHash } : deploymentHash;
         
         return fs.writeFile ( path.join ( process.cwd (), 'deployment.lock' ), JSON.stringify ( previousHash, null, 2 ) );
     } )
     .catch ( () => {
-        const newHash = _.stubObject ();
-        newHash[ args._[ 0 ] ] = deploymentHash;
+        const newHash = {};
+        newHash[ environment ] = deploymentHash;
         
         return fs.writeFile ( path.join ( process.cwd (), 'deployment.lock' ), JSON.stringify ( newHash, null, 2 ) );
     } );
 
+const calculateMD5 = async ( filePath ) => {
+    const content = await fs.readFile ( filePath );
+    
+    return crypto.createHash ( 'md5' ).update ( content ).digest ( 'hex' );
+};
+
 const deploy = async () => {
-    const files = await fs.readdir ( process.cwd () );
-    let deployConfName;
 
-    if ( files.find ( f => f === 'deployConf.cjs' ) )
-        deployConfName = 'deployConf.cjs';
-    else
-        deployConfName = 'deployConf.js';
+    if ( process.argv.length <= 2 || process.argv.includes ( '--help' ) || process.argv.includes ( '-h' ) || process.argv.includes ( 'help' ) ) {
+        showHelp ();
+        
+        return;
+    }
 
-    const config = require ( path.join ( process.cwd (), deployConfName ) )[ args._[ 0 ] ];
-    const promiseChain = _.stubObject ();
+    try {
+        const files = await fs.readdir ( process.cwd () );
+        let deployConfName;
 
-    if ( !config ) {
-        process.stdout.write ( '\x1b[38;5;196mThe environment specified cannot be found in the deployConfig.js file.\x1b[0m\n' );
-        process.exit ( 0 );
-    }
+        if ( files.find ( f => f === 'deployConf.cjs' ) )
+            deployConfName = 'deployConf.cjs';
+        else
+            deployConfName = 'deployConf.js';
+
+        const parentConfig = require ( path.join ( process.cwd (), deployConfName ) );
+        const config = require ( path.join ( process.cwd (), deployConfName ) )[ environment ];
+        if ( typeof config.bucket === 'string' ) config.bucket = [ config.bucket ];
+        if ( typeof config.folder === 'string' ) config.folder = [ config.folder ];
+        const promiseChain = {};
+
+        if ( !config ) {
+            process.stdout.write ( '\x1b[38;5;196mThe environment specified cannot be found in the deployConfig.js file.\x1b[0m\n' );
+            process.exit ( 0 );
+        }
+        if ( !parentConfig.version || parentConfig.version !== 2 ) {
+            process.stdout.write ( '\x1b[38;5;196mThere is a deployConf.js file however it\'s not using the latest version please update your config to version 2.\x1b[0m\n' );
+            process.stdout.write ( '\x1b[38;5;214mHere is an example deployConf.js to assist:\x1b[0m - https://cf.eip.telegraph.co.uk/testFolder/example.html\n' );        
+            process.exit ( 0 );
+        }
+        if ( ![ 'bucket', 'folder', 'cache' ].every ( key => Object.keys ( config ).includes ( key ) ) ){
+            process.stdout.write ( '\x1b[38;5;214mThere is a deployConf.js file however it\'s not structured correctly, please make sure you\'ve got the correct attributes.\x1b[0m\n' );
+            process.stdout.write ( '\x1b[38;5;190mHere is an example deployConf.js to assist:\x1b[0m - https://cf.eip.telegraph.co.uk/testFolder/example.html\n' );        
+            process.exit ( 0 );
+        }
 
-    process.stdout.write ( '-------------------\n' );
-    process.stdout.write ( '\x1b[38;5;214mINITIATING DEPLOYMENT TO:\x1b[0m \x1b[38;5;190m' + args._[ 0 ] + '\n' );
-    process.stdout.write ( '\x1b[38;5;214m📁 Copying contents of:\x1b[0m \x1b[38;5;190m' + ( config.targetFolder ? process.cwd () + '/' + config.targetFolder : process.cwd () ) + ( args._[ 1 ] ? '/' + args._[ 1 ] : '' ) + '\x1b[0m\n' );
-    process.stdout.write ( '\x1b[38;5;214m🗑  to S3 Bucket/Folder:\x1b[0m \x1b[38;5;190m' + config.Bucket + '/' + ( config.Folder || '' ) + ( args._[ 1 ] ? args._[ 1 ] + '/' : '' ) + '\x1b[0m\n' );
-    process.stdout.write ( '\x1b[38;5;214m☁️  CloudFront CDN Invalidation:\x1b[0m ' + ( config.cdnId ? '\x1b[38;5;190mYES (' + config.cdnId + ')' : '\x1b[38;5;9mNO' ) + '\x1b[0m\n' );
-    if ( args._[ 1 ] ) process.stdout.write ( '\x1b[38;5;214m📂 Custom Deploy Folder Selected:\x1b[0m \x1b[38;5;190m' + args._[ 1 ] + '\x1b[0m\n' );
-    if ( args.f ) {
         process.stdout.write ( '-------------------\n' );
-        process.stdout.write ( '\x1b[38;5;196m🔥 FORCING DEPLOYMENT - Deployment.lock will be ignored. 🔥\x1b[0m\n' );
-    }
-    process.stdout.write ( '-------------------\n' );
+        process.stdout.write ( '\x1b[38;5;214mINITIATING FILE DEPLOYMENT TO:\x1b[0m \x1b[38;5;190m' + environment + '\n' );
+        process.stdout.write ( '\x1b[38;5;214m📁 Copying contents of:\x1b[0m \x1b[38;5;190m' + ( config.targetFolder ? process.cwd () + '/' + config.targetFolder : process.cwd () ) + ( folderFilter ? '/' + folderFilter : '' ) + '\x1b[0m\n' );
+        config.bucket.forEach ( ( bucket, i ) => {
+            process.stdout.write ( '\x1b[38;5;214m🗑  to S3 Bucket/Folder:\x1b[0m \x1b[38;5;190m' + bucket + '/' + ( config.folder[ i ] || '' ) + ( folderFilter ? '/' + folderFilter + '/' : '' ) + '\x1b[0m\n' );
+        } );
+        process.stdout.write ( '\x1b[38;5;214m☁️  CloudFront CDN Invalidation:\x1b[0m ' + ( config.cdnId ? '\x1b[38;5;190mYES (' + config.cdnId + ')' : '\x1b[38;5;9mNO' ) + '\x1b[0m\n' );
+        if ( folderFilter ) {
+            process.stdout.write ( '-------------------\n' );
+            process.stdout.write ( '\x1b[38;5;214m📂 Folder Filter Applied:\x1b[0m \x1b[38;5;190m' + folderFilter + '\x1b[0m\n' );
+        }
+        if ( forceRedeploy ) {
+            process.stdout.write ( '-------------------\n' );
+            process.stdout.write ( '\x1b[38;5;196m🔥 FORCING DEPLOYMENT - deployment.lock will be ignored. 🔥\x1b[0m\n' );
+        }
+        process.stdout.write ( '-------------------\n' );
 
-    let scanDirectory = path.resolve ( config.targetFolder && config.targetFolder !== '' ? `${ process.cwd () }/${ config.targetFolder }` : process.cwd () );
-    if ( args._[ 1 ] ) scanDirectory = path.join ( scanDirectory, args._[ 1 ] );
+        const scanDirectory = path.resolve ( config.targetFolder && config.targetFolder !== '' ? `${ process.cwd () }/${ config.targetFolder }` : process.cwd () );
+        
+        let scannedFiles = await recursive ( scanDirectory, [ ...( config.omit || [] ), 'deployment.lock' ] );
+        const deploymentLock = await loadDeploymentLock ();
 
-    const scannedFiles = await recursive ( scanDirectory, _.concat ( config.Omit || [], [ 'deployment.lock' ] ) );
-    const deploymentLock = await loadDeploymentLock ();
+        if ( folderFilter ) scannedFiles = scannedFiles.filter ( filepath => filepath.includes ( `${ scanDirectory }/${ folderFilter }` ) );
 
-    promiseChain.changedFiles = promiseChain.newFiles = 0;
-    promiseChain.deploymentHash = _.stubObject ();
+        promiseChain.changedFiles = promiseChain.newFiles = 0;
+        promiseChain.deploymentHash = {};
 
-    const filesToUpload = _.compact ( _.map ( scannedFiles, filename => {
-        promiseChain.deploymentHash[ _.replace ( filename, process.cwd (), '' ) ] = md5File.sync ( filename );
-        if ( _.has ( deploymentLock, _.replace ( filename, process.cwd (), '' ) ) ) {
-            if ( deploymentLock[ _.replace ( filename, process.cwd (), '' ) ] === promiseChain.deploymentHash[ _.replace ( filename, process.cwd (), '' ) ] ) {
-                return null;
-            }
-            promiseChain.changedFiles++;
+        const filesToUpload = ( await Promise.all ( scannedFiles.map ( async filename => {
+            const md5Hash = await calculateMD5 ( filename );
+            promiseChain.deploymentHash[ filename.replace ( process.cwd (), '' ) ] = md5Hash;
+            if ( Object.prototype.hasOwnProperty.call ( deploymentLock, filename.replace ( process.cwd (), '' ) ) ) {
+                if ( deploymentLock[ filename.replace ( process.cwd (), '' ) ] === md5Hash ) {
+                    if ( verboseOutput ) process.stdout.write ( '\x1b[38;5;245mNo Change: ' + filename + '\x1b[0m\n' );
+                    
+                    return null;
+                }
+                if ( verboseOutput ) process.stdout.write ( '\x1b[38;5;172mChange: ' + filename + '\x1b[0m\n' );
+                promiseChain.changedFiles++;
             
-            return filename;
-        }
-        promiseChain.newFiles++;
+                return filename;
+            }
+            if ( verboseOutput ) process.stdout.write ( '\x1b[38;5;64mChange: ' + filename + '\x1b[0m\n' );
+            promiseChain.newFiles++;
         
-        return filename;
-    } ) );
-
-    process.stdout.write ( `📗 ${ args.f ? scannedFiles.length : promiseChain.newFiles } new files | 📙 ${ args.f ? 0 : promiseChain.changedFiles } updated files | 📕 ${ args.f ? 0 : scannedFiles.length - filesToUpload.length } unchanged files\n` );
-    process.stdout.write ( '-------------------\n' );
+            return filename;
+        } ) ) ).filter ( Boolean );
+        if ( verboseOutput ) process.stdout.write ( '-------------------\n' );
 
-    if ( ( args.f ? scannedFiles.length : filesToUpload.length ) === 0 ) {
-        process.stdout.write ( '\x1b[38;5;190mNothing to deploy\x1b[0m (you can force redeploy using the \'-f\' option)\n' );
+        process.stdout.write ( `📗 ${ forceRedeploy ? scannedFiles.length : promiseChain.newFiles } new files | 📙 ${ forceRedeploy ? 0 : promiseChain.changedFiles } updated files | 📕 ${ forceRedeploy ? 0 : scannedFiles.length - filesToUpload.length } unchanged files\n` );
         process.stdout.write ( '-------------------\n' );
+
+        if ( ( forceRedeploy ? scannedFiles.length : filesToUpload.length ) === 0 ) {
+            process.stdout.write ( '\x1b[38;5;190mNothing to deploy\x1b[0m (you can force redeploy using the \'-f\' option)\n' );
+            process.stdout.write ( '-------------------\n' );
         
-        return;
-    }
+            return;
+        }
 
-    const progressBar = new progress.SingleBar ( {
-        format: '\x1b[38;5;214m🚀 Deploying [\x1b[38;5;190m{bar}\x1b[0m\x1b[38;5;214m] {percentage}% | ETA: {eta}s | {value}/{total}',
-        barCompleteChar: '#',
-        barIncompleteChar: '-',
-        barGlue: '\x1b[38;5;214m',
-        etaBuffer: 10000,
-        etaAsynchronousUpdate: true
-    } );
-    progressBar.start ( args.f ? scannedFiles.length : filesToUpload.length );
+        const progressBar = new progress.SingleBar ( {
+            format: '\x1b[38;5;214m🚀 Deploying [\x1b[38;5;190m{bar}\x1b[0m\x1b[38;5;214m] {percentage}% | ETA: {eta}s | {value}/{total}',
+            barCompleteChar: '#',
+            barIncompleteChar: '-',
+            barGlue: '\x1b[38;5;214m',
+            etaBuffer: 10000,
+            etaAsynchronousUpdate: true
+        } );
+        if ( !verboseOutput ) progressBar.start ( ( forceRedeploy ? scannedFiles.length : filesToUpload.length ) * config.bucket.length );
 
-    await Promise.all ( _.map ( args.f ? scannedFiles : filesToUpload, filename => fs.readFile ( filename )
-        .then ( file => {
-            let body = file;
+        await Promise.all ( config.bucket.map ( async ( bucket, i ) => {
+            await Promise.all ( ( forceRedeploy ? scannedFiles : filesToUpload ).map ( filename => fs.readFile ( filename )
+                .then ( file => {
+                    let body = file;
 
-            try {
-                body = config.data ? handlebars.compile ( file.toString ( 'utf8' ) ) ( config.data ) : file;
-            }
-            catch ( e ) {
-                //do nothing
-            }
+                    try {
+                        body = config.data ? handlebars.compile ( file.toString ( 'utf8' ) ) ( config.data ) : file;
+                    }
+                    catch ( e ) {
+                    // do nothing
+                    }
 
-            let key = ( config.Folder ? `${ config.Folder }` : '' ) + ( config.targetFolder && config.targetFolder !== '' ? _.replace ( _.replace ( filename, process.cwd (), '' ), `${ config.targetFolder }/`, '' ) : _.replace ( filename, process.cwd (), '' ) );
-            key = key.replace ( /\\/g, '/' );
-            if ( key.indexOf ( '/' ) === 0 ){
-                key = key.substr ( 1 );
-            }
-            if ( _.lastIndexOf ( key, '/' ) === key.length - 1 ){
-                key = key.substr ( 0, key.length - 1 );
-            }
+                    let key = ( config.folder[ i ] ? `${config.folder[ i ]}` : '' ) + 
+            ( config.targetFolder && config.targetFolder !== '' ? filename.replace ( process.cwd (), '' ).replace ( `${config.targetFolder}/`, '' ) : filename.replace ( process.cwd (), '' ) );
+                    key = key.replace ( /\\/g, '/' );
+                    if ( key.startsWith ( '/' ) ) {
+                        key = key.substring ( 1 );
+                    }
+                    if ( key.endsWith ( '/' ) ) {
+                        key = key.slice ( 0, -1 );
+                    }
 
-            console.log ( config.Bucket, key );
-
-            return s3.putObject ( {
-                Bucket: config.Bucket,
-                Key: key,
-                ACL: 'public-read',
-                Body: body,
-                CacheControl: config.CacheControl || 'max-age=3600, s-maxage=31536000',
-                ContentType: mime.getType ( filename )
-            } ).promise ().then ( () => progressBar.increment () );
-
-        } ) ) );
-
-    progressBar.stop ();
-
-    if ( config.cdnId ) {
-        await cf.createInvalidation ( {
-            DistributionId: config.cdnId,
-            InvalidationBatch: {
-                CallerReference: new Date ().valueOf () + '/' + Math.floor ( Math.random () * 65535 ),
-                Paths: {
-                    Quantity: 1,
-                    Items: [ config.Folder ? '/' + config.Folder + '/*' : '/*' ]
-                }
-            }
-        } ).promise ();
+                    if ( verboseOutput ) process.stdout.write ( '\x1b[38;5;172mUploading to S3: ' + filename + '\x1b[0m\n' );
+                
+                    return s3.set ( key, body, { 
+                        bucket: bucket, 
+                        contentType: mime.getType ( filename ), 
+                        cacheControl: Object.keys ( config.cache )
+                            .map ( cacheKey => typeof config.cache[ cacheKey ] === 'boolean' ? 
+                                config.cache[ cacheKey ] ? cacheKey : null : 
+                                config.cache[ cacheKey ] ? `${cacheKey}=${config.cache[ cacheKey ]}` : null )
+                            .filter ( n => n )
+                            .join ( ', ' )
+                    } ).then ( () => !verboseOutput && progressBar.increment () );
+                } )
+            ) );
+        } ) );
+        
+        if ( !verboseOutput ) progressBar.stop ();
+
+        if ( config.cdnId ) {
+            if ( verboseOutput ) process.stdout.write ( '\x1b[38;5;172mRequesting invalidation: ' + [ config.folder ? '/' + config.folder + '/*' : '/*' ] + '\x1b[0m\n' );
+            await fetch ( 'https://tools.eip.telegraph.co.uk/v1/invalidate', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                body: JSON.stringify ( {
+                    cdn: config.cdnId,
+                    key: config.folder.map ( folder => folder ? '/' + folder + '/*' : '/*' ),
+                    environment: config?.environment || undefined
+                } )
+            } );
+            process.stdout.write ( '-------------------\n' );
+            config.folder.forEach ( folder => {
+                process.stdout.write ( '📤 \x1b[38;5;190mCloudFront Cache Cleared\x1b[0m | Invalidation: ' + ( folder ? '/' + folder + '/*' : '/*' ) + '\n' );
+            } );
+        }
+
+        // This should be done after everything is complete.
+        await writeDeploymentLock ( promiseChain.deploymentHash );
+
+        const user = process.env.PAPI_USER || 'Unknown';
+        const machine = process.env.PAPI_MACHINE || 'Unknown';
+        const deploymentReport = [ {
+            project: config.folder,
+            context: config.bucket,
+            user: `${user} - ${machine}`,
+            environment: environment,
+            timestamp: Date.now ()
+        } ];
+        if ( deploymentReport.length > 0 ){
+            await fetch ( 'https://tools.eip.telegraph.co.uk/v1/healthcheck/deployment', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                body: JSON.stringify ( { deployments: deploymentReport } )
+            } );
+        }    
+
+        process.stdout.write ( '-------------------\n' );
+        process.stdout.write ( '✅ \x1b[38;5;190mDeployment completed.\x1b[0m\n' );
         process.stdout.write ( '-------------------\n' );
-        process.stdout.write ( '📤 \x1b[38;5;190mCloudFront Cache Cleared\x1b[0m | Invalidation: ' + ( config.Folder ? '/' + config.Folder + '/*' : '/*' ) + '\n' );
     }
+    catch ( error ){
+        console.log ( error );
+        showHelp ();
+    
+        return;
+    }
+};
 
-    // This should be done after everything is complete.
-    await writeDeploymentLock ( promiseChain.deploymentHash );
-
-    process.stdout.write ( '-------------------\n' );
-    process.stdout.write ( '✅ \x1b[38;5;190mDeployment completed.\x1b[0m\n' );
-    process.stdout.write ( '-------------------\n' );
+const showHelp = () => {
+    console.log ( 'S3 Deploy Script' );
+    console.log ( 'Usage:' );
+    console.log ( '  s3-deploy <environment_name> [-f|--force] [-ff|--folderFilter <folder_filter>] [-e|--env <environment_name>]' );
+    console.log ( 'Options:' );
+    console.log ( '  -f,  --force            Force redeployment of files' );
+    console.log ( '  -ff, --folderFilter     Specify a single folder to deploy' );
+    console.log ( '  -e,  --env              Specify the environment for deployment' );
+    console.log ( '  -v,  --verbose          Print more output' );
+    console.log ( 'Examples:' );
+    console.log ( '  s3-deploy test' );
+    console.log ( '  s3-deploy production --force' );
+    console.log ( '  s3-deploy test -ff myFolder' );
+    console.log ( '  s3-deploy -ff myFolder -e prod -f' );
+    console.log ( '  s3-deploy --folderFilter myFolder -e test -f' );
+    process.exit ( 0 );
 };
 
-deploy ();
+deploy ().catch ( ( error ) => {
+    console.error ( `ERROR: ${error}` );
+    console.log ( error );
+} );

package/deployConf.js

@@ -1,30 +1,52 @@
 module.exports = {
-
+    version: 2,
     prod: {
-        Bucket: 's3.eip.telegraph.co.uk',
-        cdnId: 'E3CNSI2YZ2LXA6',
-        Folder: 'testFolder',
-        targetFolder: 'test',
-        CacheControl: 'max-age=1, s-maxage=86400',
-        Omit: [
+        bucket: 's3.eip.telegraph.co.uk',   // The location you want to deploy to.
+        cdnId: 'cf',                        // The prefix or identifier for the CDN. e.g. "cf", "cf-particle-html", etc
+        folder: 'testFolder',               // The remote folder you which to upload to.
+        targetFolder: 'test',               // The local folder to use as a root for uploading. Remove this to use root folder.
+        cache: {
+            'max-age': 3600,             // Specifies the maximum age of the resource in seconds on a user's device.
+            's-maxage': 86400 * 7,      // Specifies the maximum age of the resource in shared caches (e.g., CDNs e.g., CloudFront, Google Cloud CDN).
+            'public': true,             // Indicates that the response can be cached by both public and private caches.
+            'private': false,           // Indicates that the response is intended for a single user and should not be cached by CDNs, this should be false unless we're generating private information.
+            'no-cache': false,          // This will still cache the resource, but it will be requested from the server each time its requested again. This should be false.
+            'no-store': false,          // This is the same as above, except it will not cache the resource at all. (e.g. large files), this should be false.
+            'must-revalidate': false,   // Requires the cache to revalidate the resource with the server before serving it to subsequent requests. Useful for frequently changing resources such as live data files.
+            'proxy-revalidate': false,  // Similar to must-revalidate, but specifically applies to CDN caches.
+            'immutable': false          // Indicates that the resource is considered immutable and should not change. Caches can store immutable resources indefinitely. Use wisely.
+        },
+        omit: [                             // File & folder to ignore from deployment.
             'deployConf.js'
         ],
         data: {
-            key1: 'production1',
-            key2: 'production2'
+            key1: 'production1',            // Replaces {{key1}} in any text-based files with what you put here
+            key2: 'production2'             // Replaces {{key2}} in any text-based files with what you put here
         }
     },
     test: {
-        Bucket: 's3-test.eip.telegraph.co.uk',
-        cdnId: 'E2HC9DMO560JVW',
-        Folder: 'testFolder',
-        targetFolder: 'test',
-        Omit: [
+        bucket: [ 's3-test.eip.telegraph.co.uk', 's3-test.eip.telegraph.co.uk' ],   // The location you want to deploy to.
+        cdnId: 'cf',                             // The prefix or identifier for the CDN. e.g. "cf", "cf-particle-html", etc
+        environment: 'test',                     // The variant of environment.  
+        folder: [ 'testFolder', 'testFolder2' ],               // The remote folder you which to upload to.
+        targetFolder: 'test',               // The local folder to use as a root for uploading. Remove this to use root folder.
+        cache: {
+            'max-age': 3600,             // Specifies the maximum age of the resource in seconds on a user's device.
+            's-maxage': 86400 * 7,      // Specifies the maximum age of the resource in shared caches (e.g., CDNs e.g., CloudFront, Google Cloud CDN).
+            'public': true,             // Indicates that the response can be cached by both public and private caches.
+            'private': false,           // Indicates that the response is intended for a single user and should not be cached by CDNs, this should be false unless we're generating private information.
+            'no-cache': false,          // This will still cache the resource, but it will be requested from the server each time its requested again. This should be false.
+            'no-store': false,          // This is the same as above, except it will not cache the resource at all. (e.g. large files), this should be false.
+            'must-revalidate': false,   // Requires the cache to revalidate the resource with the server before serving it to subsequent requests. Useful for frequently changing resources such as live data files.
+            'proxy-revalidate': false,  // Similar to must-revalidate, but specifically applies to CDN caches.
+            'immutable': false          // Indicates that the resource is considered immutable and should not change. Caches can store immutable resources indefinitely. Use wisely.
+        },
+        omit: [                             // File & folder to ignore from deployment.
             'deployConf.js'
         ],
         data: {
-            key1: 'test1',
-            key2: 'test2'
+            key1: 'production1',            // Replaces {{key1}} in any text-based files with what you put here
+            key2: 'production2'             // Replaces {{key2}} in any text-based files with what you put here
         }
     }
-};
+};

package/deployment.lock

@@ -6,11 +6,21 @@
     "test/folder1/file2.txt": "d41d8cd98f00b204e9800998ecf8427e",
     "test/folder2/file2.txt": "d41d8cd98f00b204e9800998ecf8427e",
     "test/folder2/file1.txt": "d41d8cd98f00b204e9800998ecf8427e",
+    "/test/file1.txt": "f5b5ed0c72f4e9984c3e7a8b18c08c2b",
+    "/test/file2.txt": "d41d8cd98f00b204e9800998ecf8427e",
+    "/test/folder1/file1.txt": "5d41402abc4b2a76b9719d911017c592",
+    "/test/folder1/file2.txt": "d41d8cd98f00b204e9800998ecf8427e",
+    "/test/folder2/file1.txt": "d41d8cd98f00b204e9800998ecf8427e",
+    "/test/folder2/file2.txt": "d41d8cd98f00b204e9800998ecf8427e",
+    "/test/example.html": "d3ee67eb6e0f33d59c944fb4786359f3"
+  },
+  "prod": {
     "/test/file1.txt": "f5b5ed0c72f4e9984c3e7a8b18c08c2b",
     "/test/file2.txt": "d41d8cd98f00b204e9800998ecf8427e",
     "/test/folder1/file1.txt": "d41d8cd98f00b204e9800998ecf8427e",
     "/test/folder1/file2.txt": "d41d8cd98f00b204e9800998ecf8427e",
     "/test/folder2/file1.txt": "d41d8cd98f00b204e9800998ecf8427e",
-    "/test/folder2/file2.txt": "d41d8cd98f00b204e9800998ecf8427e"
+    "/test/folder2/file2.txt": "d41d8cd98f00b204e9800998ecf8427e",
+    "/test/example.html": "d3ee67eb6e0f33d59c944fb4786359f3"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eip-s3-deploy",
-    "version": "2.1.2",
+    "version": "2.2.1",
     "description": "Deploy static websites to S3 - all files will be public",
     "main": "deploy.js",
     "bin": {
@@ -8,7 +8,7 @@
     },
     "preferGlobal": true,
     "scripts": {
-        "test": "cd ./test && node ../deploy.js test"
+        "test": "node ./deploy.js test -f"
     },
     "repository": {
         "type": "git",
@@ -24,13 +24,10 @@
     "author": "Oliver Edgington <oliver.edgington@telegraph.co.uk>",
     "license": "ISC",
     "dependencies": {
-        "aws-sdk": "^2.700.0",
         "cli-progress": "^3.8.2",
+        "eip-cloud-services": "^1.0.16",
         "handlebars": "^4.7.6",
-        "lodash": "^4.17.15",
-        "md5-file": "^5.0.0",
         "mime": "^2.4.6",
-        "minimist": "^1.2.5",
         "recursive-readdir": "^2.2.2"
     }
 }

package/test/example.html

@@ -0,0 +1,117 @@
+<!DOCTYPE html>
+<html lang="en">
+
+    <head>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>Code Block Example</title>
+        <style>
+    body {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      height: 100vh;
+      margin: 0;
+      padding: 0;
+      background-color: #2d2d2d;
+    }
+    
+    .code-block {
+      background-color: #3f3f3f;
+      padding: 10px;
+      font-family: Consolas, monospace;
+      font-size: 14px;
+      line-height: 1.4;
+      overflow-x: auto;
+      border-radius: 4px;
+    }
+
+    /* PrismJS 1.29.0
+https://prismjs.com/download.html#themes=prism-tomorrow&languages=markup+css+clike+javascript */
+code[class*=language-],pre[class*=language-]{color:#ccc;background:0 0;font-family:Consolas,Monaco,'Andale Mono','Ubuntu Mono',monospace;font-size:1em;text-align:left;white-space:pre;word-spacing:normal;word-break:normal;word-wrap:normal;line-height:1.5;-moz-tab-size:4;-o-tab-size:4;tab-size:4;-webkit-hyphens:none;-moz-hyphens:none;-ms-hyphens:none;hyphens:none}pre[class*=language-]{padding:1em;margin:.5em 0;overflow:auto}:not(pre)>code[class*=language-],pre[class*=language-]{background:#2d2d2d}:not(pre)>code[class*=language-]{padding:.1em;border-radius:.3em;white-space:normal}.token.block-comment,.token.cdata,.token.comment,.token.doctype,.token.prolog{color:#999}.token.punctuation{color:#ccc}.token.attr-name,.token.deleted,.token.namespace,.token.tag{color:#e2777a}.token.function-name{color:#6196cc}.token.boolean,.token.function,.token.number{color:#f08d49}.token.class-name,.token.constant,.token.property,.token.symbol{color:#f8c555}.token.atrule,.token.builtin,.token.important,.token.keyword,.token.selector{color:#cc99cd}.token.attr-value,.token.char,.token.regex,.token.string,.token.variable{color:#7ec699}.token.entity,.token.operator,.token.url{color:#67cdcc}.token.bold,.token.important{font-weight:700}.token.italic{font-style:italic}.token.entity{cursor:help}.token.inserted{color:green}
+
+  </style>
+    </head>
+
+    <body>
+        <div class="code-block language-js">
+            <pre>
+      <code>
+        module.exports = {
+            version: 2,
+            prod: {
+                bucket: 's3.eip.telegraph.co.uk',   // The location you want to deploy to.
+                cdnId: 'cf',                        // The prefix or identifier for the CDN. e.g. "cf", "cf-particle-html", etc
+                folder: 'testFolder',               // The remote folder you which to upload to.
+                targetFolder: 'test',               // The local folder to use as a root for uploading. Remove this to use root folder.
+                cache: {
+                    'max-age': 3600,             // Specifies the maximum age of the resource in seconds on a user's device.
+                    's-maxage': 86400 * 7,      // Specifies the maximum age of the resource in shared caches (e.g., CDNs e.g., CloudFront, Google Cloud CDN).
+                    'public': true,             // Indicates that the response can be cached by both public and private caches.
+                    'private': false,           // Indicates that the response is intended for a single user and should not be cached by CDNs, this should be false unless we're generating private information.
+                    'no-cache': false,          // This will still cache the resource, but it will be requested from the server each time its requested again. This should be false.
+                    'no-store': false,          // This is the same as above, except it will not cache the resource at all. (e.g. large files), this should be false.
+                    'must-revalidate': false,   // Requires the cache to revalidate the resource with the server before serving it to subsequent requests. Useful for frequently changing resources such as live data files.
+                    'proxy-revalidate': false,  // Similar to must-revalidate, but specifically applies to CDN caches.
+                    'immutable': false          // Indicates that the resource is considered immutable and should not change. Caches can store immutable resources indefinitely. Use wisely.
+                },
+                omit: [                             // File & folder to ignore from deployment.
+                    'deployConf.js'
+                ],
+                data: {
+                    key1: 'production1',            // Replaces {{key1}} in any text-based files with what you put here
+                    key2: 'production2'             // Replaces {{key2}} in any text-based files with what you put here
+                }
+            },
+            test: {
+                bucket: 's3-test.eip.telegraph.co.uk',   // The location you want to deploy to.
+                cdnId: 'cf',                             // The prefix or identifier for the CDN. e.g. "cf", "cf-particle-html", etc
+                environment: 'test',                     // The variant of environment.  
+                folder: 'testFolder',               // The remote folder you which to upload to.
+                targetFolder: 'test',               // The local folder to use as a root for uploading. Remove this to use root folder.
+                cache: {
+                    'max-age': 3600,             // Specifies the maximum age of the resource in seconds on a user's device.
+                    's-maxage': 86400 * 7,      // Specifies the maximum age of the resource in shared caches (e.g., CDNs e.g., CloudFront, Google Cloud CDN).
+                    'public': true,             // Indicates that the response can be cached by both public and private caches.
+                    'private': false,           // Indicates that the response is intended for a single user and should not be cached by CDNs, this should be false unless we're generating private information.
+                    'no-cache': false,          // This will still cache the resource, but it will be requested from the server each time its requested again. This should be false.
+                    'no-store': false,          // This is the same as above, except it will not cache the resource at all. (e.g. large files), this should be false.
+                    'must-revalidate': false,   // Requires the cache to revalidate the resource with the server before serving it to subsequent requests. Useful for frequently changing resources such as live data files.
+                    'proxy-revalidate': false,  // Similar to must-revalidate, but specifically applies to CDN caches.
+                    'immutable': false          // Indicates that the resource is considered immutable and should not change. Caches can store immutable resources indefinitely. Use wisely.
+                },
+                omit: [                             // File & folder to ignore from deployment.
+                    'deployConf.js'
+                ],
+                data: {
+                    key1: 'production1',            // Replaces {{key1}} in any text-based files with what you put here
+                    key2: 'production2'             // Replaces {{key2}} in any text-based files with what you put here
+                }
+            }
+        };
+      </code>
+    </pre>
+        </div>
+
+        <script>
+            /* PrismJS 1.29.0
+https://prismjs.com/download.html#themes=prism-tomorrow&languages=markup+css+clike+javascript */
+var _self="undefined"!=typeof window?window:"undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:{},Prism=function(e){var n=/(?:^|\s)lang(?:uage)?-([\w-]+)(?=\s|$)/i,t=0,r={},a={manual:e.Prism&&e.Prism.manual,disableWorkerMessageHandler:e.Prism&&e.Prism.disableWorkerMessageHandler,util:{encode:function e(n){return n instanceof i?new i(n.type,e(n.content),n.alias):Array.isArray(n)?n.map(e):n.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/\u00a0/g," ")},type:function(e){return Object.prototype.toString.call(e).slice(8,-1)},objId:function(e){return e.__id||Object.defineProperty(e,"__id",{value:++t}),e.__id},clone:function e(n,t){var r,i;switch(t=t||{},a.util.type(n)){case"Object":if(i=a.util.objId(n),t[i])return t[i];for(var l in r={},t[i]=r,n)n.hasOwnProperty(l)&&(r[l]=e(n[l],t));return r;case"Array":return i=a.util.objId(n),t[i]?t[i]:(r=[],t[i]=r,n.forEach((function(n,a){r[a]=e(n,t)})),r);default:return n}},getLanguage:function(e){for(;e;){var t=n.exec(e.className);if(t)return t[1].toLowerCase();e=e.parentElement}return"none"},setLanguage:function(e,t){e.className=e.className.replace(RegExp(n,"gi"),""),e.classList.add("language-"+t)},currentScript:function(){if("undefined"==typeof document)return null;if("currentScript"in document)return document.currentScript;try{throw new Error}catch(r){var e=(/at [^(\r\n]*\((.*):[^:]+:[^:]+\)$/i.exec(r.stack)||[])[1];if(e){var n=document.getElementsByTagName("script");for(var t in n)if(n[t].src==e)return n[t]}return null}},isActive:function(e,n,t){for(var r="no-"+n;e;){var a=e.classList;if(a.contains(n))return!0;if(a.contains(r))return!1;e=e.parentElement}return!!t}},languages:{plain:r,plaintext:r,text:r,txt:r,extend:function(e,n){var t=a.util.clone(a.languages[e]);for(var r in n)t[r]=n[r];return t},insertBefore:function(e,n,t,r){var i=(r=r||a.languages)[e],l={};for(var o in i)if(i.hasOwnProperty(o)){if(o==n)for(var s in t)t.hasOwnProperty(s)&&(l[s]=t[s]);t.hasOwnProperty(o)||(l[o]=i[o])}var u=r[e];return r[e]=l,a.languages.DFS(a.languages,(function(n,t){t===u&&n!=e&&(this[n]=l)})),l},DFS:function e(n,t,r,i){i=i||{};var l=a.util.objId;for(var o in n)if(n.hasOwnProperty(o)){t.call(n,o,n[o],r||o);var s=n[o],u=a.util.type(s);"Object"!==u||i[l(s)]?"Array"!==u||i[l(s)]||(i[l(s)]=!0,e(s,t,o,i)):(i[l(s)]=!0,e(s,t,null,i))}}},plugins:{},highlightAll:function(e,n){a.highlightAllUnder(document,e,n)},highlightAllUnder:function(e,n,t){var r={callback:t,container:e,selector:'code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'};a.hooks.run("before-highlightall",r),r.elements=Array.prototype.slice.apply(r.container.querySelectorAll(r.selector)),a.hooks.run("before-all-elements-highlight",r);for(var i,l=0;i=r.elements[l++];)a.highlightElement(i,!0===n,r.callback)},highlightElement:function(n,t,r){var i=a.util.getLanguage(n),l=a.languages[i];a.util.setLanguage(n,i);var o=n.parentElement;o&&"pre"===o.nodeName.toLowerCase()&&a.util.setLanguage(o,i);var s={element:n,language:i,grammar:l,code:n.textContent};function u(e){s.highlightedCode=e,a.hooks.run("before-insert",s),s.element.innerHTML=s.highlightedCode,a.hooks.run("after-highlight",s),a.hooks.run("complete",s),r&&r.call(s.element)}if(a.hooks.run("before-sanity-check",s),(o=s.element.parentElement)&&"pre"===o.nodeName.toLowerCase()&&!o.hasAttribute("tabindex")&&o.setAttribute("tabindex","0"),!s.code)return a.hooks.run("complete",s),void(r&&r.call(s.element));if(a.hooks.run("before-highlight",s),s.grammar)if(t&&e.Worker){var c=new Worker(a.filename);c.onmessage=function(e){u(e.data)},c.postMessage(JSON.stringify({language:s.language,code:s.code,immediateClose:!0}))}else u(a.highlight(s.code,s.grammar,s.language));else u(a.util.encode(s.code))},highlight:function(e,n,t){var r={code:e,grammar:n,language:t};if(a.hooks.run("before-tokenize",r),!r.grammar)throw new Error('The language "'+r.language+'" has no grammar.');return r.tokens=a.tokenize(r.code,r.grammar),a.hooks.run("after-tokenize",r),i.stringify(a.util.encode(r.tokens),r.language)},tokenize:function(e,n){var t=n.rest;if(t){for(var r in t)n[r]=t[r];delete n.rest}var a=new s;return u(a,a.head,e),o(e,a,n,a.head,0),function(e){for(var n=[],t=e.head.next;t!==e.tail;)n.push(t.value),t=t.next;return n}(a)},hooks:{all:{},add:function(e,n){var t=a.hooks.all;t[e]=t[e]||[],t[e].push(n)},run:function(e,n){var t=a.hooks.all[e];if(t&&t.length)for(var r,i=0;r=t[i++];)r(n)}},Token:i};function i(e,n,t,r){this.type=e,this.content=n,this.alias=t,this.length=0|(r||"").length}function l(e,n,t,r){e.lastIndex=n;var a=e.exec(t);if(a&&r&&a[1]){var i=a[1].length;a.index+=i,a[0]=a[0].slice(i)}return a}function o(e,n,t,r,s,g){for(var f in t)if(t.hasOwnProperty(f)&&t[f]){var h=t[f];h=Array.isArray(h)?h:[h];for(var d=0;d<h.length;++d){if(g&&g.cause==f+","+d)return;var v=h[d],p=v.inside,m=!!v.lookbehind,y=!!v.greedy,k=v.alias;if(y&&!v.pattern.global){var x=v.pattern.toString().match(/[imsuy]*$/)[0];v.pattern=RegExp(v.pattern.source,x+"g")}for(var b=v.pattern||v,w=r.next,A=s;w!==n.tail&&!(g&&A>=g.reach);A+=w.value.length,w=w.next){var E=w.value;if(n.length>e.length)return;if(!(E instanceof i)){var P,L=1;if(y){if(!(P=l(b,A,e,m))||P.index>=e.length)break;var S=P.index,O=P.index+P[0].length,j=A;for(j+=w.value.length;S>=j;)j+=(w=w.next).value.length;if(A=j-=w.value.length,w.value instanceof i)continue;for(var C=w;C!==n.tail&&(j<O||"string"==typeof C.value);C=C.next)L++,j+=C.value.length;L--,E=e.slice(A,j),P.index-=A}else if(!(P=l(b,0,E,m)))continue;S=P.index;var N=P[0],_=E.slice(0,S),M=E.slice(S+N.length),W=A+E.length;g&&W>g.reach&&(g.reach=W);var z=w.prev;if(_&&(z=u(n,z,_),A+=_.length),c(n,z,L),w=u(n,z,new i(f,p?a.tokenize(N,p):N,k,N)),M&&u(n,w,M),L>1){var I={cause:f+","+d,reach:W};o(e,n,t,w.prev,A,I),g&&I.reach>g.reach&&(g.reach=I.reach)}}}}}}function s(){var e={value:null,prev:null,next:null},n={value:null,prev:e,next:null};e.next=n,this.head=e,this.tail=n,this.length=0}function u(e,n,t){var r=n.next,a={value:t,prev:n,next:r};return n.next=a,r.prev=a,e.length++,a}function c(e,n,t){for(var r=n.next,a=0;a<t&&r!==e.tail;a++)r=r.next;n.next=r,r.prev=n,e.length-=a}if(e.Prism=a,i.stringify=function e(n,t){if("string"==typeof n)return n;if(Array.isArray(n)){var r="";return n.forEach((function(n){r+=e(n,t)})),r}var i={type:n.type,content:e(n.content,t),tag:"span",classes:["token",n.type],attributes:{},language:t},l=n.alias;l&&(Array.isArray(l)?Array.prototype.push.apply(i.classes,l):i.classes.push(l)),a.hooks.run("wrap",i);var o="";for(var s in i.attributes)o+=" "+s+'="'+(i.attributes[s]||"").replace(/"/g,"&quot;")+'"';return"<"+i.tag+' class="'+i.classes.join(" ")+'"'+o+">"+i.content+"</"+i.tag+">"},!e.document)return e.addEventListener?(a.disableWorkerMessageHandler||e.addEventListener("message",(function(n){var t=JSON.parse(n.data),r=t.language,i=t.code,l=t.immediateClose;e.postMessage(a.highlight(i,a.languages[r],r)),l&&e.close()}),!1),a):a;var g=a.util.currentScript();function f(){a.manual||a.highlightAll()}if(g&&(a.filename=g.src,g.hasAttribute("data-manual")&&(a.manual=!0)),!a.manual){var h=document.readyState;"loading"===h||"interactive"===h&&g&&g.defer?document.addEventListener("DOMContentLoaded",f):window.requestAnimationFrame?window.requestAnimationFrame(f):window.setTimeout(f,16)}return a}(_self);"undefined"!=typeof module&&module.exports&&(module.exports=Prism),"undefined"!=typeof global&&(global.Prism=Prism);
+Prism.languages.markup={comment:{pattern:/<!--(?:(?!<!--)[\s\S])*?-->/,greedy:!0},prolog:{pattern:/<\?[\s\S]+?\?>/,greedy:!0},doctype:{pattern:/<!DOCTYPE(?:[^>"'[\]]|"[^"]*"|'[^']*')+(?:\[(?:[^<"'\]]|"[^"]*"|'[^']*'|<(?!!--)|<!--(?:[^-]|-(?!->))*-->)*\]\s*)?>/i,greedy:!0,inside:{"internal-subset":{pattern:/(^[^\[]*\[)[\s\S]+(?=\]>$)/,lookbehind:!0,greedy:!0,inside:null},string:{pattern:/"[^"]*"|'[^']*'/,greedy:!0},punctuation:/^<!|>$|[[\]]/,"doctype-tag":/^DOCTYPE/i,name:/[^\s<>'"]+/}},cdata:{pattern:/<!\[CDATA\[[\s\S]*?\]\]>/i,greedy:!0},tag:{pattern:/<\/?(?!\d)[^\s>\/=$<%]+(?:\s(?:\s*[^\s>\/=]+(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s'">=]+(?=[\s>]))|(?=[\s/>])))+)?\s*\/?>/,greedy:!0,inside:{tag:{pattern:/^<\/?[^\s>\/]+/,inside:{punctuation:/^<\/?/,namespace:/^[^\s>\/:]+:/}},"special-attr":[],"attr-value":{pattern:/=\s*(?:"[^"]*"|'[^']*'|[^\s'">=]+)/,inside:{punctuation:[{pattern:/^=/,alias:"attr-equals"},{pattern:/^(\s*)["']|["']$/,lookbehind:!0}]}},punctuation:/\/?>/,"attr-name":{pattern:/[^\s>\/]+/,inside:{namespace:/^[^\s>\/:]+:/}}}},entity:[{pattern:/&[\da-z]{1,8};/i,alias:"named-entity"},/&#x?[\da-f]{1,8};/i]},Prism.languages.markup.tag.inside["attr-value"].inside.entity=Prism.languages.markup.entity,Prism.languages.markup.doctype.inside["internal-subset"].inside=Prism.languages.markup,Prism.hooks.add("wrap",(function(a){"entity"===a.type&&(a.attributes.title=a.content.replace(/&amp;/,"&"))})),Object.defineProperty(Prism.languages.markup.tag,"addInlined",{value:function(a,e){var s={};s["language-"+e]={pattern:/(^<!\[CDATA\[)[\s\S]+?(?=\]\]>$)/i,lookbehind:!0,inside:Prism.languages[e]},s.cdata=/^<!\[CDATA\[|\]\]>$/i;var t={"included-cdata":{pattern:/<!\[CDATA\[[\s\S]*?\]\]>/i,inside:s}};t["language-"+e]={pattern:/[\s\S]+/,inside:Prism.languages[e]};var n={};n[a]={pattern:RegExp("(<__[^>]*>)(?:<!\\[CDATA\\[(?:[^\\]]|\\](?!\\]>))*\\]\\]>|(?!<!\\[CDATA\\[)[^])*?(?=</__>)".replace(/__/g,(function(){return a})),"i"),lookbehind:!0,greedy:!0,inside:t},Prism.languages.insertBefore("markup","cdata",n)}}),Object.defineProperty(Prism.languages.markup.tag,"addAttribute",{value:function(a,e){Prism.languages.markup.tag.inside["special-attr"].push({pattern:RegExp("(^|[\"'\\s])(?:"+a+")\\s*=\\s*(?:\"[^\"]*\"|'[^']*'|[^\\s'\">=]+(?=[\\s>]))","i"),lookbehind:!0,inside:{"attr-name":/^[^\s=]+/,"attr-value":{pattern:/=[\s\S]+/,inside:{value:{pattern:/(^=\s*(["']|(?!["'])))\S[\s\S]*(?=\2$)/,lookbehind:!0,alias:[e,"language-"+e],inside:Prism.languages[e]},punctuation:[{pattern:/^=/,alias:"attr-equals"},/"|'/]}}}})}}),Prism.languages.html=Prism.languages.markup,Prism.languages.mathml=Prism.languages.markup,Prism.languages.svg=Prism.languages.markup,Prism.languages.xml=Prism.languages.extend("markup",{}),Prism.languages.ssml=Prism.languages.xml,Prism.languages.atom=Prism.languages.xml,Prism.languages.rss=Prism.languages.xml;
+!function(s){var e=/(?:"(?:\\(?:\r\n|[\s\S])|[^"\\\r\n])*"|'(?:\\(?:\r\n|[\s\S])|[^'\\\r\n])*')/;s.languages.css={comment:/\/\*[\s\S]*?\*\//,atrule:{pattern:RegExp("@[\\w-](?:[^;{\\s\"']|\\s+(?!\\s)|"+e.source+")*?(?:;|(?=\\s*\\{))"),inside:{rule:/^@[\w-]+/,"selector-function-argument":{pattern:/(\bselector\s*\(\s*(?![\s)]))(?:[^()\s]|\s+(?![\s)])|\((?:[^()]|\([^()]*\))*\))+(?=\s*\))/,lookbehind:!0,alias:"selector"},keyword:{pattern:/(^|[^\w-])(?:and|not|only|or)(?![\w-])/,lookbehind:!0}}},url:{pattern:RegExp("\\burl\\((?:"+e.source+"|(?:[^\\\\\r\n()\"']|\\\\[^])*)\\)","i"),greedy:!0,inside:{function:/^url/i,punctuation:/^\(|\)$/,string:{pattern:RegExp("^"+e.source+"$"),alias:"url"}}},selector:{pattern:RegExp("(^|[{}\\s])[^{}\\s](?:[^{};\"'\\s]|\\s+(?![\\s{])|"+e.source+")*(?=\\s*\\{)"),lookbehind:!0},string:{pattern:e,greedy:!0},property:{pattern:/(^|[^-\w\xA0-\uFFFF])(?!\s)[-_a-z\xA0-\uFFFF](?:(?!\s)[-\w\xA0-\uFFFF])*(?=\s*:)/i,lookbehind:!0},important:/!important\b/i,function:{pattern:/(^|[^-a-z0-9])[-a-z0-9]+(?=\()/i,lookbehind:!0},punctuation:/[(){};:,]/},s.languages.css.atrule.inside.rest=s.languages.css;var t=s.languages.markup;t&&(t.tag.addInlined("style","css"),t.tag.addAttribute("style","css"))}(Prism);
+Prism.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\s\S]*?(?:\*\/|$)/,lookbehind:!0,greedy:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0,greedy:!0}],string:{pattern:/(["'])(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,greedy:!0},"class-name":{pattern:/(\b(?:class|extends|implements|instanceof|interface|new|trait)\s+|\bcatch\s+\()[\w.\\]+/i,lookbehind:!0,inside:{punctuation:/[.\\]/}},keyword:/\b(?:break|catch|continue|do|else|finally|for|function|if|in|instanceof|new|null|return|throw|try|while)\b/,boolean:/\b(?:false|true)\b/,function:/\b\w+(?=\()/,number:/\b0x[\da-f]+\b|(?:\b\d+(?:\.\d*)?|\B\.\d+)(?:e[+-]?\d+)?/i,operator:/[<>]=?|[!=]=?=?|--?|\+\+?|&&?|\|\|?|[?*/~^%]/,punctuation:/[{}[\];(),.:]/};
+Prism.languages.javascript=Prism.languages.extend("clike",{"class-name":[Prism.languages.clike["class-name"],{pattern:/(^|[^$\w\xA0-\uFFFF])(?!\s)[_$A-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\.(?:constructor|prototype))/,lookbehind:!0}],keyword:[{pattern:/((?:^|\})\s*)catch\b/,lookbehind:!0},{pattern:/(^|[^.]|\.\.\.\s*)\b(?:as|assert(?=\s*\{)|async(?=\s*(?:function\b|\(|[$\w\xA0-\uFFFF]|$))|await|break|case|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally(?=\s*(?:\{|$))|for|from(?=\s*(?:['"]|$))|function|(?:get|set)(?=\s*(?:[#\[$\w\xA0-\uFFFF]|$))|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|static|super|switch|this|throw|try|typeof|undefined|var|void|while|with|yield)\b/,lookbehind:!0}],function:/#?(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*(?:\.\s*(?:apply|bind|call)\s*)?\()/,number:{pattern:RegExp("(^|[^\\w$])(?:NaN|Infinity|0[bB][01]+(?:_[01]+)*n?|0[oO][0-7]+(?:_[0-7]+)*n?|0[xX][\\dA-Fa-f]+(?:_[\\dA-Fa-f]+)*n?|\\d+(?:_\\d+)*n|(?:\\d+(?:_\\d+)*(?:\\.(?:\\d+(?:_\\d+)*)?)?|\\.\\d+(?:_\\d+)*)(?:[Ee][+-]?\\d+(?:_\\d+)*)?)(?![\\w$])"),lookbehind:!0},operator:/--|\+\+|\*\*=?|=>|&&=?|\|\|=?|[!=]==|<<=?|>>>?=?|[-+*/%&|^!=<>]=?|\.{3}|\?\?=?|\?\.?|[~:]/}),Prism.languages.javascript["class-name"][0].pattern=/(\b(?:class|extends|implements|instanceof|interface|new)\s+)[\w.\\]+/,Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:RegExp("((?:^|[^$\\w\\xA0-\\uFFFF.\"'\\])\\s]|\\b(?:return|yield))\\s*)/(?:(?:\\[(?:[^\\]\\\\\r\n]|\\\\.)*\\]|\\\\.|[^/\\\\\\[\r\n])+/[dgimyus]{0,7}|(?:\\[(?:[^[\\]\\\\\r\n]|\\\\.|\\[(?:[^[\\]\\\\\r\n]|\\\\.|\\[(?:[^[\\]\\\\\r\n]|\\\\.)*\\])*\\])*\\]|\\\\.|[^/\\\\\\[\r\n])+/[dgimyus]{0,7}v[dgimyus]{0,7})(?=(?:\\s|/\\*(?:[^*]|\\*(?!/))*\\*/)*(?:$|[\r\n,.;:})\\]]|//))"),lookbehind:!0,greedy:!0,inside:{"regex-source":{pattern:/^(\/)[\s\S]+(?=\/[a-z]*$)/,lookbehind:!0,alias:"language-regex",inside:Prism.languages.regex},"regex-delimiter":/^\/|\/$/,"regex-flags":/^[a-z]+$/}},"function-variable":{pattern:/#?(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*[=:]\s*(?:async\s*)?(?:\bfunction\b|(?:\((?:[^()]|\([^()]*\))*\)|(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*)\s*=>))/,alias:"function"},parameter:[{pattern:/(function(?:\s+(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*)?\s*\(\s*)(?!\s)(?:[^()\s]|\s+(?![\s)])|\([^()]*\))+(?=\s*\))/,lookbehind:!0,inside:Prism.languages.javascript},{pattern:/(^|[^$\w\xA0-\uFFFF])(?!\s)[_$a-z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*=>)/i,lookbehind:!0,inside:Prism.languages.javascript},{pattern:/(\(\s*)(?!\s)(?:[^()\s]|\s+(?![\s)])|\([^()]*\))+(?=\s*\)\s*=>)/,lookbehind:!0,inside:Prism.languages.javascript},{pattern:/((?:\b|\s|^)(?!(?:as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|undefined|var|void|while|with|yield)(?![$\w\xA0-\uFFFF]))(?:(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*\s*)\(\s*|\]\s*\(\s*)(?!\s)(?:[^()\s]|\s+(?![\s)])|\([^()]*\))+(?=\s*\)\s*\{)/,lookbehind:!0,inside:Prism.languages.javascript}],constant:/\b[A-Z](?:[A-Z_]|\dx?)*\b/}),Prism.languages.insertBefore("javascript","string",{hashbang:{pattern:/^#!.*/,greedy:!0,alias:"comment"},"template-string":{pattern:/`(?:\\[\s\S]|\$\{(?:[^{}]|\{(?:[^{}]|\{[^}]*\})*\})+\}|(?!\$\{)[^\\`])*`/,greedy:!0,inside:{"template-punctuation":{pattern:/^`|`$/,alias:"string"},interpolation:{pattern:/((?:^|[^\\])(?:\\{2})*)\$\{(?:[^{}]|\{(?:[^{}]|\{[^}]*\})*\})+\}/,lookbehind:!0,inside:{"interpolation-punctuation":{pattern:/^\$\{|\}$/,alias:"punctuation"},rest:Prism.languages.javascript}},string:/[\s\S]+/}},"string-property":{pattern:/((?:^|[,{])[ \t]*)(["'])(?:\\(?:\r\n|[\s\S])|(?!\2)[^\\\r\n])*\2(?=\s*:)/m,lookbehind:!0,greedy:!0,alias:"property"}}),Prism.languages.insertBefore("javascript","operator",{"literal-property":{pattern:/((?:^|[,{])[ \t]*)(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*:)/m,lookbehind:!0,alias:"property"}}),Prism.languages.markup&&(Prism.languages.markup.tag.addInlined("script","javascript"),Prism.languages.markup.tag.addAttribute("on(?:abort|blur|change|click|composition(?:end|start|update)|dblclick|error|focus(?:in|out)?|key(?:down|up)|load|mouse(?:down|enter|leave|move|out|over|up)|reset|resize|scroll|select|slotchange|submit|unload|wheel)","javascript")),Prism.languages.js=Prism.languages.javascript;
+
+        </script>
+        <script>
+    // Function to highlight code using Prism.js library
+    function highlightCode() {
+      Prism.highlightAllUnder(document.querySelector(".code-block"));
+    }
+
+    // Call the highlightCode function when the page loads
+    window.addEventListener("DOMContentLoaded", highlightCode);
+  </script>
+    </body>
+
+</html>

package/test/folder1/file1.txt

@@ -0,0 +1 @@
+hello

package/test/deployConf.js

@@ -1,26 +0,0 @@
-module.exports = {
-    prod: {
-        Bucket: 's3.eip.telegraph.co.uk',
-        Folder: 'testFolder',
-        targetFolder: 'test',
-        Omit: [
-            'deployConf.js'
-        ],
-        data: {
-            key1: "production1",
-            key2: "production2"
-        }
-    },
-    staging: {
-        Bucket: 's3-staging.eip.telegraph.co.uk',
-        cdnId: 'E2YWDG5C5WR01M',
-        Folder: 'testFolder',
-        Omit: [
-            'deployConf.js'
-        ],
-        data: {
-            key1: "staging1",
-            key2: "staging2"
-        }
-    }
-};

package/test/deployment.lock

@@ -1,10 +0,0 @@
-{
-  "staging": {
-    "/Users/ollie/workspace/olivers-tools/eip-s3-deploy/test/file1.txt": "f5b5ed0c72f4e9984c3e7a8b18c08c2b",
-    "/Users/ollie/workspace/olivers-tools/eip-s3-deploy/test/file2.txt": "d41d8cd98f00b204e9800998ecf8427e",
-    "/Users/ollie/workspace/olivers-tools/eip-s3-deploy/test/folder1/file1.txt": "d41d8cd98f00b204e9800998ecf8427e",
-    "/Users/ollie/workspace/olivers-tools/eip-s3-deploy/test/folder1/file2.txt": "d41d8cd98f00b204e9800998ecf8427e",
-    "/Users/ollie/workspace/olivers-tools/eip-s3-deploy/test/folder2/file1.txt": "d41d8cd98f00b204e9800998ecf8427e",
-    "/Users/ollie/workspace/olivers-tools/eip-s3-deploy/test/folder2/file2.txt": "d41d8cd98f00b204e9800998ecf8427e"
-  }
-}