Watcher: Ensure secrets integration tests also run triggered watch (#…

…30478) When the encrpytion of sensitive date is enabled, test that a scheduled watch is executed as expected and produces the correct value from a secret in the basic auth header.
elastic · May 16, 2018 · 6ec5e44 · 6ec5e44
1 parent 3161386
commit 6ec5e44
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/...ain/java/org/elasticsearch/xpack/core/watcher/support/xcontent/WatcherXContentParser.java b/...ain/java/org/elasticsearch/xpack/core/watcher/support/xcontent/WatcherXContentParser.java
@@ -5,8 +5,6 @@
  */
 package org.elasticsearch.xpack.core.watcher.support.xcontent;
 
-import org.apache.lucene.util.BytesRef;
-import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.xcontent.DeprecationHandler;

diff --git a/...st/java/org/elasticsearch/xpack/watcher/test/integration/HttpSecretsIntegrationTests.java b/...st/java/org/elasticsearch/xpack/watcher/test/integration/HttpSecretsIntegrationTests.java
@@ -57,7 +57,7 @@ public class HttpSecretsIntegrationTests extends AbstractWatcherIntegrationTestC
 
     private MockWebServer webServer = new MockWebServer();
     private static Boolean encryptSensitiveData = null;
-    private static byte[] encryptionKey = CryptoServiceTests.generateKey();
+    private static final byte[] encryptionKey = CryptoServiceTests.generateKey();
 
     @Before
     public void init() throws Exception {
@@ -155,6 +155,14 @@ public void testHttpInput() throws Exception {
         assertThat(webServer.requests(), hasSize(1));
         assertThat(webServer.requests().get(0).getHeader("Authorization"),
                 is(ApplicableBasicAuth.headerValue(USERNAME, PASSWORD.toCharArray())));
+
+        // now trigger the by the scheduler and make sure that the password is also correctly transmitted
+        webServer.enqueue(new MockResponse().setResponseCode(200).setBody(
+            BytesReference.bytes(jsonBuilder().startObject().field("key", "value").endObject()).utf8ToString()));
+        timeWarp().trigger("_id");
+        assertThat(webServer.requests(), hasSize(2));
+        assertThat(webServer.requests().get(1).getHeader("Authorization"),
+            is(ApplicableBasicAuth.headerValue(USERNAME, PASSWORD.toCharArray())));
     }
 
     public void testWebhookAction() throws Exception {

diff --git a/...cher/src/test/java/org/elasticsearch/xpack/watcher/trigger/ScheduleTriggerEngineMock.java b/...cher/src/test/java/org/elasticsearch/xpack/watcher/trigger/ScheduleTriggerEngineMock.java
@@ -53,6 +53,7 @@ public ScheduleTriggerEvent parseTriggerEvent(TriggerService service, String wat
 
     @Override
     public void start(Collection<Watch> jobs) {
+        jobs.forEach(this::add);
     }
 
     @Override