From d0894cb5d658ed20638c6824efecf90003cb50c5 Mon Sep 17 00:00:00 2001
From: Sarat <vemsarat@amazon.com>
Date: Tue, 13 Oct 2020 17:07:15 -0700
Subject: [PATCH 1/3] Adding User support for AD and ADJob

---
 build.gradle                                  |   3 ++
 libs/common-utils-1.10.1.0.jar                | Bin 0 -> 16868 bytes
 .../ad/AnomalyDetectorJobRunner.java          |   3 +-
 .../ad/model/AnomalyDetector.java             |  33 +++++++++++++-
 .../ad/model/AnomalyDetectorJob.java          |  32 ++++++++++++-
 .../IndexAnomalyDetectorActionHandler.java    |   3 +-
 .../IndexAnomalyDetectorJobActionHandler.java |   9 ++--
 .../ad/AnomalyDetectorJobRunnerTests.java     |   3 +-
 .../ad/AnomalyDetectorRestTestCase.java       |   6 ++-
 .../ad/TestHelpers.java                       |  25 ++++++++---
 .../ad/model/AnomalyDetectorTests.java        |  27 +++++++----
 .../ad/rest/AnomalyDetectorRestApiIT.java     |  42 +++++++++---------
 12 files changed, 139 insertions(+), 47 deletions(-)
 create mode 100644 libs/common-utils-1.10.1.0.jar

