chore: add a mapping from storage type to storage service, update tests

Author: netomi

server/src/main/java/org/eclipse/openvsx/storage/CdnServiceConfig.java

@@ -9,6 +9,7 @@
  ********************************************************************************/
 package org.eclipse.openvsx.storage;
 
+import com.google.common.collect.ImmutableMap;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
@@ -36,6 +37,12 @@
 @Configuration
 @ConfigurationProperties("ovsx.storage.cdn")
 public class CdnServiceConfig {
+    private static final Map<String, String> STORAGE_TYPE_TO_SERVICE = ImmutableMap.of(
+            "aws", "aws",
+            "azure-blob", "azure",
+            "google-cloud", "gcp"
+    );
+
     private boolean enabled;
     private Map<String, String> services = new HashMap<>();
 
@@ -56,6 +63,11 @@ public void setServices(Map<String, String> services) {
     }
 
     public @Nullable String getCdnFrontUrl(String storageType) {
-        return enabled ? services.get(storageType) : null;
+        if (enabled) {
+            String serviceName = STORAGE_TYPE_TO_SERVICE.get(storageType);
+            return serviceName != null ? services.get(serviceName) : null;
+        } else {
+            return null;
+        }
     }
 }

server/src/test/java/org/eclipse/openvsx/storage/StorageUtilServiceTest.java

@@ -42,6 +42,9 @@
 @ContextConfiguration(classes = StorageUtilServiceTest.TestConfig.class)
 public class StorageUtilServiceTest {
 
+    @Autowired
+    CdnServiceConfig cdnServiceConfig;
+
     @Autowired
     AzureBlobStorageService azureStorage;
 
@@ -50,12 +53,18 @@ public class StorageUtilServiceTest {
 
     @Test
     public void testCdnEnabled() {
+        cdnServiceConfig.setEnabled(true);
+
         // Test a file resource for which a cdn prefix is enabled
         var extension = mockExtension();
         var extensionVersion = mockExtensionVersion(extension, 1, "1.0.0", "universal");
-        var resource = mockFileResource(1, extensionVersion, "README.md", README, FileResource.STORAGE_AWS);
+        var resourceAws = mockFileResource(1, extensionVersion, "README.md", README, FileResource.STORAGE_AWS);
+        var resourceAzure = mockFileResource(1, extensionVersion, "README.md", README, FileResource.STORAGE_AZURE);
+
+        assertEquals("https://test.cloudfront.com/aws/redhat/vscode-yaml/1.0.0/README.md", storageUtilService.getLocation(resourceAws).toString());
+        assertEquals("https://test.cloudfront.com/azure/redhat/vscode-yaml/1.0.0/README.md", storageUtilService.getLocation(resourceAzure).toString());
 
-        assertEquals("https://test.cloudfront.com/redhat/vscode-yaml/1.0.0/README.md", storageUtilService.getLocation(resource).toString());
+        cdnServiceConfig.setEnabled(false);
     }
 
     @Test
@@ -134,9 +143,10 @@ static class TestConfig {
         @Bean
         public CdnServiceConfig cdnServiceConfiguration() {
             var config = new CdnServiceConfig();
-            config.setEnabled(true);
+            config.setEnabled(false);
             var services = new HashMap<String, String>();
-            services.put("aws", "https://test.cloudfront.com");
+            services.put("aws", "https://test.cloudfront.com/aws");
+            services.put("azure", "https://test.cloudfront.com/azure");
             config.setServices(services);
             return config;
         }