Merge pull request #18 from Huijing-Xu/feature-mesh-template

Huijing-Xu · web-flow · commit ff4cef942032 · 2021-11-18T19:47:42.000+08:00
feat: change aws app mesh template
diff --git a/capa-spi-aws-mesh/src/main/java/group/rxcloud/capa/spi/aws/mesh/config/AwsRpcServiceOptions.java b/capa-spi-aws-mesh/src/main/java/group/rxcloud/capa/spi/aws/mesh/config/AwsRpcServiceOptions.java
@@ -80,6 +80,13 @@ public interface ToAwsServiceOptions {
          * @return the service port
          */
         int getServicePort();
+
+        /**
+         * Namespace
+         *
+         * @return the namespace
+         */
+        String getNamespace();
     }
 
     /**
@@ -102,17 +109,19 @@ public static class AwsToAwsServiceOptions implements AwsServiceOptions, ToAwsSe
 
         private final String serviceId;
         private final int servicePort;
+        private final String namespace;
         private final CapaEnvironment.DeployVpcEnvironment serviceEnv;
 
         /**
          * @param serviceId   the service id
          * @param servicePort the service port
          * @param serviceEnv  the service env
          */
-        public AwsToAwsServiceOptions(String serviceId, int servicePort,
+        public AwsToAwsServiceOptions(String serviceId, int servicePort, String namespace,
                                       CapaEnvironment.DeployVpcEnvironment serviceEnv) {
             this.serviceId = serviceId;
             this.servicePort = servicePort;
+            this.namespace = namespace;
             this.serviceEnv = serviceEnv;
         }
 
@@ -126,6 +135,11 @@ public int getServicePort() {
             return servicePort;
         }
 
+        @Override
+        public String getNamespace() {
+            return namespace;
+        }
+
         @Override
         public CapaEnvironment.DeployVpcEnvironment getServiceEnv() {
             return serviceEnv;
diff --git a/capa-spi-aws-mesh/src/main/java/group/rxcloud/capa/spi/aws/mesh/config/AwsSpiOptionsLoader.java b/capa-spi-aws-mesh/src/main/java/group/rxcloud/capa/spi/aws/mesh/config/AwsSpiOptionsLoader.java
@@ -35,11 +35,12 @@ public AwsRpcServiceOptions loadRpcServiceOptions(String appId) {
         // get variable
         CapaEnvironment.DeployVpcEnvironment deployVpcEnvironment = CapaEnvironment.getDeployVpcEnvironment();
         final int servicePort = AwsRpcEnvironment.getServicePort();
+        final String namespace = AwsRpcEnvironment.getNamespace();
 
         // generate awsToAwsServiceOptions
         // appid is serviceId
         AwsRpcServiceOptions.AwsToAwsServiceOptions awsToAwsServiceOptions
-                = new AwsRpcServiceOptions.AwsToAwsServiceOptions(appId, servicePort, deployVpcEnvironment);
+                = new AwsRpcServiceOptions.AwsToAwsServiceOptions(appId, servicePort, namespace, deployVpcEnvironment);
         rpcServiceOptions.setAwsToAwsServiceOptions(awsToAwsServiceOptions);
 
         return rpcServiceOptions;
diff --git a/capa-spi-aws-mesh/src/main/java/group/rxcloud/capa/spi/aws/mesh/constants/AwsRpcConstants.java b/capa-spi-aws-mesh/src/main/java/group/rxcloud/capa/spi/aws/mesh/constants/AwsRpcConstants.java
@@ -27,11 +27,16 @@ interface AppMeshProperties {
          * The aws app mesh http url template
          * {serviceId}.svc.cluster.local is virtual service name (https://docs.aws.amazon.com/zh_cn/zh_cn/app-mesh/latest/userguide/virtual_services.html)
          */
-        String AWS_APP_MESH_TEMPLATE = "http://{serviceId}.svc.cluster.local:{servicePort}/{operation}";
+        String AWS_APP_MESH_TEMPLATE = "http://{serviceId}.{namespace}.svc.cluster.local:{servicePort}/{operation}";
 
         String RPC_AWS_APP_MESH_DEFAULT_PORT = "8080";
 
         String RPC_AWS_APP_MESH_PORT = "CAPA_RPC_AWS_APP_MESH_PORT";
+
+        String RPC_AWS_APP_MESH_NAMESPACE = "CAPA_RPC_AWS_APP_MESH_NAMESPACE";
+
+        String RPC_AWS_APP_MESH_DEFAULT_NAMESPACE = "FWS";
+
     }
 
     interface SerializerProperties {
diff --git a/capa-spi-aws-mesh/src/main/java/group/rxcloud/capa/spi/aws/mesh/env/AwsRpcEnvironment.java b/capa-spi-aws-mesh/src/main/java/group/rxcloud/capa/spi/aws/mesh/env/AwsRpcEnvironment.java
@@ -24,9 +24,12 @@
 
 import static group.rxcloud.capa.spi.aws.mesh.constants.AwsRpcConstants.AppMeshProperties.RPC_AWS_APP_MESH_DEFAULT_PORT;
 import static group.rxcloud.capa.spi.aws.mesh.constants.AwsRpcConstants.AppMeshProperties.RPC_AWS_APP_MESH_PORT;
+import static group.rxcloud.capa.spi.aws.mesh.constants.AwsRpcConstants.AppMeshProperties.RPC_AWS_APP_MESH_DEFAULT_NAMESPACE;
+import static group.rxcloud.capa.spi.aws.mesh.constants.AwsRpcConstants.AppMeshProperties.RPC_AWS_APP_MESH_NAMESPACE;
 import static group.rxcloud.capa.spi.aws.mesh.constants.AwsRpcConstants.SerializerProperties.RPC_AWS_APP_MESH_DEFAULT_SERIALIZER;
 import static group.rxcloud.capa.spi.aws.mesh.constants.AwsRpcConstants.SerializerProperties.RPC_AWS_APP_MESH_SERIALIZER;
 
+
 /**
  * Rpc System Environment Properties In Aws.
  */
@@ -42,12 +45,20 @@ public abstract class AwsRpcEnvironment {
      */
     private static String serializer;
 
+    /**
+     * The namespace of app mesh
+     */
+    private static String namespace;
+
     static {
         // setup server port
         initPort();
 
         // setup serializer
         initSerializer();
+
+        // setup namespace
+        initNamespace();
     }
 
     private static void initPort() {
@@ -70,11 +81,23 @@ private static void initSerializer() {
         serializer = awsRpcAppMeshSerializer;
     }
 
+    private static void initNamespace() {
+        String awsRpcAppMeshNamespace = System.getProperty(RPC_AWS_APP_MESH_NAMESPACE);
+        if (StringUtils.isBlank(awsRpcAppMeshNamespace)) {
+            awsRpcAppMeshNamespace = RPC_AWS_APP_MESH_DEFAULT_NAMESPACE;
+        }
+        namespace = awsRpcAppMeshNamespace;
+    }
+
     public static int getServicePort() {
         return Objects.requireNonNull(servicePort, "Capa Rpc App Mesh Port");
     }
 
     public static String getSerializer() {
         return Objects.requireNonNull(serializer, "Capa Serializer");
     }
+
+    public static String getNamespace() {
+        return Objects.requireNonNull(namespace, "Capa Namespace");
+    }
 }
diff --git a/capa-spi-aws-mesh/src/main/java/group/rxcloud/capa/spi/aws/mesh/http/AwsCapaHttp.java b/capa-spi-aws-mesh/src/main/java/group/rxcloud/capa/spi/aws/mesh/http/AwsCapaHttp.java
@@ -117,24 +117,27 @@ public <T> CompletableFuture<HttpResponse<T>> doInvokeSpiApi(String appId,
 
             final String serviceId = awsToAwsServiceOptions.getServiceId();
             final int servicePort = awsToAwsServiceOptions.getServicePort();
+            final String namespace = awsToAwsServiceOptions.getNamespace();
 
             if (StringUtils.isBlank(serviceId)) {
                 throw new CapaException(CapaErrorContext.PARAMETER_ERROR,
                         "Aws appMesh no serviceId error.");
             }
 
-            return doAsyncInvoke(method, requestData, headers, type, serviceId, servicePort);
+            return doAsyncInvoke(method, requestData, headers, type, serviceId, namespace, servicePort);
         }
 
         private <T> CompletableFuture<HttpResponse<T>> doAsyncInvoke(String method,
                                                                      Object requestData,
                                                                      Map<String, String> headers,
                                                                      TypeRef<T> type,
                                                                      String serviceId,
+                                                                     String namespace,
                                                                      int servicePort) {
             // generate app mesh http url
             final String appMeshHttpUrl = AWS_APP_MESH_TEMPLATE
                     .replace("{serviceId}", serviceId)
+                    .replace("{namespace}", namespace)
                     .replace("{servicePort}", String.valueOf(servicePort))
                     .replace("{operation}", method);
 
diff --git a/capa-spi-aws-mesh/src/test/java/group/rxcloud/capa/spi/aws/mesh/config/AwsRpcServiceOptionsTest.java b/capa-spi-aws-mesh/src/test/java/group/rxcloud/capa/spi/aws/mesh/config/AwsRpcServiceOptionsTest.java
@@ -35,6 +35,7 @@ public void setUp() {
         awsToAwsServiceOptions = new AwsRpcServiceOptions.AwsToAwsServiceOptions(
                 "appId",
                 8080,
+                "FWS",
                 CapaEnvironment.DeployVpcEnvironment.FWS);
         awsRpcServiceOptions.setAwsToAwsServiceOptions(awsToAwsServiceOptions);
     }
@@ -58,6 +59,7 @@ public void testGetAwsToAwsServiceOptions_Success() {
 
         Assertions.assertEquals("appId", awsToAwsServiceOptions.getServiceId());
         Assertions.assertEquals(8080, awsToAwsServiceOptions.getServicePort());
+        Assertions.assertEquals("FWS", awsToAwsServiceOptions.getNamespace());
         Assertions.assertEquals(CapaEnvironment.DeployVpcEnvironment.FWS, awsToAwsServiceOptions.getServiceEnv());
     }
 
diff --git a/capa-spi-aws-mesh/src/test/java/group/rxcloud/capa/spi/aws/mesh/config/AwsSpiOptionsLoaderTest.java b/capa-spi-aws-mesh/src/test/java/group/rxcloud/capa/spi/aws/mesh/config/AwsSpiOptionsLoaderTest.java
@@ -34,6 +34,7 @@ public void testLoadRpcServiceOptions_Success() {
 
         Assertions.assertEquals("appId", awsToAwsServiceOptions.getServiceId());
         Assertions.assertEquals(8080, awsToAwsServiceOptions.getServicePort());
+        Assertions.assertEquals("FWS", awsToAwsServiceOptions.getNamespace());
         Assertions.assertEquals(CapaEnvironment.DeployVpcEnvironment.FWS, awsToAwsServiceOptions.getServiceEnv());
     }
 
diff --git a/capa-spi-aws-mesh/src/test/java/group/rxcloud/capa/spi/aws/mesh/env/AwsRpcEnvironmentTest.java b/capa-spi-aws-mesh/src/test/java/group/rxcloud/capa/spi/aws/mesh/env/AwsRpcEnvironmentTest.java
@@ -33,4 +33,9 @@ public void testGetSerializer_SuccessWhenDefault() {
         Assertions.assertEquals("baiji", serializer);
     }
 
+    @Test
+    public void testGetNamespace_SuccessWhenDefault() {
+        String namespace = AwsRpcEnvironment.getNamespace();
+        Assertions.assertEquals("FWS", namespace);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ public void setUp() {`
`35`	`35`	`awsToAwsServiceOptions = new AwsRpcServiceOptions.AwsToAwsServiceOptions(`
`36`	`36`	`"appId",`
`37`	`37`	`8080,`
	`38`	`+ "FWS",`
`38`	`39`	`CapaEnvironment.DeployVpcEnvironment.FWS);`
`39`	`40`	`awsRpcServiceOptions.setAwsToAwsServiceOptions(awsToAwsServiceOptions);`
`40`	`41`	`}`
`@@ -58,6 +59,7 @@ public void testGetAwsToAwsServiceOptions_Success() {`
`58`	`59`
`59`	`60`	`Assertions.assertEquals("appId", awsToAwsServiceOptions.getServiceId());`
`60`	`61`	`Assertions.assertEquals(8080, awsToAwsServiceOptions.getServicePort());`
	`62`	`+ Assertions.assertEquals("FWS", awsToAwsServiceOptions.getNamespace());`
`61`	`63`	`Assertions.assertEquals(CapaEnvironment.DeployVpcEnvironment.FWS, awsToAwsServiceOptions.getServiceEnv());`
`62`	`64`	`}`
`63`	`65`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ public void testLoadRpcServiceOptions_Success() {`
`34`	`34`
`35`	`35`	`Assertions.assertEquals("appId", awsToAwsServiceOptions.getServiceId());`
`36`	`36`	`Assertions.assertEquals(8080, awsToAwsServiceOptions.getServicePort());`
	`37`	`+ Assertions.assertEquals("FWS", awsToAwsServiceOptions.getNamespace());`
`37`	`38`	`Assertions.assertEquals(CapaEnvironment.DeployVpcEnvironment.FWS, awsToAwsServiceOptions.getServiceEnv());`
`38`	`39`	`}`
`39`	`40`
Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,9 @@ public void testGetSerializer_SuccessWhenDefault() {`
`33`	`33`	`Assertions.assertEquals("baiji", serializer);`
`34`	`34`	`}`
`35`	`35`
	`36`	`+ @Test`
	`37`	`+ public void testGetNamespace_SuccessWhenDefault() {`
	`38`	`+ String namespace = AwsRpcEnvironment.getNamespace();`
	`39`	`+ Assertions.assertEquals("FWS", namespace);`
	`40`	`+ }`
`36`	`41`	`}`