diff --git a/build.gradle b/build.gradle
index cf142b6a..45b856e0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -298,6 +298,8 @@ dependencies {
     compile "org.elasticsearch:elasticsearch:${es_version}"
     compileOnly "org.elasticsearch.plugin:elasticsearch-scripting-painless-spi:${versions.elasticsearch}"
     compileOnly "com.amazon.opendistroforelasticsearch:opendistro-job-scheduler-spi:1.10.1.1"
+    // Will be moved to Maven Depedency when https://github.com/opendistro-for-elasticsearch/common-utils repo publishes a release
+    compile files('libs/common-utils-1.10.1.0.jar')
     compile group: 'com.google.guava', name: 'guava', version:'15.0'
     compile group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
     compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
@@ -306,6 +308,7 @@ dependencies {
     compile group: 'commons-lang', name: 'commons-lang', version: '2.6'
     compile 'software.amazon.randomcutforest:randomcutforest-core:1.0'
     compile 'software.amazon.randomcutforest:randomcutforest-serialization-json:1.0'
+    compile "org.elasticsearch.client:elasticsearch-rest-client:${es_version}"
 
     compile "org.jacoco:org.jacoco.agent:0.8.5"
     compile ("org.jacoco:org.jacoco.ant:0.8.5") {
diff --git a/libs/common-utils-1.10.1.0.jar b/libs/common-utils-1.10.1.0.jar
new file mode 100644
index 0000000000000000000000000000000000000000..240e655bb6e12d3b5832a18b0a301a26fc95583c
GIT binary patch
literal 16868
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
Xf;8yIw&K^=j{t!6@zlWm>(~DS@Gx>b

literal 0
HcmV?d00001

diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorJobRunner.java b/src/main/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorJobRunner.java
index 28348bc4..bba4086d 100644
--- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorJobRunner.java
+++ b/src/main/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorJobRunner.java
@@ -381,7 +381,8 @@ private void stopAdJob(String detectorId) {
                                 job.getEnabledTime(),
                                 Instant.now(),
                                 Instant.now(),
-                                job.getLockDurationSeconds()
+                                job.getLockDurationSeconds(),
+                                job.getUser()
                             );
                             IndexRequest indexRequest = new IndexRequest(AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX)
                                 .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)
diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetector.java b/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetector.java
index 50083b02..bffed915 100644
--- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetector.java
+++ b/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetector.java
@@ -45,6 +45,7 @@
 
 import com.amazon.opendistroforelasticsearch.ad.annotation.Generated;
 import com.amazon.opendistroforelasticsearch.ad.util.ParseUtils;
+import com.amazon.opendistroforelasticsearch.commons.authuser.User;
 import com.google.common.base.Objects;
 
 /**
@@ -76,6 +77,7 @@ public class AnomalyDetector implements Writeable, ToXContentObject {
     private static final String SHINGLE_SIZE_FIELD = "shingle_size";
     private static final String LAST_UPDATE_TIME_FIELD = "last_update_time";
     public static final String UI_METADATA_FIELD = "ui_metadata";
+    public static final String USER_FIELD = "user";
 
     private final String detectorId;
     private final Long version;
@@ -91,6 +93,7 @@ public class AnomalyDetector implements Writeable, ToXContentObject {
     private final Map<String, Object> uiMetadata;
     private final Integer schemaVersion;
     private final Instant lastUpdateTime;
+    private User user;
 
     /**
      * Constructor function.
@@ -109,6 +112,7 @@ public class AnomalyDetector implements Writeable, ToXContentObject {
      * @param uiMetadata        metadata used by Kibana
      * @param schemaVersion     anomaly detector index mapping version
      * @param lastUpdateTime    detector's last update time
+     * @param user              user to which detector is associated
      */
     public AnomalyDetector(
         String detectorId,
@@ -124,7 +128,8 @@ public AnomalyDetector(
         Integer shingleSize,
         Map<String, Object> uiMetadata,
         Integer schemaVersion,
-        Instant lastUpdateTime
+        Instant lastUpdateTime,
+        User user
     ) {
         if (Strings.isBlank(name)) {
             throw new IllegalArgumentException("Detector name should be set");
@@ -155,6 +160,7 @@ public AnomalyDetector(
         this.uiMetadata = uiMetadata;
         this.schemaVersion = schemaVersion;
         this.lastUpdateTime = lastUpdateTime;
+        this.user = user;
     }
 
     public AnomalyDetector(StreamInput input) throws IOException {
@@ -188,6 +194,11 @@ public AnomalyDetector(StreamInput input) throws IOException {
         uiMetadata = input.readMap();
         schemaVersion = input.readInt();
         lastUpdateTime = input.readInstant();
+        if (input.readBoolean()) {
+            this.user = new User(input);
+        } else {
+            user = null;
+        }
     }
 
     public XContentBuilder toXContent(XContentBuilder builder) throws IOException {
@@ -210,6 +221,12 @@ public void writeTo(StreamOutput output) throws IOException {
         output.writeMap(uiMetadata);
         output.writeInt(schemaVersion);
         output.writeInstant(lastUpdateTime);
+        if (user != null) {
+            output.writeBoolean(true); // user exists
+            user.writeTo(output);
+        } else {
+            output.writeBoolean(false); // user does not exist
+        }
     }
 
     @Override
@@ -236,6 +253,9 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         if (lastUpdateTime != null) {
             xContentBuilder.timeField(LAST_UPDATE_TIME_FIELD, LAST_UPDATE_TIME_FIELD, lastUpdateTime.toEpochMilli());
         }
+        if (user != null) {
+            xContentBuilder.field(USER_FIELD, user);
+        }
         return xContentBuilder.endObject();
     }
 
@@ -303,6 +323,7 @@ public static AnomalyDetector parse(
         int schemaVersion = 0;
         Map<String, Object> uiMetadata = null;
         Instant lastUpdateTime = null;
+        User user = null;
 
         ensureExpectedToken(XContentParser.Token.START_OBJECT, parser.currentToken(), parser::getTokenLocation);
         while (parser.nextToken() != XContentParser.Token.END_OBJECT) {
@@ -359,6 +380,9 @@ public static AnomalyDetector parse(
                 case LAST_UPDATE_TIME_FIELD:
                     lastUpdateTime = ParseUtils.toInstant(parser);
                     break;
+                case USER_FIELD:
+                    user = User.parse(parser);
+                    break;
                 default:
                     parser.skipChildren();
                     break;
@@ -378,7 +402,8 @@ public static AnomalyDetector parse(
             shingleSize,
             uiMetadata,
             schemaVersion,
-            lastUpdateTime
+            lastUpdateTime,
+            user
         );
     }
 
@@ -498,4 +523,8 @@ public Instant getLastUpdateTime() {
         return lastUpdateTime;
     }
 
+    public User getUser() {
+        return user;
+    }
+
 }
diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorJob.java b/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorJob.java
index d430daf2..096c7256 100644
--- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorJob.java
+++ b/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorJob.java
@@ -31,6 +31,7 @@
 import org.elasticsearch.common.xcontent.XContentParser;
 
 import com.amazon.opendistroforelasticsearch.ad.util.ParseUtils;
+import com.amazon.opendistroforelasticsearch.commons.authuser.User;
 import com.amazon.opendistroforelasticsearch.jobscheduler.spi.ScheduledJobParameter;
 import com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule.CronSchedule;
 import com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule.IntervalSchedule;
@@ -64,6 +65,7 @@ enum ScheduleType {
     private static final String IS_ENABLED_FIELD = "enabled";
     private static final String ENABLED_TIME_FIELD = "enabled_time";
     private static final String DISABLED_TIME_FIELD = "disabled_time";
+    public static final String USER_FIELD = "user";
 
     private final String name;
     private final Schedule schedule;
@@ -73,6 +75,7 @@ enum ScheduleType {
     private final Instant disabledTime;
     private final Instant lastUpdateTime;
     private final Long lockDurationSeconds;
+    private final User user;
 
     public AnomalyDetectorJob(
         String name,
@@ -82,7 +85,8 @@ public AnomalyDetectorJob(
         Instant enabledTime,
         Instant disabledTime,
         Instant lastUpdateTime,
-        Long lockDurationSeconds
+        Long lockDurationSeconds,
+        User user
     ) {
         this.name = name;
         this.schedule = schedule;
@@ -92,6 +96,7 @@ public AnomalyDetectorJob(
         this.disabledTime = disabledTime;
         this.lastUpdateTime = lastUpdateTime;
         this.lockDurationSeconds = lockDurationSeconds;
+        this.user = user;
     }
 
     public AnomalyDetectorJob(StreamInput input) throws IOException {
@@ -107,6 +112,11 @@ public AnomalyDetectorJob(StreamInput input) throws IOException {
         disabledTime = input.readInstant();
         lastUpdateTime = input.readInstant();
         lockDurationSeconds = input.readLong();
+        if (input.readBoolean()) {
+            user = new User(input);
+        } else {
+            user = null;
+        }
     }
 
     @Override
@@ -123,6 +133,9 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         if (disabledTime != null) {
             xContentBuilder.field(DISABLED_TIME_FIELD, disabledTime.toEpochMilli());
         }
+        if (user != null) {
+            xContentBuilder.field(USER_FIELD, user);
+        }
         return xContentBuilder.endObject();
     }
 
@@ -140,6 +153,12 @@ public void writeTo(StreamOutput output) throws IOException {
         output.writeInstant(disabledTime);
         output.writeInstant(lastUpdateTime);
         output.writeLong(lockDurationSeconds);
+        if (user != null) {
+            output.writeBoolean(true); // user exists
+            user.writeTo(output);
+        } else {
+            output.writeBoolean(false); // user does not exist
+        }
     }
 
     public static AnomalyDetectorJob parse(XContentParser parser) throws IOException {
@@ -152,6 +171,7 @@ public static AnomalyDetectorJob parse(XContentParser parser) throws IOException
         Instant disabledTime = null;
         Instant lastUpdateTime = null;
         Long lockDurationSeconds = DEFAULT_AD_JOB_LOC_DURATION_SECONDS;
+        User user = null;
 
         ensureExpectedToken(XContentParser.Token.START_OBJECT, parser.currentToken(), parser::getTokenLocation);
         while (parser.nextToken() != XContentParser.Token.END_OBJECT) {
@@ -183,6 +203,9 @@ public static AnomalyDetectorJob parse(XContentParser parser) throws IOException
                 case LOCK_DURATION_SECONDS:
                     lockDurationSeconds = parser.longValue();
                     break;
+                case USER_FIELD:
+                    user = User.parse(parser);
+                    break;
                 default:
                     parser.skipChildren();
                     break;
@@ -196,7 +219,8 @@ public static AnomalyDetectorJob parse(XContentParser parser) throws IOException
             enabledTime,
             disabledTime,
             lastUpdateTime,
-            lockDurationSeconds
+            lockDurationSeconds,
+            user
         );
     }
 
@@ -258,4 +282,8 @@ public Instant getLastUpdateTime() {
     public Long getLockDurationSeconds() {
         return lockDurationSeconds;
     }
+
+    public User getUser() {
+        return user;
+    }
 }
diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/handler/IndexAnomalyDetectorActionHandler.java b/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/handler/IndexAnomalyDetectorActionHandler.java
index 942e9ae1..3d4ed289 100644
--- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/handler/IndexAnomalyDetectorActionHandler.java
+++ b/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/handler/IndexAnomalyDetectorActionHandler.java
@@ -302,7 +302,8 @@ private void indexAnomalyDetector(String detectorId) throws IOException {
             anomalyDetector.getShingleSize(),
             anomalyDetector.getUiMetadata(),
             anomalyDetector.getSchemaVersion(),
-            Instant.now()
+            Instant.now(),
+            anomalyDetector.getUser()
         );
         IndexRequest indexRequest = new IndexRequest(ANOMALY_DETECTORS_INDEX)
             .setRefreshPolicy(refreshPolicy)
diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/handler/IndexAnomalyDetectorJobActionHandler.java b/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/handler/IndexAnomalyDetectorJobActionHandler.java
index 4cf0894c..ce4db89e 100644
--- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/handler/IndexAnomalyDetectorJobActionHandler.java
+++ b/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/handler/IndexAnomalyDetectorJobActionHandler.java
@@ -163,7 +163,8 @@ private void onGetAnomalyDetectorResponse(GetResponse response) throws IOExcepti
                 Instant.now(),
                 null,
                 Instant.now(),
-                duration.getSeconds()
+                duration.getSeconds(),
+                detector.getUser()
             );
 
             getAnomalyDetectorJobForWrite(job);
@@ -201,7 +202,8 @@ private void onGetAnomalyDetectorJobForWrite(GetResponse response, AnomalyDetect
                         Instant.now(),
                         currentAdJob.getDisabledTime(),
                         Instant.now(),
-                        job.getLockDurationSeconds()
+                        job.getLockDurationSeconds(),
+                        job.getUser()
                     );
                     indexAnomalyDetectorJob(newJob, null);
                 }
@@ -278,7 +280,8 @@ public void stopAnomalyDetectorJob(String detectorId) {
                             job.getEnabledTime(),
                             Instant.now(),
                             Instant.now(),
-                            job.getLockDurationSeconds()
+                            job.getLockDurationSeconds(),
+                            job.getUser()
                         );
                         indexAnomalyDetectorJob(
                             newJob,
diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorJobRunnerTests.java b/src/test/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorJobRunnerTests.java
index 35dd8a65..66692584 100644
--- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorJobRunnerTests.java
+++ b/src/test/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorJobRunnerTests.java
@@ -310,7 +310,8 @@ private void testRunAdJobWithEndRunExceptionNowAndStopAdJob(boolean jobExists, b
                                 Instant.now().minusSeconds(60),
                                 Instant.now(),
                                 Instant.now(),
-                                60L
+                                60L,
+                                TestHelpers.randomUser()
                             ).toXContent(TestHelpers.builder(), ToXContent.EMPTY_PARAMS)
                         ),
                     Collections.emptyMap(),
diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorRestTestCase.java b/src/test/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorRestTestCase.java
index b6786968..17adb9d4 100644
--- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorRestTestCase.java
+++ b/src/test/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorRestTestCase.java
@@ -106,7 +106,8 @@ protected AnomalyDetector createAnomalyDetector(AnomalyDetector detector, Boolea
             detector.getShingleSize(),
             detector.getUiMetadata(),
             detector.getSchemaVersion(),
-            detector.getLastUpdateTime()
+            detector.getLastUpdateTime(),
+            detector.getUser()
         );
     }
 
@@ -176,7 +177,8 @@ public ToXContentObject[] getAnomalyDetector(String detectorId, BasicHeader head
                 detector.getShingleSize(),
                 detector.getUiMetadata(),
                 detector.getSchemaVersion(),
-                detector.getLastUpdateTime()
+                detector.getLastUpdateTime(),
+                detector.getUser()
             ),
             detectorJob };
     }
diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/TestHelpers.java b/src/test/java/com/amazon/opendistroforelasticsearch/ad/TestHelpers.java
index d7c394b9..e1ffd58d 100644
--- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/TestHelpers.java
+++ b/src/test/java/com/amazon/opendistroforelasticsearch/ad/TestHelpers.java
@@ -105,6 +105,7 @@
 import com.amazon.opendistroforelasticsearch.ad.model.FeatureData;
 import com.amazon.opendistroforelasticsearch.ad.model.IntervalTimeConfiguration;
 import com.amazon.opendistroforelasticsearch.ad.model.TimeConfiguration;
+import com.amazon.opendistroforelasticsearch.commons.authuser.User;
 import com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule.IntervalSchedule;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -193,7 +194,8 @@ public static AnomalyDetector randomAnomalyDetector(List<Feature> features, Map<
             randomIntBetween(1, 2000),
             uiMetadata,
             randomInt(),
-            lastUpdateTime
+            lastUpdateTime,
+            randomUser()
         );
     }
 
@@ -212,7 +214,8 @@ public static AnomalyDetector randomAnomalyDetector(List<Feature> features) thro
             randomIntBetween(1, 2000),
             null,
             randomInt(),
-            Instant.now()
+            Instant.now(),
+            randomUser()
         );
     }
 
@@ -231,7 +234,8 @@ public static AnomalyDetector randomAnomalyDetectorWithEmptyFeature() throws IOE
             randomIntBetween(1, 2000),
             null,
             randomInt(),
-            Instant.now().truncatedTo(ChronoUnit.SECONDS)
+            Instant.now().truncatedTo(ChronoUnit.SECONDS),
+            randomUser()
         );
     }
 
@@ -250,7 +254,8 @@ public static AnomalyDetector randomAnomalyDetectorWithInterval(TimeConfiguratio
             randomIntBetween(1, 2000),
             null,
             randomInt(),
-            Instant.now().truncatedTo(ChronoUnit.SECONDS)
+            Instant.now().truncatedTo(ChronoUnit.SECONDS),
+            randomUser()
         );
     }
 
@@ -317,6 +322,15 @@ public static Feature randomFeature(String featureName, String aggregationName)
         return new Feature(randomAlphaOfLength(5), featureName, ESRestTestCase.randomBoolean(), testAggregation);
     }
 
+    public static User randomUser() {
+        return new User(
+            randomAlphaOfLength(8),
+            ImmutableList.of(randomAlphaOfLength(10)),
+            ImmutableList.of("all_access"),
+            ImmutableList.of("attribute=test")
+        );
+    }
+
     public static <S, T> void assertFailWith(Class<S> clazz, Callable<T> callable) throws Exception {
         assertFailWith(clazz, null, callable);
     }
@@ -378,7 +392,8 @@ public static AnomalyDetectorJob randomAnomalyDetectorJob(boolean enabled, Insta
             enabledTime,
             disabledTime,
             Instant.now().truncatedTo(ChronoUnit.SECONDS),
-            60L
+            60L,
+            randomUser()
         );
     }
 
diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorTests.java b/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorTests.java
index da3ddcd9..2247114c 100644
--- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorTests.java
+++ b/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorTests.java
@@ -139,7 +139,8 @@ public void testInvalidShingleSize() throws Exception {
                     0,
                     null,
                     1,
-                    Instant.now()
+                    Instant.now(),
+                    TestHelpers.randomUser()
                 )
             );
     }
@@ -162,7 +163,8 @@ public void testNullDetectorName() throws Exception {
                     AnomalyDetectorSettings.DEFAULT_SHINGLE_SIZE,
                     null,
                     1,
-                    Instant.now()
+                    Instant.now(),
+                    TestHelpers.randomUser()
                 )
             );
     }
@@ -185,7 +187,8 @@ public void testBlankDetectorName() throws Exception {
                     AnomalyDetectorSettings.DEFAULT_SHINGLE_SIZE,
                     null,
                     1,
-                    Instant.now()
+                    Instant.now(),
+                    TestHelpers.randomUser()
                 )
             );
     }
@@ -208,7 +211,8 @@ public void testNullTimeField() throws Exception {
                     AnomalyDetectorSettings.DEFAULT_SHINGLE_SIZE,
                     null,
                     1,
-                    Instant.now()
+                    Instant.now(),
+                    TestHelpers.randomUser()
                 )
             );
     }
