Specify surrogate key when caching index and settings, and purge it after publishing

Author: harmony7

src/cli/commands/manage/publish-content.ts

@@ -47,6 +47,12 @@ Description:
   will see the updated index of files and updated server settings from the
   publish-content.config.js file.
 
+Required
+  --fastly-api-token=<token>       Fastly API token for KV Store or cache access.
+                                   If not set, the tool will check:
+                                     1. FASTLY_API_TOKEN environment variable
+                                     2. Logged-in Fastly CLI profile
+
 Optional:
   --collection-name=<name>         Name of the collection to publish into.
                                    Default: value from static-publisher.rc.js (defaultCollectionName)
@@ -76,11 +82,6 @@ KV Store Options:
                                    local files that will be used to simulate the KV Store
                                    with the local development environment.
 
-  --fastly-api-token=<token>       Fastly API token for KV Store access.
-                                   If not set, the tool will check:
-                                     1. FASTLY_API_TOKEN environment variable
-                                     2. Logged-in Fastly CLI profile
-
   --kv-overwrite                   Alias for --overwrite-existing.
 
 S3 Storage Options (BETA):
@@ -595,6 +596,8 @@ export async function action(actionArgs: string[]) {
 
   console.log(`✅  Settings have been saved.`);
 
+  await storageProvider.purgeSurrogateKey(`${publishId}-${collectionName}`);
+
   console.log(`🎉 Completed.`);
 
 }

src/server/publisher-server/index.ts

@@ -120,7 +120,7 @@ export class PublisherServer {
       return this.settingsCached;
     }
     const settingsFileKey = `${this.publishId}_settings_${this.activeCollectionName}`;
-    const settingsFile = await this.storageProvider.getEntry(settingsFileKey);
+    const settingsFile = await this.storageProvider.getEntry(settingsFileKey, [`${this.publishId}-${this.activeCollectionName}`, 'settings']);
     if (settingsFile == null) {
       console.error(`Settings File not found at ${settingsFileKey}.`);
       console.error(`You may need to publish your application.`);
@@ -156,7 +156,7 @@ export class PublisherServer {
       return this.assetEntryMapCache;
     }
     const indexFileKey = `${this.publishId}_index_${this.activeCollectionName}`;
-    const indexFile = await this.storageProvider.getEntry(indexFileKey);
+    const indexFile = await this.storageProvider.getEntry(indexFileKey, [`${this.publishId}-${this.activeCollectionName}`, 'index']);
     if (indexFile == null) {
       console.error(`Index File not found at ${indexFileKey}.`);
       console.error(`You may need to publish your application.`);