Using generic error message in place of custom error message

opensearch-project · Aug 30, 2023 · e21ea73 · e21ea73
1 parent d98732c
commit e21ea73
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/...transformer/personalizeintelligentranking/reranker/impl/AmazonPersonalizedRankerImpl.java b/...transformer/personalizeintelligentranking/reranker/impl/AmazonPersonalizedRankerImpl.java
@@ -21,6 +21,7 @@
 import org.opensearch.search.relevance.transformer.personalizeintelligentranking.configuration.PersonalizeIntelligentRankerConfiguration;
 import org.opensearch.search.relevance.transformer.personalizeintelligentranking.requestparameter.PersonalizeRequestParameters;
 import org.opensearch.search.relevance.transformer.personalizeintelligentranking.reranker.PersonalizedRanker;
+import org.opensearch.search.relevance.transformer.personalizeintelligentranking.utils.ValidationUtil;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -37,8 +38,7 @@ public class AmazonPersonalizedRankerImpl implements PersonalizedRanker {
     private static final Logger logger = LogManager.getLogger(AmazonPersonalizedRankerImpl.class);
     private final PersonalizeIntelligentRankerConfiguration rankerConfig;
     private final PersonalizeClient personalizeClient;
-    private static final String INSUFFCIENT_PERMISSION_ERROR_MESSAGE =
-            "Insufficient privileges for calling personalize service. Please ensure that the supplied role is configured correctly.";
+
     public AmazonPersonalizedRankerImpl(PersonalizeIntelligentRankerConfiguration config,
                                         PersonalizeClient client) {
         this.rankerConfig = config;
@@ -102,8 +102,8 @@ public SearchHits rerank(SearchHits hits, PersonalizeRequestParameters requestPa
         } catch (AmazonServiceException e) {
             logger.error("Exception while calling personalize campaign: {}", e.getMessage());
             int statusCode = e.getStatusCode();
-            if (statusCode >= 400 && statusCode < 500) {
-                throw new IllegalArgumentException(INSUFFCIENT_PERMISSION_ERROR_MESSAGE);
+            if (ValidationUtil.is4xxError(statusCode)) {
+                throw new IllegalArgumentException(e);
             }
             throw e;
         }

diff --git a/...arch/search/relevance/transformer/personalizeintelligentranking/utils/ValidationUtil.java b/...arch/search/relevance/transformer/personalizeintelligentranking/utils/ValidationUtil.java
@@ -57,4 +57,11 @@ private static boolean isValidCampaignOrRoleArn(String arn, String expectedServi
             return false;
         }
     }
+
+    public static boolean is4xxError(int statusCode){
+        if (statusCode >= 400 && statusCode < 500) {
+            return true;
+        }
+        return false;
+    }
 }