Make some fields in manifest file as mandatory

Signed-off-by: Heemin Kim <[email protected]>
opensearch-project · May 4, 2023 · fe4ef5c · fe4ef5c
1 parent 281dc5c
commit fe4ef5c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/main/java/org/opensearch/geospatial/ip2geo/action/PutDatasourceRequest.java b/src/main/java/org/opensearch/geospatial/ip2geo/action/PutDatasourceRequest.java
@@ -176,7 +176,7 @@ private void validateManifestFile(final URL url, final ActionRequestValidationEx
             manifest = DatasourceManifest.Builder.build(url);
         } catch (Exception e) {
             log.info("Error occurred while reading a file from {}", url, e);
-            errors.addValidationError(String.format(Locale.ROOT, "Error occurred while reading a file from %s", url));
+            errors.addValidationError(String.format(Locale.ROOT, "Error occurred while reading a file from %s: %s", url, e.getMessage()));
             return;
         }
 
@@ -188,7 +188,9 @@ private void validateManifestFile(final URL url, final ActionRequestValidationEx
             return;
         }
 
-        if (updateInterval.days() >= manifest.getValidForInDays()) {
+
+        if (manifest.getValidForInDays() != null &&
+            updateInterval.days() >= manifest.getValidForInDays()) {
             errors.addValidationError(
                 String.format(
                     Locale.ROOT,

diff --git a/src/main/java/org/opensearch/geospatial/ip2geo/common/DatasourceManifest.java b/src/main/java/org/opensearch/geospatial/ip2geo/common/DatasourceManifest.java
@@ -93,12 +93,12 @@ public class DatasourceManifest {
         }
     );
     static {
-        PARSER.declareString(ConstructingObjectParser.optionalConstructorArg(), URL_FIELD);
-        PARSER.declareString(ConstructingObjectParser.optionalConstructorArg(), DB_NAME_FIELD);
-        PARSER.declareString(ConstructingObjectParser.optionalConstructorArg(), SHA256_HASH_FIELD);
+        PARSER.declareString(ConstructingObjectParser.constructorArg(), URL_FIELD);
+        PARSER.declareString(ConstructingObjectParser.constructorArg(), DB_NAME_FIELD);
+        PARSER.declareString(ConstructingObjectParser.constructorArg(), SHA256_HASH_FIELD);
         PARSER.declareLong(ConstructingObjectParser.optionalConstructorArg(), VALID_FOR_IN_DAYS_FIELD);
-        PARSER.declareLong(ConstructingObjectParser.optionalConstructorArg(), UPDATED_AT_FIELD);
-        PARSER.declareString(ConstructingObjectParser.optionalConstructorArg(), PROVIDER_FIELD);
+        PARSER.declareLong(ConstructingObjectParser.constructorArg(), UPDATED_AT_FIELD);
+        PARSER.declareString(ConstructingObjectParser.constructorArg(), PROVIDER_FIELD);
     }
 
     /**