fix regex + update tests

airbytehq · Mar 27, 2023 · 9b51107 · 9b51107
1 parent 76a7d4e
commit 9b51107
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/airbyte-integrations/connectors/destination-snowflake/src/main/resources/spec.json b/airbyte-integrations/connectors/destination-snowflake/src/main/resources/spec.json
@@ -19,7 +19,7 @@
         ],
         "type": "string",
         "title": "Host",
-        "pattern": "^([^./?#]+\\.)?([^./?#]+\\.)?([^./?#]+\\.snowflakecomputing\\.com)$",
+        "pattern": "^(http(s)?:\\/\\/)?([^./?#]+\\.)?([^./?#]+\\.)?([^./?#]+\\.)?([^./?#]+\\.snowflakecomputing\\.com)$",
         "pattern_descriptor": "{account_name}.snowflakecomputing.com or {accountname}.{aws_location}.aws.snowflakecomputing.com",
         "order": 0
       },

diff --git a/...src/test/java/io/airbyte/integrations/destination/snowflake/SnowflakeDestinationTest.java b/...src/test/java/io/airbyte/integrations/destination/snowflake/SnowflakeDestinationTest.java
@@ -31,19 +31,33 @@ public class SnowflakeDestinationTest {
 
   private static Stream<Arguments> urlsDataProvider() {
     return Stream.of(
-        arguments("ab12345.us-east-2.aws.snowflakecomputing.com", true),
-
+        // See https://docs.snowflake.com/en/user-guide/admin-account-identifier for specific requirements
+        // "Account name in organization" style
+        arguments("https://acme-marketing-test-account.snowflakecomputing.com", true),
+        arguments("https://acme-marketing_test_account.snowflakecomputing.com", true),
+        arguments("https://acme-marketing.test-account.snowflakecomputing.com", true),
+
+        // Legacy style (account locator in a region)
+        // Some examples taken from https://docs.snowflake.com/en/user-guide/admin-account-identifier#non-vps-account-locator-formats-by-cloud-platform-and-region
+        arguments("xy12345.snowflakecomputing.com", true),
+        arguments("xy12345.us-gov-west-1.aws.snowflakecomputing.com", true),
+        arguments("xy12345.us-east-1.aws.snowflakecomputing.com", true),
+        // And some other formats which are, de facto, valid
+        arguments("xy12345.foo.us-west-2.aws.snowflakecomputing.com", true),
+        arguments("https://xy12345.snowflakecomputing.com", true),
+        arguments("https://xy12345.us-east-1.snowflakecomputing.com", true),
+        arguments("https://xy12345.us-east-1.aws.snowflakecomputing.com", true),
+        arguments("https://xy12345.foo.us-west-2.aws.snowflakecomputing.com", true),
+
+        // Invalid formats
         arguments("example.snowflakecomputing.com/path/to/resource", false),
         arguments("example.snowflakecomputing.com:8080", false),
         arguments("example.snowflakecomputing.com:12345", false),
         arguments("example.snowflakecomputing.com//path/to/resource", false),
         arguments("example.snowflakecomputing.com/path?query=string", false),
         arguments("example.snowflakecomputing.com/#fragment", false),
         arguments("ab12345.us-east-2.aws.snowflakecomputing. com", false),
-        arguments("ab12345.us-east-2.aws.snowflakecomputing..com", false),
-        arguments("www.ab12345.us-east-2.aws.snowflakecomputing.com", false),
-        arguments("http://ab12345.us-east-2.aws.snowflakecomputing.com", false),
-        arguments("https://ab12345.us-east-2.aws.snowflakecomputing.com", false));
+        arguments("ab12345.us-east-2.aws.snowflakecomputing..com", false));
   }
 
   @ParameterizedTest