Allow hashing with sha256

__tests__/lib/client-file-uploader.js

@@ -2,7 +2,7 @@
  * @format
  */
 
-import { getFileMD5Hash, getFileMeta, getPartBoundaries } from '../../src/lib/client-file-uploader';
+import { getFileHash, getFileMeta, getPartBoundaries } from '../../src/lib/client-file-uploader';
 
 describe( 'client-file-uploader', () => {
 	describe( 'getFileMeta()', () => {
@@ -27,16 +27,16 @@ describe( 'client-file-uploader', () => {
 		} );
 	} );
 
-	describe( 'getFileMD5Hash()', () => {
+	describe( 'getFileHash()', () => {
 		it( 'should get hash from a 67mb sql file', async () => {
 			const fileName = '__fixtures__/client-file-uploader/db-dump-ipsum-67mb.sql';
-			const md5 = await getFileMD5Hash( fileName );
+			const md5 = await getFileHash( fileName );
 			expect( md5 ).toBe( '6a051288a7848e3fb3571af220fc455a' );
 		} );
 
 		it( 'should get hash from a 5+mb text file', async () => {
 			const fileName = '__fixtures__/client-file-uploader/numerical-test-file-5.24mb.txt';
-			const md5 = await getFileMD5Hash( fileName );
+			const md5 = await getFileHash( fileName );
 			expect( md5 ).toBe( '6f18fdff4f9f9926989e0816741aa2ba' );
 		} );
 	} );

src/bin/vip-app-deploy.ts

@@ -195,25 +195,26 @@ Processing the file for deployment to your environment...
 		env: envInput,
 		fileMeta,
 		progressCallback,
+		hashType: 'sha256',
 	};
 	const startDeployVariables: StartDeployVariables = { input: {} };
 
 	try {
 		const {
 			fileMeta: { basename },
-			md5,
+			checksum,
 			result,
 		} = await uploadImportSqlFileToS3( uploadParams );
 
 		startDeployVariables.input = {
 			id: app.id,
 			environmentId: env.id,
 			basename: fileMeta.basename,
-			md5,
+			checksum,
 			deployMessage,
 		};
 
-		debug( { basename, md5, result, startDeployVariables } );
+		debug( { basename, checksum, result, startDeployVariables } );
 		debug( 'Upload complete. Initiating the deploy.' );
 		progressTracker.stepSuccess( 'upload' );
 		await track( 'deploy_app_upload_complete' );

src/bin/vip-import-sql.js

@@ -536,7 +536,7 @@ Processing the SQL import for your environment...
 		try {
 			const {
 				fileMeta: { basename },
-				md5,
+				checksum: md5,
 				result,
 			} = await uploadImportSqlFileToS3( {
 				app,

src/graphqlTypes.d.ts

@@ -659,7 +659,7 @@ export type AppEnvironmentDeployInput = {
 	basename?: InputMaybe< Scalars[ 'String' ][ 'input' ] >;
 	environmentId?: InputMaybe< Scalars[ 'Int' ][ 'input' ] >;
 	id?: InputMaybe< Scalars[ 'Int' ][ 'input' ] >;
-	md5?: InputMaybe< Scalars[ 'String' ][ 'input' ] >;
+	checksum?: InputMaybe< Scalars[ 'String' ][ 'input' ] >;
 	deployMessage?: InputMaybe< Scalars[ 'String' ][ 'input' ] >;
 };
 

src/lib/client-file-uploader.ts

@@ -77,11 +77,15 @@ export interface UploadArguments {
 	env: WithId;
 	fileMeta: FileMeta;
 	progressCallback?: ( percentage: string ) => unknown;
+	hashType?: string;
 }
 
-export const getFileMD5Hash = async ( fileName: string ): Promise< string > => {
+export const getFileHash = async (
+	fileName: string,
+	hashType: 'md5' | 'sha256' = 'md5'
+): Promise< string > => {
 	const src = createReadStream( fileName );
-	const dst = createHash( 'md5' );
+	const dst = createHash( hashType );
 	try {
 		await pipeline( src, dst );
 		return dst.digest().toString( 'hex' );
@@ -162,6 +166,7 @@ export async function uploadImportSqlFileToS3( {
 	env,
 	fileMeta,
 	progressCallback,
+	hashType = 'md5',
 }: UploadArguments ) {
 	let tmpDir;
 	try {
@@ -205,9 +210,9 @@ export async function uploadImportSqlFileToS3( {
 		debug( `** Compression resulted in a ${ calculation } smaller file 📦 **\n` );
 	}
 
-	debug( 'Calculating file md5 checksum...' );
-	const md5 = await getFileMD5Hash( fileMeta.fileName );
-	debug( `Calculated file md5 checksum: ${ md5 }\n` );
+	debug( `Calculating file ${ hashType } checksum...` );
+	const checksum = await getFileHash( fileMeta.fileName );
+	debug( `Calculated file ${ hashType } checksum: ${ checksum }\n` );
 
 	const result =
 		fileMeta.fileSize < MULTIPART_THRESHOLD
@@ -216,7 +221,7 @@ export async function uploadImportSqlFileToS3( {
 
 	return {
 		fileMeta,
-		md5,
+		checksum,
 		result,
 	};
 }