Calculate file and redirect hashes based on metadata plus file body.

This ensures that changes to the bucket name or other options such as
ACL or Cache-Control cause redeploys.

Author: john-shaffer

src/Deployer.php

@@ -65,10 +65,6 @@ public function upload_files( string $processed_site_path ) : void {
 
                 $cache_key = str_replace( $processed_site_path, '', $filename );
 
-                if ( \WP2Static\DeployCache::fileisCached( $cache_key, $namespace ) ) {
-                    continue;
-                }
-
                 if ( ! $real_filepath ) {
                     $err = 'Trying to deploy unknown file to S3: ' . $filename;
                     \WP2Static\WsLog::l( $err );
@@ -94,13 +90,26 @@ public function upload_files( string $processed_site_path ) : void {
                 }
 
                 $put_data['Key'] = $s3_key;
-                $put_data['Body'] = file_get_contents( $filename );
                 $put_data['ContentType'] = $mime_type;
+                $put_data_hash = md5( json_encode( $put_data ) );
+                $put_data['Body'] = file_get_contents( $filename );
+                $body_hash = md5( $put_data['Body'] );
+                $hash = md5( $put_data_hash . $body_hash );
+
+                $is_cached = \WP2Static\DeployCache::fileisCached(
+                    $cache_key,
+                    $namespace,
+                    $hash,
+                );
+
+                if ( $is_cached ) {
+                    continue;
+                }
 
                 $result = $s3->putObject( $put_data );
 
                 if ( $result['@metadata']['statusCode'] === 200 ) {
-                    \WP2Static\DeployCache::addFile( $cache_key, $namespace );
+                    \WP2Static\DeployCache::addFile( $cache_key, $namespace, $hash );
 
                     if ( $cf_max_paths >= count( $cf_stale_paths ) ) {
                         $cf_key = $cache_key;
@@ -119,23 +128,12 @@ public function upload_files( string $processed_site_path ) : void {
         $redirects = apply_filters( 'wp2static_list_redirects', [] );
 
         foreach ( $redirects as $redirect ) {
-            $file_hash = md5( '301' . $redirect['redirect_to'] );
             $cache_key = $redirect['url'];
 
             if ( mb_substr( $cache_key, -1 ) === '/' ) {
                 $cache_key = $cache_key . 'index.html';
             }
 
-            $is_cached = \WP2Static\DeployCache::fileisCached(
-                $cache_key,
-                $namespace,
-                $file_hash
-            );
-
-            if ( $is_cached ) {
-                continue;
-            }
-
             $s3_key =
                 Controller::getValue( 's3RemotePath' ) ?
                 Controller::getValue( 's3RemotePath' ) . '/' .
@@ -144,11 +142,22 @@ public function upload_files( string $processed_site_path ) : void {
 
             $put_data['Key'] = $s3_key;
             $put_data['WebsiteRedirectLocation'] = $redirect['redirect_to'];
+            $hash = md5( json_encode( $put_data ) );
+
+            $is_cached = \WP2Static\DeployCache::fileisCached(
+                $cache_key,
+                $namespace,
+                $hash,
+            );
+
+            if ( $is_cached ) {
+                continue;
+            }
 
             $result = $s3->putObject( $put_data );
 
             if ( $result['@metadata']['statusCode'] === 200 ) {
-                \WP2Static\DeployCache::addFile( $cache_key, $namespace, $file_hash );
+                \WP2Static\DeployCache::addFile( $cache_key, $namespace, $hash );
 
                 if ( $cf_max_paths >= count( $cf_stale_paths ) ) {
                     $cf_key = $cache_key;