fix(proxy): prevent duplicate creation of backends for proxy strains

package.json

@@ -48,7 +48,7 @@
   },
   "dependencies": {
     "@adobe/fastly-native-promises": "1.9.1",
-    "@adobe/helix-shared": "1.0.2",
+    "@adobe/helix-shared": "1.1.0",
     "fs-extra": "7.0.1",
     "glob-to-regexp": "0.4.1",
     "uri-js": "4.2.2"

src/fastly/backends.js

@@ -57,16 +57,19 @@ async function updatestrains(fastly, version, strains) {
   // filter out all proxy strains
   const proxystrains = strains.getProxyStrains();
   // create a new backend or update and existing one for each origin defined
-  const origins = proxystrains.map(proxystrain => proxystrain.origin);
-  const updateorigins = origins.map(origin => fastly.writeBackend(
+  const origins = {};
+  proxystrains.forEach((proxystrain) => {
+    origins[proxystrain.origin.name] = proxystrain.origin;
+  });
+  const updateorigins = Object.values(origins).map(origin => fastly.writeBackend(
     version,
     origin.name,
     origin.toJSON(),
   ));
 
   return Promise.all([
     ...updateorigins,
-    writevcl(fastly, version, reset([...Object.values(backends), ...origins]), 'reset.vcl')]);
+    writevcl(fastly, version, reset([...Object.values(backends), ...Object.values(origins)]), 'reset.vcl')]);
 }
 
 module.exports = {

test/backends.test.js

@@ -40,11 +40,11 @@ describe('Testing backends.js', () => {
       .init();
 
     assert.ok(await updatestrains(fastly, 1, config.strains));
-    assert.ok(fastly.writeBackend.calledThrice);
+    assert.ok(fastly.writeBackend.calledTwice);
 
     assert.ok(fastly.writeVCL.calledOnce);
 
-    assert.ok(fastly.writeBackend.calledWith(1, 'Proxywwwadobeio861b'));
+    assert.ok(fastly.writeBackend.calledWith(1, 'Proxywwwadobeio3a0a'));
     assert.ok(fastly.writeBackend.calledWith(1, 'publish'));
   });
 });

test/fixtures/full-reset.vcl

@@ -15,12 +15,12 @@ if (req.backend == F_AdobeRuntime && req.restarts == 0) {
     set req.backend = F_AdobeRuntime;
   }
 }
-if (req.backend == F_Proxywwwadobeio861b && req.restarts == 0) {
+if (req.backend == F_Proxywwwadobeio3a0a && req.restarts == 0) {
   if (server.identity !~ "-IAD$" && req.http.Fastly-FF !~ "-IAD") {
     set req.backend = ssl_shield_iad_va_us;
   }
   if (!req.backend.healthy) {
-    set req.backend = F_Proxywwwadobeio861b;
+    set req.backend = F_Proxywwwadobeio3a0a;
   }
 }
 if (req.backend == F_publish && req.restarts == 0) {
@@ -31,11 +31,11 @@ if (req.backend == F_publish && req.restarts == 0) {
     set req.backend = F_publish;
   }
 }
-if (req.backend == F_Proxywwwadobeio6fab && req.restarts == 0) {
+if (req.backend == F_Proxywwwadobeio3a0a && req.restarts == 0) {
   if (server.identity !~ "-IAD$" && req.http.Fastly-FF !~ "-IAD") {
     set req.backend = ssl_shield_iad_va_us;
   }
   if (!req.backend.healthy) {
-    set req.backend = F_Proxywwwadobeio6fab;
+    set req.backend = F_Proxywwwadobeio3a0a;
   }
 }

test/fixtures/full-resolve.vcl

@@ -14,7 +14,7 @@ if (req.http.Host == "client.project-helix.io") {
   set req.http.X-Proxy-Root = "/";
   set req.http.X-Request-Type = "Proxy";
 
-  set req.backend = F_Proxywwwadobeio861b;
+  set req.backend = F_Proxywwwadobeio3a0a;
   set req.http.host = "www.adobe.io";
 
   set req.http.X-Sticky = "true";
@@ -42,7 +42,7 @@ if (req.http.Host == "client.project-helix.io") {
   set req.http.X-Proxy-Root = "/newdir";
   set req.http.X-Request-Type = "Proxy";
 
-  set req.backend = F_Proxywwwadobeio6fab;
+  set req.backend = F_Proxywwwadobeio3a0a;
   set req.http.host = "www.adobe.io";
 
   # Rewrite the URL to include the proxy path

test/fixtures/urls-resolve.vcl

@@ -22,7 +22,7 @@ if (req.http.Host == "www.project-helix.io" && (req.http.X-FullDirname ~ "^/clie
   set req.http.X-Proxy-Root = "/";
   set req.http.X-Request-Type = "Proxy";
 
-  set req.backend = F_Proxywwwadobeio861b;
+  set req.backend = F_Proxywwwadobeio3a0a;
   set req.http.host = "www.adobe.io";
 
   set req.http.X-Sticky = "true";