Feat/multi env repo (#155)

* feat: multi env config repository

* feat: multi env config repository provider

* chore: remove trip config

* chore: remove multienv from update

* feat: multi env config compose

* chore: doc

* chore: doc

* fix: valid method

* chore: update version

* fix: tags query

Author: QizhengMo

arex-storage-config/pom.xml

@@ -45,7 +45,7 @@
   <parent>
     <artifactId>arex-storage-service</artifactId>
     <groupId>com.arextest</groupId>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
   </parent>
 
   <properties>

arex-storage-config/src/main/java/com/arextest/config/model/dao/MultiEnvBaseEntity.java

@@ -0,0 +1,22 @@
+package com.arextest.config.model.dao;
+
+import java.util.List;
+import java.util.Map;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.FieldNameConstants;
+
+@Setter
+@Getter
+@FieldNameConstants
+public abstract class MultiEnvBaseEntity<T> extends BaseEntity {
+  /**
+   * Multi environment configuration
+   */
+  private List<T> multiEnvConfigs;
+
+  /**
+   * Multi environment tags
+   */
+  private Map<String, List<String>> envTags;
+}

arex-storage-config/src/main/java/com/arextest/config/model/dao/config/RecordServiceConfigCollection.java

@@ -1,6 +1,7 @@
 package com.arextest.config.model.dao.config;
 
 import com.arextest.config.model.dao.BaseEntity;
+import com.arextest.config.model.dao.MultiEnvBaseEntity;
 import com.arextest.config.model.dto.record.SerializeSkipInfoConfiguration;
 import java.util.List;
 import java.util.Map;
@@ -13,7 +14,8 @@
 @Data
 @NoArgsConstructor
 @FieldNameConstants
-public class RecordServiceConfigCollection extends BaseEntity {
+public class RecordServiceConfigCollection extends
+    MultiEnvBaseEntity<RecordServiceConfigCollection> {
 
   public static final String DOCUMENT_NAME = "RecordServiceConfig";
 

arex-storage-config/src/main/java/com/arextest/config/model/dto/AbstractMultiEnvConfiguration.java

@@ -0,0 +1,25 @@
+package com.arextest.config.model.dto;
+
+import java.util.List;
+import java.util.Map;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public abstract class AbstractMultiEnvConfiguration<T>
+    extends AbstractConfiguration implements MultiEnvConfig<T> {
+
+  /**
+   * Multi environment configuration
+   */
+  private List<T> multiEnvConfigs;
+
+  /**
+   * Multi environment tags
+   */
+  private Map<String, List<String>> envTags;
+
+  public void validateEnvConfigs() throws Exception {
+  }
+}

arex-storage-config/src/main/java/com/arextest/config/model/dto/ModifyType.java

@@ -7,5 +7,6 @@
 public enum ModifyType {
   REMOVE,
   INSERT,
-  UPDATE
+  UPDATE,
+  UPDATE_MULTI_ENV
 }

arex-storage-config/src/main/java/com/arextest/config/model/dto/MultiEnvConfig.java

@@ -0,0 +1,12 @@
+package com.arextest.config.model.dto;
+
+import java.util.List;
+import java.util.Map;
+
+public interface MultiEnvConfig<T> {
+  List<T> getMultiEnvConfigs();
+  void setMultiEnvConfigs(List<T> multiEnvConfigs);
+
+  Map<String, List<String>> getEnvTags();
+  void setEnvTags(Map<String, List<String>> envTags);
+}

arex-storage-config/src/main/java/com/arextest/config/model/dto/application/InstancesConfiguration.java

@@ -10,13 +10,13 @@
  */
 @Data
 public class InstancesConfiguration extends AbstractConfiguration {
-
   private String id;
   private String appId;
   private String recordVersion;
   private String host;
   private Date dataUpdateTime;
   private String agentStatus;
+  // service tags specified by user
   private Map<String, String> tags;
   private Map<String, String> systemEnv;
   private Map<String, String> systemProperties;

arex-storage-config/src/main/java/com/arextest/config/model/dto/record/MultiEnvConfig.java

@@ -1,9 +1,10 @@
 package com.arextest.config.model.dto.record;
 
 
-import com.arextest.config.model.dto.AbstractConfiguration;
+import com.arextest.config.model.dto.AbstractMultiEnvConfiguration;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import lombok.Getter;
 import lombok.Setter;
@@ -14,9 +15,7 @@
  */
 @Setter
 @Getter
-public class ServiceCollectConfiguration extends AbstractConfiguration
-    implements MultiEnvConfig<ServiceCollectConfiguration> {
-
+public class ServiceCollectConfiguration extends AbstractMultiEnvConfiguration<ServiceCollectConfiguration> {
   private String appId;
   /**
    * The sample rate means for in 100 seconds should be occurred the number of records. example: if
@@ -57,13 +56,26 @@ public class ServiceCollectConfiguration extends AbstractConfiguration
 
   private List<SerializeSkipInfoConfiguration> serializeSkipInfoList;
 
-  /**
-   * Multi environment configuration
-   */
-  private List<MultiEnvConfig<ServiceCollectConfiguration>> multiEnvConfigs;
+  @Override
+  public void validateEnvConfigs() throws Exception {
+    if (this.getAppId() == null || this.getAppId().isEmpty()) {
+      throw new RuntimeException("appid is empty");
+    }
 
-  /**
-   * Multi environment tags
-   */
-  private Map<String, String> envTags;
+    if (this.getMultiEnvConfigs() == null || this.getMultiEnvConfigs().isEmpty()) {
+      throw new RuntimeException("multiEnvConfigs is empty");
+    }
+
+    for (int i = 0; i < this.getMultiEnvConfigs().size(); i++) {
+      ServiceCollectConfiguration current = this.getMultiEnvConfigs().get(i);
+      if (current.getEnvTags() == null || current.getEnvTags().isEmpty()) {
+        throw new RuntimeException("No." + (i + 1) + " config's envTags is empty");
+      }
+      for (Entry<String, List<String>> tagPairs : current.getEnvTags().entrySet()) {
+        if (tagPairs.getValue() == null || tagPairs.getValue().isEmpty()) {
+          throw new RuntimeException("No." + (i + 1) + " config's envTags's value is empty");
+        }
+      }
+    }
+  }
 }

arex-storage-config/src/main/java/com/arextest/config/model/dto/record/ServiceCollectConfiguration.java

@@ -6,7 +6,7 @@
  * @author jmo
  * @since 2022/1/25
  */
-public interface ConfigRepositoryProvider<T> extends ConfigRepository {
+public interface ConfigRepositoryProvider<T> extends ConfigRepository<T> {
 
   List<T> list();