Merge branch 'master' into release

fastly · Dec 18, 2024 · ba5003c · ba5003c
2 parents 85e420e + 1d05693
commit ba5003c
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 22 deletions.
diff --git a/Model/Layout/LayoutPlugin.php b/Model/Layout/LayoutPlugin.php
@@ -98,7 +98,7 @@ public function afterGenerateElements(\Magento\Framework\View\Layout $subject):
     public function afterGetOutput(\Magento\Framework\View\Layout $subject, $result) // @codingStandardsIgnoreLine - unused parameter
     {
         if ($this->config->getType() === Config::FASTLY) {
-            $this->response->setHeader("Fastly-Module-Enabled", "1.2.221", true);
+            $this->response->setHeader("Fastly-Module-Enabled", "1.2.223", true);
         }
 
         return $result;

diff --git a/Release-Notes.md b/Release-Notes.md
@@ -1,5 +1,13 @@
 # Fastly_Cdn Release Notes
 
+## 1.2.223
+
+- Update available Fastly Shielding POP list
+
+## 1.2.222
+
+- Update to DataDome Fastly Module 2.23.0 https://github.com/fastly/fastly-magento2/pull/715
+
 ## 1.2.221
 
 - Catch Throwable instead of Exception in Blocking controller https://github.com/fastly/fastly-magento2/pull/704

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2.221
+1.2.223
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
         "zordius/lightncandy": "^1.2"
     },
     "type": "magento2-module",
-    "version": "1.2.221",
+    "version": "1.2.223",
     "license": "BSD-3-Clause",
     "autoload": {
         "files": [ "registration.php" ],

diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -49,7 +49,8 @@
                     <field id="fastly_api_key" type="text" translate="label comment" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
                         <label>Fastly API Token</label>
                         <comment>
-                            <![CDATA[Please create a <a href="https://manage.fastly.com/account/personal/tokens" target="_blank">Fastly API token</a> with a global scope.<br /><br />
+                            <![CDATA[Please create a <a href="https://manage.fastly.com/account/personal/tokens" target="_blank">Fastly API token</a> with a global scope.<br />
+                            NOTE: Adobe Commerce Cloud customers should refer to <a href="https://experienceleague.adobe.com/en/docs/commerce-cloud-service/user-guide/cdn/fastly#fastly-service-account-and-credentials" target="_blank">their documentation</a> on how to obtain their Fastly API Token. If your token has expired, refer to <a href="https://experienceleague.adobe.com/en/docs/commerce-knowledge-base/kb/troubleshooting/miscellaneous/error-when-validating-fastly-credentials" target="_blank">this KB article.</a><br /><br />
                             After making any changes to Fastly Service ID or API token, please Save Config first before uploading VCL.]]>
                         </comment>
                         <frontend_class>masked</frontend_class>

diff --git a/etc/shielding/datacenters.json b/etc/shielding/datacenters.json
@@ -716,6 +716,20 @@
     },
     "shield": "bur-ca-us"
   },
+  {
+    "code": "HHR",
+    "name": "Los Angeles (Metro)",
+    "group": "United States",
+    "region": "US-West",
+    "stats_region": "usa",
+    "billing_region": "North America",
+    "coordinates": {
+      "x": 0,
+      "y": 0,
+      "latitude": 33.942536,
+      "longitude": -118.408075
+    }
+  },
   {
     "code": "LAX",
     "name": "Los Angeles (Metro)",
@@ -1228,6 +1242,20 @@
     },
     "shield": "qpg-singapore-sg"
   },
+  {
+    "code": "SIN",
+    "name": "Singapore",
+    "group": "Asia/Pacific",
+    "region": "Asia",
+    "stats_region": "asia",
+    "billing_region": "Asia",
+    "coordinates": {
+      "x": 0,
+      "y": 0,
+      "latitude": 1.350189,
+      "longitude": 103.994433
+    }
+  },
   {
     "code": "SOF",
     "name": "Sofia",
@@ -1287,21 +1315,6 @@
     },
     "shield": "sydney-au"
   },
-  {
-    "code": "HND",
-    "name": "Tokyo",
-    "group": "Asia/Pacific",
-    "region": "Asia",
-    "stats_region": "asia",
-    "billing_region": "Asia",
-    "coordinates": {
-      "x": 0,
-      "y": 0,
-      "latitude": 35.622281,
-      "longitude": 139.748426
-    },
-    "shield": "hnd-tokyo-jp"
-  },
   {
     "code": "TYO",
     "name": "Tokyo",

diff --git a/etc/vcl_snippets/deliver.vcl b/etc/vcl_snippets/deliver.vcl
@@ -39,7 +39,7 @@
 
     # Add an easy way to see whether custom Fastly VCL has been uploaded
     if ( req.http.Fastly-Debug ) {
-        set resp.http.Fastly-Magento-VCL-Uploaded = "1.2.221";
+        set resp.http.Fastly-Magento-VCL-Uploaded = "1.2.223";
         if (table.lookup(magentomodule_config, "allow_super_users_during_maint", "0") == "1") {
             set resp.http.Fastly-Magento-Maintenance-Mode = "on";
         }

diff --git a/etc/vcl_snippets/miss.vcl b/etc/vcl_snippets/miss.vcl
@@ -3,4 +3,4 @@
     unset bereq.http.Accept-Encoding;
 
     # Send VCL version uploaded to the backend
-    set bereq.http.Fastly-Magento-VCL-Uploaded = "1.2.221";
+    set bereq.http.Fastly-Magento-VCL-Uploaded = "1.2.223";
diff --git a/etc/vcl_snippets/pass.vcl b/etc/vcl_snippets/pass.vcl
@@ -12,4 +12,4 @@
     }
 
     # Send VCL version uploaded to the backend
-    set bereq.http.Fastly-Magento-VCL-Uploaded = "1.2.221";
+    set bereq.http.Fastly-Magento-VCL-Uploaded = "1.2.223";