@@ -231,7 +235,8 @@ public void testNullIndices() throws Exception {
                     AnomalyDetectorSettings.DEFAULT_SHINGLE_SIZE,
                     null,
                     1,
-                    Instant.now()
+                    Instant.now(),
+                    TestHelpers.randomUser()
                 )
             );
     }
@@ -254,7 +259,8 @@ public void testEmptyIndices() throws Exception {
                     AnomalyDetectorSettings.DEFAULT_SHINGLE_SIZE,
                     null,
                     1,
-                    Instant.now()
+                    Instant.now(),
+                    TestHelpers.randomUser()
                 )
             );
     }
@@ -277,7 +283,8 @@ public void testNullDetectionInterval() throws Exception {
                     AnomalyDetectorSettings.DEFAULT_SHINGLE_SIZE,
                     null,
                     1,
-                    Instant.now()
+                    Instant.now(),
+                    TestHelpers.randomUser()
                 )
             );
     }
@@ -312,7 +319,8 @@ public void testGetShingleSize() throws IOException {
             5,
             null,
             1,
-            Instant.now()
+            Instant.now(),
+            TestHelpers.randomUser()
         );
         assertEquals((int) anomalyDetector.getShingleSize(), 5);
     }
@@ -332,7 +340,8 @@ public void testGetShingleSizeReturnsDefaultValue() throws IOException {
             null,
             null,
             1,
-            Instant.now()
+            Instant.now(),
+            TestHelpers.randomUser()
         );
         assertEquals((int) anomalyDetector.getShingleSize(), AnomalyDetectorSettings.DEFAULT_SHINGLE_SIZE);
     }
diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/rest/AnomalyDetectorRestApiIT.java b/src/test/java/com/amazon/opendistroforelasticsearch/ad/rest/AnomalyDetectorRestApiIT.java
index a51d4c8c..2c576299 100644
--- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/rest/AnomalyDetectorRestApiIT.java
+++ b/src/test/java/com/amazon/opendistroforelasticsearch/ad/rest/AnomalyDetectorRestApiIT.java
@@ -15,12 +15,6 @@
 
 package com.amazon.opendistroforelasticsearch.ad.rest;
 
-import static com.amazon.opendistroforelasticsearch.ad.TestHelpers.AD_BASE_PREVIEW_URI;
-import static com.amazon.opendistroforelasticsearch.ad.TestHelpers.randomAnomalyDetectorWithEmptyFeature;
-import static com.amazon.opendistroforelasticsearch.ad.TestHelpers.randomFeature;
-import static com.amazon.opendistroforelasticsearch.ad.TestHelpers.randomIntervalTimeConfiguration;
-import static com.amazon.opendistroforelasticsearch.ad.TestHelpers.randomQuery;
-import static com.amazon.opendistroforelasticsearch.ad.TestHelpers.randomUiMetadata;
 import static org.hamcrest.Matchers.containsString;
 
 import java.io.IOException;
