SNOW-1728000 Go back to previous config

snowflakedb · Nov 7, 2024 · 24e7a89 · 24e7a89
1 parent 146a659
commit 24e7a89
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/.github/scripts/profile.json.gpg b/.github/scripts/profile.json.gpg
diff --git a/test/test_suit/test_utils.py b/test/test_suit/test_utils.py
@@ -30,22 +30,26 @@ def __init__(self, msg=""):
         self.msg = msg
 
 
-def parsePrivateKey(pk):
+def parsePrivateKey(pk, pk_passphrase):
+    pkpass = None
+    if len(pk_passphrase) != 0:
+        pkpass = pk_passphrase.encode()
+
     # remove header, footer, and line breaks
     pk = re.sub("-+[A-Za-z ]+-+", "", pk)
     pk = re.sub("\\s", "", pk)
 
     pkBuilder = ""
-    pkBuilder += "-----BEGIN PRIVATE KEY-----"
+    pkBuilder += "-----BEGIN ENCRYPTED PRIVATE KEY-----"
     for i, c in enumerate(pk):
         if i % 64 == 0:
             pkBuilder += "\n"
         pkBuilder += c
-    pkBuilder += "\n-----END PRIVATE KEY-----"
+    pkBuilder += "\n-----END ENCRYPTED PRIVATE KEY-----"
 
     p_key = serialization.load_pem_private_key(
         pkBuilder.encode(),
-        password=None,
+        password=pkpass,
         backend=default_backend()
     )
 

diff --git a/test/test_verify.py b/test/test_verify.py
@@ -57,7 +57,8 @@ def __init__(self, kafkaAddress, schemaRegistryAddress, kafkaConnectAddress, cre
             testDatabase = credentialJson["database"]
             testSchema = credentialJson["schema"]
             testWarehouse = credentialJson["warehouse"]
-            pk = credentialJson["private_key"]
+            pk = credentialJson["encrypted_private_key"]
+            pk_passphrase = credentialJson["private_key_passphrase"]
 
         self.TEST_DATA_FOLDER = "./test_data/"
         self.httpHeader = {'Content-type': 'application/json', 'Accept': 'application/json'}
@@ -102,9 +103,10 @@ def __init__(self, kafkaAddress, schemaRegistryAddress, kafkaConnectAddress, cre
             print(datetime.now().strftime("%H:%M:%S "),
                   "Format error in 'host' field at profile.json, expecting account.snowflakecomputing.com:443")
 
+        pkb = parsePrivateKey(pk, pk_passphrase)
         self.snowflake_conn = snowflake.connector.connect(
             user=testUser,
-            private_key= parsePrivateKey(pk),
+            private_key=pkb,
             account=account[0][:-19],
             warehouse=testWarehouse,
             database=testDatabase,
@@ -397,6 +399,8 @@ def createConnector(self, fileName, nameSalt):
             testDatabase = credentialJson["database"]
             testSchema = credentialJson["schema"]
             pk = credentialJson["private_key"]
+            # Use Encrypted key if passphrase is non empty
+            pkEncrypted = credentialJson["encrypted_private_key"]
 
         print(datetime.now().strftime("\n%H:%M:%S "),
               "=== generate sink connector rest request from {} ===".format(rest_template_path))
@@ -409,6 +413,9 @@ def createConnector(self, fileName, nameSalt):
               "=== Connector Config JSON: {}, Connector Name: {} ===".format(fileName, snowflake_connector_name))
         with open("{}/{}".format(rest_template_path, fileName), 'r') as f:
             fileContent = f.read()
+            # Template has passphrase, use the encrypted version of P8 Key
+            if fileContent.find("snowflake.private.key.passphrase") != -1:
+                pk = pkEncrypted
 
             fileContent = fileContent \
                 .replace("SNOWFLAKE_PRIVATE_KEY", pk) \