More granular validation for snowflake metadata

Author: misolt

dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/snowflake/AbstractSnowflakeConnector.java

@@ -42,7 +42,6 @@
 import java.util.List;
 import java.util.Properties;
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import javax.sql.DataSource;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -102,35 +101,14 @@ public Handle open(@Nonnull ConnectorArguments arguments)
 
   @Override
   public final void validate(@Nonnull ConnectorArguments arguments) {
-    ArrayList<String> messages = new ArrayList<>();
-    MetadataDumperUsageException exception = null;
-
     if (arguments.isPasswordFlagProvided() && arguments.isPrivateKeyFileProvided()) {
       String inconsistentAuth =
           "Private key authentication method can't be used together with user password. "
               + "If the private key file is encrypted, please use --"
               + ConnectorArguments.OPT_PRIVATE_KEY_PASSWORD
               + " to specify the key password.";
-      messages.add(inconsistentAuth);
-      exception = new MetadataDumperUsageException(inconsistentAuth, messages);
-    }
-
-    boolean hasDatabases = !arguments.getDatabases().isEmpty();
-    if (arguments.isAssessment()
-        && hasDatabases
-        && arguments.getConnectorName().toLowerCase().equals("snowflake")) {
-      String unsupportedFilter =
-          "Trying to filter by database with the --"
-              + ConnectorArguments.OPT_ASSESSMENT
-              + " flag. This is unsupported in Assessment. Remove either the --"
-              + ConnectorArguments.OPT_ASSESSMENT
-              + " or the --"
-              + ConnectorArguments.OPT_DATABASE
-              + " flag.";
-      messages.add(unsupportedFilter);
-      exception = new MetadataDumperUsageException(unsupportedFilter, messages);
+      throw new MetadataDumperUsageException(inconsistentAuth);
     }
-    removeDuplicateMessageAndThrow(exception);
     validateForConnector(arguments);
   }
 
@@ -143,15 +121,6 @@ public final void validate(@Nonnull ConnectorArguments arguments) {
    */
   protected abstract void validateForConnector(@Nonnull ConnectorArguments arguments);
 
-  private static void removeDuplicateMessageAndThrow(
-      @Nullable MetadataDumperUsageException exception) {
-    if (exception != null) {
-      List<String> messages = exception.getMessages();
-      messages.remove(messages.size() - 1);
-      throw exception;
-    }
-  }
-
   private DataSource createUserPasswordDataSource(@Nonnull ConnectorArguments arguments, String url)
       throws SQLException {
     Driver driver =

dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/snowflake/SnowflakeAccountUsageMetadataConnector.java

@@ -16,15 +16,20 @@
  */
 package com.google.edwmigration.dumper.application.dumper.connector.snowflake;
 
+import static com.google.edwmigration.dumper.application.dumper.ConnectorArguments.OPT_ASSESSMENT;
 import static com.google.edwmigration.dumper.application.dumper.connector.snowflake.SnowflakeInput.USAGE_ONLY_SOURCE;
 
 import com.google.auto.service.AutoService;
+import com.google.edwmigration.dumper.application.dumper.ConnectorArguments;
+import com.google.edwmigration.dumper.application.dumper.MetadataDumperUsageException;
 import com.google.edwmigration.dumper.application.dumper.connector.Connector;
 import java.io.IOException;
 import javax.annotation.Nonnull;
+import javax.annotation.ParametersAreNonnullByDefault;
 
 /** @author shevek */
 @AutoService(Connector.class)
+@ParametersAreNonnullByDefault
 public class SnowflakeAccountUsageMetadataConnector extends SnowflakeMetadataConnector {
 
   public SnowflakeAccountUsageMetadataConnector() {
@@ -38,7 +43,15 @@ public String getDescription() {
   }
 
   @Override
-  public void printHelp(@Nonnull Appendable out) throws IOException {
+  public void printHelp(Appendable out) throws IOException {
     out.append(AbstractSnowflakeConnector.describeAsDelegate(this, "snowflake"));
   }
+
+  @Override
+  public final void validateForConnector(ConnectorArguments arguments) {
+    if (arguments.isAssessment()) {
+      String message = String.format("The --%s flag is not supported.", OPT_ASSESSMENT);
+      throw new MetadataDumperUsageException(message);
+    }
+  }
 }

dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/snowflake/SnowflakeInformationSchemaMetadataConnector.java

@@ -16,15 +16,20 @@
  */
 package com.google.edwmigration.dumper.application.dumper.connector.snowflake;
 
+import static com.google.edwmigration.dumper.application.dumper.ConnectorArguments.OPT_ASSESSMENT;
 import static com.google.edwmigration.dumper.application.dumper.connector.snowflake.SnowflakeInput.SCHEMA_ONLY_SOURCE;
 
 import com.google.auto.service.AutoService;
+import com.google.edwmigration.dumper.application.dumper.ConnectorArguments;
+import com.google.edwmigration.dumper.application.dumper.MetadataDumperUsageException;
 import com.google.edwmigration.dumper.application.dumper.connector.Connector;
 import java.io.IOException;
 import javax.annotation.Nonnull;
+import javax.annotation.ParametersAreNonnullByDefault;
 
 /** @author shevek */
 @AutoService(Connector.class)
+@ParametersAreNonnullByDefault
 public class SnowflakeInformationSchemaMetadataConnector extends SnowflakeMetadataConnector {
 
   public SnowflakeInformationSchemaMetadataConnector() {
@@ -41,4 +46,12 @@ public String getDescription() {
   public void printHelp(@Nonnull Appendable out) throws IOException {
     out.append(AbstractSnowflakeConnector.describeAsDelegate(this, "snowflake"));
   }
+
+  @Override
+  public final void validateForConnector(ConnectorArguments arguments) {
+    if (arguments.isAssessment()) {
+      String message = String.format("The --%s flag is not supported.", OPT_ASSESSMENT);
+      throw new MetadataDumperUsageException(message);
+    }
+  }
 }

dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/snowflake/SnowflakeMetadataConnector.java

@@ -23,6 +23,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.edwmigration.dumper.application.dumper.ConnectorArguments;
+import com.google.edwmigration.dumper.application.dumper.MetadataDumperUsageException;
 import com.google.edwmigration.dumper.application.dumper.annotations.RespectsArgumentAssessment;
 import com.google.edwmigration.dumper.application.dumper.annotations.RespectsArgumentDatabaseForConnection;
 import com.google.edwmigration.dumper.application.dumper.annotations.RespectsArgumentDatabasePredicate;
@@ -132,7 +133,20 @@ public Iterable<ConnectorProperty> getPropertyConstants() {
   }
 
   @Override
-  protected final void validateForConnector(@Nonnull ConnectorArguments arguments) {}
+  protected void validateForConnector(@Nonnull ConnectorArguments arguments) {
+    boolean hasDatabases = !arguments.getDatabases().isEmpty();
+    if (arguments.isAssessment() && hasDatabases) {
+      String unsupportedFilter =
+          "Trying to filter by database with the --"
+              + ConnectorArguments.OPT_ASSESSMENT
+              + " flag. This is unsupported in Assessment. Remove either the --"
+              + ConnectorArguments.OPT_ASSESSMENT
+              + " or the --"
+              + ConnectorArguments.OPT_DATABASE
+              + " flag.";
+      throw new MetadataDumperUsageException(unsupportedFilter);
+    }
+  }
 
   private void addSqlTasksWithInfoSchemaFallback(
       @Nonnull List<? super Task<?>> out,