Adapt integration tests to secure settings

dadoonet · dadoonet · commit cb783139e068 · 2017-09-25T11:27:34.000+02:00
That was a missing part in #23405.
diff --git a/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AbstractAzureWithThirdPartyIntegTestCase.java b/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AbstractAzureWithThirdPartyIntegTestCase.java
@@ -26,22 +26,25 @@
 import java.util.Arrays;
 import java.util.Collection;
 
-import static org.elasticsearch.repositories.azure.AzureTestUtils.readSettingsFromFile;
+import static org.elasticsearch.repositories.azure.AzureTestUtils.generateMockSecureSettings;
 
 /**
  * Base class for Azure tests that require credentials.
  * <p>
- * You must specify {@code -Dtests.thirdparty=true -Dtests.config=/path/to/config}
+ * You must specify {@code -Dtests.thirdparty=true -Dtests.azure.account=AzureStorageAccount -Dtests.azure.key=AzureStorageKey}
  * in order to run these tests.
  */
 @ThirdParty
 public abstract class AbstractAzureWithThirdPartyIntegTestCase extends AbstractAzureIntegTestCase {
 
+    Settings.Builder generateMockSettings() {
+        return Settings.builder().setSecureSettings(generateMockSecureSettings());
+    }
+
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
-        return Settings.builder()
+        return generateMockSettings()
                 .put(super.nodeSettings(nodeOrdinal))
-                .put(readSettingsFromFile())
                 .build();
     }
 
diff --git a/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreListSnapshotsTests.java b/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreListSnapshotsTests.java
@@ -33,14 +33,13 @@
 import java.net.URISyntaxException;
 import java.util.concurrent.TimeUnit;
 
-import static org.elasticsearch.repositories.azure.AzureTestUtils.readSettingsFromFile;
 import static org.elasticsearch.repositories.azure.AzureSnapshotRestoreTests.getContainerName;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.lessThanOrEqualTo;
 
 /**
  * This test needs Azure to run and -Dtests.thirdparty=true to be set
- * and -Dtests.config=/path/to/elasticsearch.yml
+ * and -Dtests.azure.account=AzureStorageAccount and -Dtests.azure.key=AzureStorageKey
  *
  * Note that this test requires an Azure storage account, with the account
  * and credentials set in the elasticsearch.yml config file passed in to the
@@ -55,8 +54,8 @@
         transportClientRatio = 0.0)
 public class AzureSnapshotRestoreListSnapshotsTests extends AbstractAzureWithThirdPartyIntegTestCase {
 
-    private final AzureStorageService azureStorageService = new AzureStorageServiceImpl(readSettingsFromFile(),
-        AzureStorageSettings.load(readSettingsFromFile()));
+    private final AzureStorageService azureStorageService = new AzureStorageServiceImpl(generateMockSettings().build(),
+        AzureStorageSettings.load(generateMockSettings().build()));
     private final String containerName = getContainerName();
 
     public AzureSnapshotRestoreListSnapshotsTests() {
diff --git a/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreTests.java b/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreTests.java
@@ -47,19 +47,18 @@
 import org.junit.Before;
 
 import java.net.URISyntaxException;
+import java.net.UnknownHostException;
 import java.util.Arrays;
 import java.util.Collection;
-import java.net.UnknownHostException;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
-import static org.elasticsearch.repositories.azure.AzureTestUtils.readSettingsFromFile;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
 
 /**
  * This test needs Azure to run and -Dtests.thirdparty=true to be set
- * and -Dtests.config=/path/to/elasticsearch.yml
+ * and -Dtests.azure.account=AzureStorageAccount and -Dtests.azure.key=AzureStorageKey
  * @see AbstractAzureWithThirdPartyIntegTestCase
  */
 @ClusterScope(
@@ -546,10 +545,10 @@ public static void wipeRepositories(String... repositories) {
      * Purge the test containers
      */
     public void cleanRepositoryFiles(String... containers) throws StorageException, URISyntaxException, UnknownHostException {
-        Settings settings = readSettingsFromFile();
-        AzureStorageService client = new AzureStorageServiceImpl(settings, AzureStorageSettings.load(settings));
+        AzureStorageService client = new AzureStorageServiceImpl(generateMockSettings().build(),
+            AzureStorageSettings.load(generateMockSettings().build()));
         for (String container : containers) {
-            client.removeContainer(null, LocationMode.PRIMARY_ONLY, container);
+            client.removeContainer("default", LocationMode.PRIMARY_ONLY, container);
         }
     }
 }
diff --git a/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureTestUtils.java b/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureTestUtils.java
@@ -20,36 +20,27 @@
 package org.elasticsearch.repositories.azure;
 
 import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.io.PathUtils;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.settings.SettingsException;
-
-import java.io.IOException;
+import org.elasticsearch.common.settings.MockSecureSettings;
+import org.elasticsearch.common.settings.SecureSettings;
 
 public class AzureTestUtils {
     /**
-     * Read settings from file when running integration tests with ThirdParty annotation.
-     * elasticsearch.yml file path has to be set with -Dtests.config=/path/to/elasticsearch.yml.
-     * @return Settings from elasticsearch.yml integration test file (for 3rd party tests)
+     * Mock secure settings from sysprops when running integration tests with ThirdParty annotation.
+     * Start the tests with {@code -Dtests.azure.account=AzureStorageAccount and -Dtests.azure.key=AzureStorageKey}
+     * @return Mock Settings from sysprops
      */
-    public static Settings readSettingsFromFile() {
-        Settings.Builder settings = Settings.builder();
+    public static SecureSettings generateMockSecureSettings() {
+        MockSecureSettings secureSettings = new MockSecureSettings();
 
-        // if explicit, just load it and don't load from env
-        try {
-            if (Strings.hasText(System.getProperty("tests.config"))) {
-                try {
-                    settings.loadFromPath(PathUtils.get((System.getProperty("tests.config"))));
-                } catch (IOException e) {
-                    throw new IllegalArgumentException("could not load azure tests config", e);
-                }
-            } else {
-                throw new IllegalStateException("to run integration tests, you need to set -Dtests.thirdparty=true and " +
-                    "-Dtests.config=/path/to/elasticsearch.yml");
-            }
-        } catch (SettingsException exception) {
-            throw new IllegalStateException("your test configuration file is incorrect: " + System.getProperty("tests.config"), exception);
+        if (Strings.isEmpty(System.getProperty("tests.azure.account")) ||
+            Strings.isEmpty(System.getProperty("tests.azure.key"))) {
+            throw new IllegalStateException("to run integration tests, you need to set -Dtests.thirdparty=true and " +
+                "-Dtests.azure.account=azure-account -Dtests.azure.key=azure-key");
         }
-        return settings.build();
+
+        secureSettings.setString("azure.client.default.account", System.getProperty("tests.azure.account"));
+        secureSettings.setString("azure.client.default.key", System.getProperty("tests.azure.key"));
+
+        return secureSettings;
     }
 }