@@ -93,14 +87,15 @@ public void testCreateAnomalyDetectorWithDuplicateName() throws Exception {
             randomAlphaOfLength(5),
             randomAlphaOfLength(5),
             detector.getIndices(),
-            ImmutableList.of(randomFeature()),
-            randomQuery(),
-            randomIntervalTimeConfiguration(),
-            randomIntervalTimeConfiguration(),
+            ImmutableList.of(TestHelpers.randomFeature()),
+            TestHelpers.randomQuery(),
+            TestHelpers.randomIntervalTimeConfiguration(),
+            TestHelpers.randomIntervalTimeConfiguration(),
             randomIntBetween(1, 2000),
-            randomUiMetadata(),
+            TestHelpers.randomUiMetadata(),
             randomInt(),
-            null
+            null,
+            TestHelpers.randomUser()
         );
 
         TestHelpers
@@ -182,7 +177,8 @@ public void testUpdateAnomalyDetectorA() throws Exception {
             detector.getShingleSize(),
             detector.getUiMetadata(),
             detector.getSchemaVersion(),
-            detector.getLastUpdateTime()
+            detector.getLastUpdateTime(),
+            detector.getUser()
         );
 
         updateClusterSettings(EnabledSetting.AD_PLUGIN_ENABLED, false);
