SNOW-81828: Modified account name parsing so that global URLs will work properly without having to specify the 'host' field

Author: sfc-gh-stakeda

connection.py

@@ -66,7 +66,7 @@
 from .time_util import (
     DEFAULT_MASTER_VALIDITY_IN_SECONDS,
     HeartBeatTimer, get_time_millis)
-from .util_text import split_statements, construct_hostname
+from .util_text import split_statements, construct_hostname, parse_account
 
 
 def DefaultConverterClass():
@@ -779,8 +779,7 @@ def __config(self, **kwargs):
                     u'errno': ER_NO_ACCOUNT_NAME
                 })
         if u'.' in self._account:
-            # remove region subdomain
-            self._account = self._account[0:self._account.find(u'.')]
+            self._account = parse_account(self._account)
 
         if self.ocsp_fail_open:
             logger.info(

test/test_unit_construct_hostname.py

@@ -28,3 +28,6 @@ def test_construct_hostname_basic():
 
     assert construct_hostname(None, 'account1.eu-central-1') == \
            'account1.eu-central-1.snowflakecomputing.com'
+
+    assert construct_hostname(None, 'account1-jkabfvdjisoa778wqfgeruishafeuw89q.global') == \
+           'account1-jkabfvdjisoa778wqfgeruishafeuw89q.global.snowflakecomputing.com'

test/test_unit_parse_account.py

@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Copyright (c) 2012-2019 Snowflake Computing Inc. All right reserved.
+#
+
+from snowflake.connector.util_text import parse_account
+
+
+def test_parse_account_basic():
+    assert parse_account('account1') == 'account1'
+
+    assert parse_account('account1.eu-central-1') == 'account1'
+
+    assert parse_account('account1-jkabfvdjisoa778wqfgeruishafeuw89q.global') == 'account1'

util_text.py

@@ -200,3 +200,20 @@ def construct_hostname(region, account):
     else:
         host = u'{0}.snowflakecomputing.com'.format(account)
     return host
+
+
+def parse_account(account):
+    url_parts = account.split(u'.')
+    # if this condition is true, then we have some extra
+    # stuff in the account field.
+    if len(url_parts) > 1:
+        if url_parts[1] == u'global':
+            # remove external ID from account
+            parsed_account = url_parts[0][0:url_parts[0].rfind(u'-')]
+        else:
+            # remove region subdomain
+            parsed_account = url_parts[0]
+    else:
+        parsed_account = account
+
+    return parsed_account