Merge pull request #11 from RWS/add_regionalBaseUrls

Add regional base urls
RWS · Nov 21, 2024 · 6f4028d · 6f4028d
2 parents 2570f47 + 3bee01b
commit 6f4028d
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 3 deletions.
diff --git a/blueprints/dotNetAppBlueprint/Rws.LC.AppBlueprint/Controllers/StandardController.cs b/blueprints/dotNetAppBlueprint/Rws.LC.AppBlueprint/Controllers/StandardController.cs
@@ -88,6 +88,23 @@ public IActionResult Descriptor()
             // TODO: You might need to change the baseUrl in appsettings.json
             descriptor["baseUrl"] = _configuration["baseUrl"];
 
+            if (_configuration.GetValue<bool>("multiRegion:enabled"))
+            {
+                descriptor["regionalBaseUrls"] = new JsonObject();
+
+                string euBaseUrl = _configuration.GetValue<string>("multiRegion:regionalBaseUrls:eu");
+                string caBaseUrl = _configuration.GetValue<string>("multiRegion:regionalBaseUrls:ca");
+
+                if (!string.IsNullOrEmpty(euBaseUrl))
+                {
+                    descriptor["regionalBaseUrls"]["eu"] = euBaseUrl;
+                }
+                if (!string.IsNullOrEmpty(caBaseUrl))
+                {
+                    descriptor["regionalBaseUrls"]["ca"] = caBaseUrl;
+                }
+            }
+
             return Ok(descriptor);
         }
 

diff --git a/blueprints/dotNetAppBlueprint/Rws.LC.AppBlueprint/Services/DescriptorService.cs b/blueprints/dotNetAppBlueprint/Rws.LC.AppBlueprint/Services/DescriptorService.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text.Json;
 using System.Text.Json.Nodes;
 
 namespace Rws.LC.AppBlueprint.Services
@@ -20,7 +21,7 @@ public DescriptorService()
             // Reading from the descriptor.json file, the descriptor for this app. 
             // Customize it to represent your app behavior.
             string descriptorText = File.ReadAllText("descriptor.json");
-            _appDescriptor = JsonNode.Parse(descriptorText);
+            _appDescriptor = JsonNode.Parse(descriptorText, documentOptions: new JsonDocumentOptions { CommentHandling = JsonCommentHandling.Skip });
         }
 
         /// <summary>

diff --git a/blueprints/dotNetAppBlueprint/Rws.LC.AppBlueprint/appsettings.json b/blueprints/dotNetAppBlueprint/Rws.LC.AppBlueprint/appsettings.json
@@ -13,6 +13,13 @@
   },
 
   "baseUrl": "TODO: replace with a proper URL",
+  "multiRegion": {
+    "enabled": false,
+    "regionalBaseUrls": {
+      "eu": "TODO: replace with a proper eu URL",
+      "ca": "TODO: replace with a proper eu URL"
+    }
+  },
 
   "AllowedHosts": "*",
   "documentationUrl": "docUrl",

diff --git a/blueprints/dotNetAppBlueprint/Rws.LC.AppBlueprint/descriptor.json b/blueprints/dotNetAppBlueprint/Rws.LC.AppBlueprint/descriptor.json
@@ -77,4 +77,9 @@
 		"email": "[email protected]"
 	},
 	"descriptorVersion": "1.4"
+	// will be replaced by the actual regional base URLs from appsettings.json
+	//"regionalBaseUrls": {
+	//	"eu": "https://eu.api.base-url.com",
+	//	"ca": "https://ca.api.base-url.com"
+	//}
 }
diff --git a/...ts/javaAppBlueprint/src/main/java/com/rws/lt/lc/blueprint/service/AppMetadataService.java b/...ts/javaAppBlueprint/src/main/java/com/rws/lt/lc/blueprint/service/AppMetadataService.java
@@ -1,11 +1,14 @@
 package com.rws.lt.lc.blueprint.service;
 
+import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.Getter;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
@@ -18,19 +21,43 @@ public class AppMetadataService implements InitializingBean {
     @Value("${baseUrl}")
     private String baseUrl;
 
+    @Value("${multiRegion.enabled:false}")
+    private boolean isMultiRegionEnabled;
+
     @Getter
     private final ObjectNode descriptor;
 
     private List<String> secretConfigs;
 
+    private final ObjectMapper objectMapper;
+
+    private final Environment env;
+
     @Override
     public void afterPropertiesSet() {
         descriptor.put("baseUrl", baseUrl);
+
+        if (isMultiRegionEnabled) {
+            ObjectNode regionalBaseUrls = objectMapper.createObjectNode();
+            String euBaseUrl = env.getProperty("multiRegion.regionalBaseUrls.eu");
+            String caBaseUrl = env.getProperty("multiRegion.regionalBaseUrls.ca");
+
+            if(StringUtils.isNotEmpty(euBaseUrl)) {
+                regionalBaseUrls.put("eu", euBaseUrl);
+            }
+            if(StringUtils.isNotEmpty(caBaseUrl)) {
+                regionalBaseUrls.put("ca", caBaseUrl);
+            }
+
+            descriptor.put("regionalBaseUrls", regionalBaseUrls);
+        }
     }
 
     @Autowired
-    public AppMetadataService() throws IOException {
-        ObjectMapper objectMapper = new ObjectMapper();
+    public AppMetadataService(Environment environment) throws IOException {
+        env = environment;
+        objectMapper = new ObjectMapper();
+        objectMapper.enable(JsonParser.Feature.ALLOW_COMMENTS);
         descriptor = objectMapper.readValue(getClass().getResourceAsStream("/descriptor.json"), ObjectNode.class);
     }
 

diff --git a/blueprints/javaAppBlueprint/src/main/resources/application.yml b/blueprints/javaAppBlueprint/src/main/resources/application.yml
@@ -3,6 +3,11 @@ application:
 
 # TODO: replace with a real URL
 baseUrl: "replace-me"
+multiRegion:
+  enabled: false
+  regionalBaseUrls:
+    eu: "replace-me-eu"
+    ca: "replace-me-ca"
 
 server:
   port: 5000