@@ -242,7 +238,8 @@ public void testUpdateAnomalyDetectorNameToExisting() throws Exception {
             detector1.getShingleSize(),
             detector1.getUiMetadata(),
             detector1.getSchemaVersion(),
-            detector1.getLastUpdateTime()
+            detector1.getLastUpdateTime(),
+            detector1.getUser()
         );
 
         TestHelpers
@@ -278,7 +275,8 @@ public void testUpdateAnomalyDetectorNameToNew() throws Exception {
             detector.getShingleSize(),
             detector.getUiMetadata(),
             detector.getSchemaVersion(),
-            Instant.now()
+            Instant.now(),
+            detector.getUser()
         );
 
         TestHelpers
@@ -320,7 +318,8 @@ public void testUpdateAnomalyDetectorWithNotExistingIndex() throws Exception {
             detector.getShingleSize(),
             detector.getUiMetadata(),
             detector.getSchemaVersion(),
-            detector.getLastUpdateTime()
+            detector.getLastUpdateTime(),
+            detector.getUser()
         );
 
         deleteIndex(AnomalyDetector.ANOMALY_DETECTORS_INDEX);
@@ -408,7 +407,7 @@ public void testPreviewAnomalyDetector() throws Exception {
                 .makeRequest(
                     client(),
                     "POST",
-                    String.format(AD_BASE_PREVIEW_URI, input.getDetectorId()),
+                    String.format(TestHelpers.AD_BASE_PREVIEW_URI, input.getDetectorId()),
                     ImmutableMap.of(),
                     toHttpEntity(input),
                     null
@@ -422,7 +421,7 @@ public void testPreviewAnomalyDetector() throws Exception {
             .makeRequest(
                 client(),
                 "POST",
-                String.format(AD_BASE_PREVIEW_URI, input.getDetectorId()),
+                String.format(TestHelpers.AD_BASE_PREVIEW_URI, input.getDetectorId()),
                 ImmutableMap.of(),
                 toHttpEntity(input),
                 null
@@ -487,7 +486,7 @@ public void testPreviewAnomalyDetectorWithDetector() throws Exception {
             .makeRequest(
                 client(),
                 "POST",
-                String.format(AD_BASE_PREVIEW_URI, input.getDetectorId()),
+                String.format(TestHelpers.AD_BASE_PREVIEW_URI, input.getDetectorId()),
                 ImmutableMap.of(),
                 toHttpEntity(input),
                 null
@@ -501,7 +500,7 @@ public void testPreviewAnomalyDetectorWithDetectorAndNoFeatures() throws Excepti
             detector.getDetectorId(),
             Instant.now().minusSeconds(60 * 10),
             Instant.now(),
-            randomAnomalyDetectorWithEmptyFeature()
+            TestHelpers.randomAnomalyDetectorWithEmptyFeature()
         );
         TestHelpers
             .assertFailWith(
@@ -702,7 +701,8 @@ public void testUpdateAnomalyDetectorWithRunningAdJob() throws Exception {
             detector.getShingleSize(),
             detector.getUiMetadata(),
             detector.getSchemaVersion(),
-            detector.getLastUpdateTime()
+            detector.getLastUpdateTime(),
+            detector.getUser()
         );
 
         TestHelpers

From ec266d0c419ce0acd696e84cad8fde89fdbffdc5 Mon Sep 17 00:00:00 2001
From: Sarat <vemsarat@amazon.com>
Date: Tue, 13 Oct 2020 18:54:20 -0700
Subject: [PATCH 2/3] Adding spotless recommended changes

---
 .../amazon/opendistroforelasticsearch/ad/TestHelpers.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/TestHelpers.java b/src/test/java/com/amazon/opendistroforelasticsearch/ad/TestHelpers.java
index a7bd5751..da0e417b 100644
--- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/TestHelpers.java
+++ b/src/test/java/com/amazon/opendistroforelasticsearch/ad/TestHelpers.java
@@ -376,10 +376,10 @@ public static Feature randomFeature(String featureName, String aggregationName,
 
     public static User randomUser() {
         return new User(
-                randomAlphaOfLength(8),
-                ImmutableList.of(randomAlphaOfLength(10)),
-                ImmutableList.of("all_access"),
-                ImmutableList.of("attribute=test")
+            randomAlphaOfLength(8),
+            ImmutableList.of(randomAlphaOfLength(10)),
+            ImmutableList.of("all_access"),
+            ImmutableList.of("attribute=test")
         );
     }
 

From 010c88c43b52cce58a46630dda89115a1fe05375 Mon Sep 17 00:00:00 2001
From: Sarat <vemsarat@amazon.com>
Date: Wed, 14 Oct 2020 00:58:07 -0700
Subject: [PATCH 3/3] Updated AD and ADJob Mappings with User information

---
 .../mappings/anomaly-detector-jobs.json       | 37 +++++++++++++++++++
 .../resources/mappings/anomaly-detectors.json | 37 +++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/src/main/resources/mappings/anomaly-detector-jobs.json b/src/main/resources/mappings/anomaly-detector-jobs.json
index ccd9d958..734b487a 100644
--- a/src/main/resources/mappings/anomaly-detector-jobs.json
+++ b/src/main/resources/mappings/anomaly-detector-jobs.json
@@ -59,6 +59,43 @@
     },
     "lock_duration_seconds": {
       "type": "long"
+    },
+    "user": {
+      "properties": {
+        "name": {
+          "type": "text",
+          "fields": {
+            "keyword": {
+              "type": "keyword",
+              "ignore_above": 256
+            }
+          }
+        },
+        "backend_roles": {
+          "type" : "text",
+          "fields" : {
+            "keyword" : {
+              "type" : "keyword"
+            }
+          }
+        },
+        "roles": {
+          "type" : "text",
+          "fields" : {
+            "keyword" : {
+              "type" : "keyword"
+            }
+          }
+        },
+        "custom_attribute_names": {
+          "type" : "text",
+          "fields" : {
+            "keyword" : {
+              "type" : "keyword"
+            }
+          }
+        }
+      }
     }
   }
 }
diff --git a/src/main/resources/mappings/anomaly-detectors.json b/src/main/resources/mappings/anomaly-detectors.json
index 7fd79f4f..e9d701ee 100644
--- a/src/main/resources/mappings/anomaly-detectors.json
+++ b/src/main/resources/mappings/anomaly-detectors.json
@@ -103,6 +103,43 @@
     "ui_metadata": {
       "type": "object",
       "enabled": false
+    },
+    "user": {
+      "properties": {
+        "name": {
+          "type": "text",
+          "fields": {
+            "keyword": {
+              "type": "keyword",
+              "ignore_above": 256
+            }
+          }
+        },
+        "backend_roles": {
+          "type" : "text",
+          "fields" : {
+            "keyword" : {
+              "type" : "keyword"
+            }
+          }
+        },
+        "roles": {
+          "type" : "text",
+          "fields" : {
+            "keyword" : {
+              "type" : "keyword"
+            }
+          }
+        },
+        "custom_attribute_names": {
+          "type" : "text",
+          "fields" : {
+            "keyword" : {
+              "type" : "keyword"
+            }
+          }
+        }
+      }
     }
   }
 }