引入IT rest集成测试

1. 引入rest-spec-it
2. 修改end_point参数名

Author: Ethan-Zhang

build.gradle

@@ -1,3 +1,5 @@
+import org.elasticsearch.gradle.MavenFilteringHack
+
 buildscript {
     ext {
         pluginName = project.properties['pluginName']
@@ -74,6 +76,7 @@ bundlePlugin {
 
 test {
     exclude '**/CosRepositoryThirdPartyTests.class'
+    dependsOn processTestResources
 }
 
 String cosAccessKeyId = System.getenv("qcloud_cos_access_key_id")
@@ -96,6 +99,21 @@ thirdPartyTest {
     dependsOn tasks.bundlePlugin
 }
 
+processTestResources {
+    Map<String, Object> expansions = [
+            'accessKeyId': cosAccessKeyId,
+            'accessKeySecret': cosAccessKeySecret,
+            'cosBucket': cosBucket,
+            'cosBasePath': cosBasePath,
+    ]
+    inputs.properties(expansions)
+    MavenFilteringHack.filter(it, expansions)
+}
+
+integTest {
+    dependsOn processTestResources
+}
+
 // elasticsearch.esplugin task configure
 checkstyleMain.enabled = false
 checkstyleTest.enabled = false

src/main/java/org/elasticsearch/repositories/cos/COSClientSettings.java

@@ -1,7 +1,5 @@
 package org.elasticsearch.repositories.cos;
 
-import org.elasticsearch.common.settings.SecureSetting;
-import org.elasticsearch.common.settings.SecureString;
 import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.unit.ByteSizeUnit;
 import org.elasticsearch.common.unit.ByteSizeValue;
@@ -13,13 +11,13 @@ public class COSClientSettings {
     private static final ByteSizeValue MAX_CHUNK_SIZE = new ByteSizeValue(1, ByteSizeUnit.GB);
 
     public static final Setting<String> REGION =
-            Setting.simpleString("region", Property.NodeScope, Property.Dynamic);
-    public static final Setting<SecureString> ACCESS_KEY_ID =
-            SecureSetting.secureString("access_key_id", null);
-    public static final Setting<SecureString> ACCESS_KEY_SECRET =
-            SecureSetting.secureString("access_key_secret", null);
-    public static final Setting<String> APP_ID = Setting
-            .simpleString("app_id", "", Setting.Property.NodeScope, Setting.Property.Dynamic);
+            simpleString("region", Property.NodeScope, Property.Dynamic);
+    public static final Setting<String> ACCESS_KEY_ID =
+            simpleString("access_key_id", Setting.Property.NodeScope, Setting.Property.Dynamic);
+    public static final Setting<String> ACCESS_KEY_SECRET =
+            simpleString("access_key_secret", Setting.Property.NodeScope, Setting.Property.Dynamic);
+    public static final Setting<String> APP_ID =
+            simpleString("app_id", "", Setting.Property.NodeScope, Setting.Property.Dynamic);
     public static final Setting<String> BUCKET =
             simpleString("bucket", Setting.Property.NodeScope, Setting.Property.Dynamic);
     public static final Setting<String> BASE_PATH =
@@ -29,5 +27,5 @@ public class COSClientSettings {
     public static final Setting<ByteSizeValue> CHUNK_SIZE =
             byteSizeSetting("chunk_size", MAX_CHUNK_SIZE, MIN_CHUNK_SIZE, MAX_CHUNK_SIZE,
                     Setting.Property.NodeScope, Setting.Property.Dynamic);
-    public static final Setting<String> CosEndPoint = Setting.simpleString("cosEndPoint", "", Property.NodeScope, Property.Dynamic);
+    public static final Setting<String> END_POINT = Setting.simpleString("end_point", "", Property.NodeScope, Property.Dynamic);
 }

src/main/java/org/elasticsearch/repositories/cos/COSRepositoryPlugin.java

@@ -35,6 +35,6 @@ public Map<String, Repository.Factory> getRepositories(final Environment env,
     public List<Setting<?>> getSettings() {
         return Arrays.asList(COSClientSettings.REGION, COSClientSettings.ACCESS_KEY_ID, COSClientSettings.ACCESS_KEY_SECRET,
                 COSClientSettings.APP_ID, COSClientSettings.BUCKET,
-                COSClientSettings.BASE_PATH, COSClientSettings.COMPRESS, COSClientSettings.CHUNK_SIZE, COSClientSettings.CosEndPoint);
+                COSClientSettings.BASE_PATH, COSClientSettings.COMPRESS, COSClientSettings.CHUNK_SIZE, COSClientSettings.END_POINT);
     }
 }

src/main/java/org/elasticsearch/repositories/cos/COSService.java

@@ -25,13 +25,13 @@ public class COSService implements Closeable {
     }
 
     private synchronized COSClient createClient(RepositoryMetaData metaData) {
-        String access_key_id = COSClientSettings.ACCESS_KEY_ID.get(metaData.settings()).toString();
-        String access_key_secret = COSClientSettings.ACCESS_KEY_SECRET.get(metaData.settings()).toString();
+        String access_key_id = COSClientSettings.ACCESS_KEY_ID.get(metaData.settings());
+        String access_key_secret = COSClientSettings.ACCESS_KEY_SECRET.get(metaData.settings());
         String region = COSClientSettings.REGION.get(metaData.settings());
         if (region == null || !Strings.hasLength(region)) {
             throw new RepositoryException(metaData.name(), "No region defined for cos repository");
         }
-        String endPoint = COSClientSettings.CosEndPoint.get(metaData.settings());
+        String endPoint = COSClientSettings.END_POINT.get(metaData.settings());
 
         COSCredentials cred = new BasicCOSCredentials(access_key_id, access_key_secret);
         ClientConfig clientConfig = new ClientConfig(new Region(region));

src/test/java/org/elasticsearch/repositories/cos/RepositoryCosClientYamlTestSuiteIT.java

@@ -0,0 +1,18 @@
+package org.elasticsearch.repositories.cos;
+
+import com.carrotsearch.randomizedtesting.annotations.Name;
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
+import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
+
+public class RepositoryCosClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
+
+    public RepositoryCosClientYamlTestSuiteIT(@Name("yaml")ClientYamlTestCandidate testCandidate) {
+        super(testCandidate);
+    }
+
+    @ParametersFactory
+    public static Iterable<Object[]> parameters() throws Exception {
+        return ESClientYamlSuiteTestCase.createParameters();
+    }
+}

src/test/resources/rest-api-spec.test.repository_cos/10_basic.yml

@@ -0,0 +1,16 @@
+# Integration tests for repository-cos
+#
+"Plugin repository-cos is loaded":
+    - skip:
+        reason: "contains is a newly added assertion"
+        features: contains
+    - do:
+        cluster.state: {}
+
+    # Get master node id
+    - set: { master_node: master }
+
+    - do:
+        nodes.info: {}
+
+    - contains:  { nodes.$master.plugins: { name: CosRepository } }