fix:GrpcConnector发现gRPC为实现直接抛出异常 (#464)

* fix:GrpcConnector发现gRPC为实现直接抛出异常

* fix:修复DiscoveryFlow中watch的错误逻辑

* feat:新增token参数配置,适配北极星鉴权

* chore:update pom version

* chore:update pom version

Author: chuntaojun

polaris-common/polaris-config/src/main/java/com/tencent/polaris/api/config/global/ServerConnectorConfig.java

@@ -112,4 +112,11 @@ public interface ServerConnectorConfig extends PluginConfig, Verifier {
      * @return client keychain
      */
     String getKeyFile();
+
+    /**
+     * Get client access resource token
+     *
+     * @return polaris user or user-group access resource token
+     */
+    String getToken();
 }

polaris-common/polaris-config/src/main/java/com/tencent/polaris/factory/config/configuration/ConnectorConfigImpl.java

@@ -134,4 +134,5 @@ public Integer getConfigFileGroupThreadNum() {
 	public void setConfigFileGroupThreadNum(Integer configFileGroupThreadNum) {
 		this.configFileGroupThreadNum = configFileGroupThreadNum;
 	}
+
 }

polaris-common/polaris-config/src/main/java/com/tencent/polaris/factory/config/global/ServerConnectorConfigImpl.java

@@ -66,6 +66,8 @@ public class ServerConnectorConfigImpl extends PluginConfigImpl implements Serve
     private String keyFile;
     @JsonProperty
     private String id = "polaris";
+    @JsonProperty
+    private String token;
 
     @Override
     public List<String> getAddresses() {
@@ -239,19 +241,30 @@ public void setDefault(Object defaultObject) {
     }
 
     @Override
-    @SuppressWarnings("checkstyle:all")
     public String toString() {
         return "ServerConnectorConfigImpl{" +
-                "addresses=" + addresses +
+                "metadata=" + metadata +
+                ", addresses=" + addresses +
                 ", protocol='" + protocol + '\'' +
                 ", connectTimeout=" + connectTimeout +
                 ", messageTimeout=" + messageTimeout +
                 ", serverSwitchInterval=" + serverSwitchInterval +
                 ", connectionIdleTimeout=" + connectionIdleTimeout +
                 ", reconnectInterval=" + reconnectInterval +
-                ", trustedCertificate=" + trustedCAFile +
-                ", clientCertificate=" + certFile +
-                ", clientKey=" + keyFile +
-                "} " + super.toString();
+                ", trustedCAFile='" + trustedCAFile + '\'' +
+                ", certFile='" + certFile + '\'' +
+                ", keyFile='" + keyFile + '\'' +
+                ", id='" + id + '\'' +
+                ", token='" + token + '\'' +
+                '}';
+    }
+
+    public String getToken() {
+        return token;
     }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
 }

polaris-configuration/polaris-configuration-api/src/main/java/com/tencent/polaris/configuration/api/rpc/ConfigPublishRequest.java

@@ -17,6 +17,8 @@
 
 package com.tencent.polaris.configuration.api.rpc;
 
+import com.tencent.polaris.api.rpc.BaseEntity;
+
 import java.util.HashMap;
 import java.util.Map;
 

polaris-configuration/polaris-configuration-api/src/main/java/com/tencent/polaris/configuration/api/rpc/CreateConfigFileRequest.java

@@ -17,6 +17,7 @@
 
 package com.tencent.polaris.configuration.api.rpc;
 
+import com.tencent.polaris.api.rpc.BaseEntity;
 import com.tencent.polaris.api.utils.StringUtils;
 
 import java.util.Map;

polaris-configuration/polaris-configuration-api/src/main/java/com/tencent/polaris/configuration/api/rpc/ReleaseConfigFileRequest.java

@@ -17,6 +17,7 @@
 
 package com.tencent.polaris.configuration.api.rpc;
 
+import com.tencent.polaris.api.rpc.BaseEntity;
 import com.tencent.polaris.api.utils.StringUtils;
 
 public class ReleaseConfigFileRequest {

polaris-configuration/polaris-configuration-client/src/main/java/com/tencent/polaris/configuration/client/internal/ConfigFileLongPullService.java

@@ -32,11 +32,13 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
 
 /**
  * @author lepdou 2022-03-02
@@ -133,7 +135,6 @@ private void doLongPolling() {
         while (!isLongPullingStopped.get() && !Thread.currentThread().isInterrupted()) {
             try {
                 List<ConfigFile> watchConfigFiles = assembleWatchConfigFiles();
-
                 LOGGER.debug("[Config] do long polling. config file size = {}, delay time = {}", watchConfigFiles.size(),
                         retryPolicy.getCurrentDelayTime());
 

polaris-configuration/polaris-configuration-client/src/main/java/com/tencent/polaris/configuration/client/internal/ConfigFileManager.java

@@ -59,6 +59,8 @@ public class ConfigFileManager {
 
     private ConfigFilePersistentHandler persistentHandler;
 
+    private String token;
+
     @JustForTest
     public ConfigFileManager() {
 
@@ -72,6 +74,7 @@ public ConfigFileManager(ConfigFileConnector connector) {
     public ConfigFileManager(SDKContext sdkContext) {
         String configFileConnectorType = sdkContext.getConfig().getConfigFile().getServerConnector()
                 .getConnectorType();
+        this.token = sdkContext.getConfig().getConfigFile().getServerConnector().getToken();
         this.context = sdkContext;
         this.configFileFilterChain = new ConfigFileFilterChain(sdkContext.getExtensions().getPlugins(),
                 sdkContext.getConfig().getConfigFile().getConfigFilterConfig());

polaris-configuration/polaris-configuration-client/src/main/java/com/tencent/polaris/configuration/client/internal/RemoteConfigFileRepo.java

@@ -56,6 +56,8 @@ public class RemoteConfigFileRepo extends AbstractConfigFileRepo {
     private ConfigFilePersistentHandler configFilePersistHandler;
     private final boolean fallbackToLocalCache;
 
+    private String token;
+
     static {
         createPullExecutorService();
     }
@@ -69,6 +71,7 @@ public RemoteConfigFileRepo(SDKContext sdkContext,
         super(sdkContext, configFileMetadata);
         //保证线程池正常初始化
         createPullExecutorService();
+        this.token = sdkContext.getConfig().getConfigFile().getServerConnector().getToken();
         this.remoteConfigFile = new AtomicReference<>();
         this.notifiedVersion = new AtomicLong(INIT_VERSION);
         this.retryPolicy = new ExponentialRetryPolicy(1, 120);

polaris-discovery/polaris-discovery-api/src/main/java/com/tencent/polaris/api/flow/DiscoveryFlow.java

@@ -32,6 +32,7 @@
 import com.tencent.polaris.api.rpc.InstancesResponse;
 import com.tencent.polaris.api.rpc.ServiceRuleResponse;
 import com.tencent.polaris.api.rpc.ServicesResponse;
+import com.tencent.polaris.api.rpc.UnWatchInstancesRequest;
 import com.tencent.polaris.api.rpc.WatchInstancesRequest;
 import com.tencent.polaris.client.flow.AbstractFlow;
 
@@ -53,7 +54,7 @@ default InstancesResponse watchInstances(WatchInstancesRequest request) {
         return null;
     }
 
-    default InstancesResponse unWatchInstances(WatchInstancesRequest request) {
+    default InstancesResponse unWatchInstances(UnWatchInstancesRequest request) {
         return null;
     }