From 40eed32edcf702de306db4f1a0ec8d2312ce7ac3 Mon Sep 17 00:00:00 2001
From: Ryan Liang <jiallian@amazon.com>
Date: Fri, 25 Aug 2023 09:55:19 -0700
Subject: [PATCH] Fix V6 and V7 and lint

Signed-off-by: Ryan Liang <jiallian@amazon.com>
---
 .../onbehalf/CreateOnBehalfOfTokenAction.java |  1 -
 .../securityconf/impl/v6/ConfigV6.java        | 21 ++++++++++++++++++-
 .../securityconf/impl/v7/ConfigV7.java        |  4 ++--
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/opensearch/security/action/onbehalf/CreateOnBehalfOfTokenAction.java b/src/main/java/org/opensearch/security/action/onbehalf/CreateOnBehalfOfTokenAction.java
index 8a2f730236..2459d469df 100644
--- a/src/main/java/org/opensearch/security/action/onbehalf/CreateOnBehalfOfTokenAction.java
+++ b/src/main/java/org/opensearch/security/action/onbehalf/CreateOnBehalfOfTokenAction.java
@@ -24,7 +24,6 @@
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.core.common.transport.TransportAddress;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.BytesRestResponse;
diff --git a/src/main/java/org/opensearch/security/securityconf/impl/v6/ConfigV6.java b/src/main/java/org/opensearch/security/securityconf/impl/v6/ConfigV6.java
index 3ecdeddadf..1e92c5948a 100644
--- a/src/main/java/org/opensearch/security/securityconf/impl/v6/ConfigV6.java
+++ b/src/main/java/org/opensearch/security/securityconf/impl/v6/ConfigV6.java
@@ -358,11 +358,30 @@ public String toString() {
     }
 
     public static class OnBehalfOfSettings {
+        @JsonProperty("enabled")
+        private Boolean oboEnabled = Boolean.TRUE;
         @JsonProperty("signing_key")
         private String signingKey;
         @JsonProperty("encryption_key")
         private String encryptionKey;
 
+        @JsonIgnore
+        public String configAsJson() {
+            try {
+                return DefaultObjectMapper.writeValueAsString(this, false);
+            } catch (JsonProcessingException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        public Boolean getOboEnabled() {
+            return oboEnabled;
+        }
+
+        public void setOboEnabled(Boolean oboEnabled) {
+            this.oboEnabled = oboEnabled;
+        }
+
         public String getSigningKey() {
             return signingKey;
         }
@@ -381,7 +400,7 @@ public void setEncryptionKey(String encryptionKey) {
 
         @Override
         public String toString() {
-            return "OnBehalfOf [signing_key=" + signingKey + ", encryption_key=" + encryptionKey + "]";
+            return "OnBehalfOf [ enabled=" + oboEnabled + ", signing_key=" + signingKey + ", encryption_key=" + encryptionKey + "]";
         }
     }
 
diff --git a/src/main/java/org/opensearch/security/securityconf/impl/v7/ConfigV7.java b/src/main/java/org/opensearch/security/securityconf/impl/v7/ConfigV7.java
index 02f3037021..49fa3a13cc 100644
--- a/src/main/java/org/opensearch/security/securityconf/impl/v7/ConfigV7.java
+++ b/src/main/java/org/opensearch/security/securityconf/impl/v7/ConfigV7.java
@@ -134,7 +134,7 @@ public static class Dynamic {
         public String hosts_resolver_mode = "ip-only";
         public String transport_userrname_attribute;
         public boolean do_not_fail_on_forbidden_empty;
-        public OnBehalfOf on_behalf_of = new OnBehalfOf();
+        public OnBehalfOfSettings on_behalf_of = new OnBehalfOfSettings();
 
         @Override
         public String toString() {
@@ -480,7 +480,7 @@ public String toString() {
 
     }
 
-    public static class OnBehalfOf {
+    public static class OnBehalfOfSettings {
         @JsonProperty("enabled")
         private Boolean oboEnabled = Boolean.TRUE;
         @JsonProperty("signing_key")