PR review

Signed-off-by: Derek Ho <[email protected]>
derek-ho · Dec 16, 2024 · 45fe5c1 · 45fe5c1
1 parent 58cf8ca
commit 45fe5c1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 17 deletions.
diff --git a/src/main/java/org/opensearch/security/action/apitokens/ApiToken.java b/src/main/java/org/opensearch/security/action/apitokens/ApiToken.java
@@ -146,16 +146,6 @@ public static ApiToken fromXContent(XContentParser parser) throws IOException {
             }
         }
 
-        if (name == null) {
-            throw new IllegalArgumentException(NAME_FIELD + " is required");
-        }
-        if (jti == null) {
-            throw new IllegalArgumentException(JTI_FIELD + " is required");
-        }
-        if (creationTime == null) {
-            throw new IllegalArgumentException(CREATION_TIME_FIELD + " is required");
-        }
-
         return new ApiToken(name, jti, clusterPermissions, indexPermissions, creationTime);
     }
 

diff --git a/src/main/java/org/opensearch/security/action/apitokens/ApiTokenAction.java b/src/main/java/org/opensearch/security/action/apitokens/ApiTokenAction.java
@@ -58,7 +58,7 @@ public ApiTokenAction(ClusterService clusterService, ThreadPool threadPool, Clie
 
     @Override
     public String getName() {
-        return "Actions to get and create API tokens.";
+        return "api_token_action";
     }
 
     @Override
@@ -99,7 +99,7 @@ private RestChannelConsumer handleGet(RestRequest request, NodeClient client) {
 
                 response = new BytesRestResponse(RestStatus.OK, builder);
             } catch (final Exception exception) {
-                builder.startObject().field("error", "An unexpected error occurred. Please check the input and try again.").endObject();
+                builder.startObject().field("error", exception.getMessage()).endObject();
                 response = new BytesRestResponse(RestStatus.INTERNAL_SERVER_ERROR, builder);
             }
             builder.close();
@@ -275,7 +275,7 @@ private RestChannelConsumer handleDelete(RestRequest request, NodeClient client)
                 builder.startObject().field("error", exception.getMessage()).endObject();
                 response = new BytesRestResponse(RestStatus.NOT_FOUND, builder);
             } catch (final Exception exception) {
-                builder.startObject().field("error", "An unexpected error occurred. Please check the input and try again.").endObject();
+                builder.startObject().field("error", exception.getMessage()).endObject();
                 response = new BytesRestResponse(RestStatus.INTERNAL_SERVER_ERROR, builder);
             }
             builder.close();

diff --git a/src/main/java/org/opensearch/security/action/apitokens/ApiTokenRepository.java b/src/main/java/org/opensearch/security/action/apitokens/ApiTokenRepository.java
@@ -16,6 +16,7 @@
 
 import org.opensearch.client.Client;
 import org.opensearch.cluster.service.ClusterService;
+import org.opensearch.index.IndexNotFoundException;
 
 public class ApiTokenRepository {
     private final ApiTokenIndexHandler apiTokenIndexHandler;
@@ -31,13 +32,11 @@ public String createApiToken(String name, List<String> clusterPermissions, List<
         return apiTokenIndexHandler.indexTokenMetadata(new ApiToken(name, "test-token", clusterPermissions, indexPermissions));
     }
 
-    public void deleteApiToken(String name) throws ApiTokenException {
-        apiTokenIndexHandler.createApiTokenIndexIfAbsent();
+    public void deleteApiToken(String name) throws ApiTokenException, IndexNotFoundException {
         apiTokenIndexHandler.deleteToken(name);
     }
 
-    public Map<String, ApiToken> getApiTokens() {
-        apiTokenIndexHandler.createApiTokenIndexIfAbsent();
+    public Map<String, ApiToken> getApiTokens() throws IndexNotFoundException {
         return apiTokenIndexHandler.getTokenMetadatas();
     }