From 478769c7ba7f7461536e2ebd08f353e8ce5f61dd Mon Sep 17 00:00:00 2001
From: Michal Bobowski <michal.bobowski@snowflake.com>
Date: Thu, 7 Nov 2024 17:35:02 +0100
Subject: [PATCH] SNOW-1728000 Go back to previous config

---
 .github/scripts/profile.json.gpg | Bin 1519 -> 2838 bytes
 test/test_suit/test_utils.py     |  12 ++++++++----
 test/test_verify.py              |  10 ++++++++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.github/scripts/profile.json.gpg b/.github/scripts/profile.json.gpg
index c341fca2c2843fce0613a79867e3498f1d5f7890..62766edffab3f6a19084dfb3db5f752dd10ab86e 100644
GIT binary patch
literal 2838
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

literal 1519
zcmV<L1rYj-4Fm}T2+;<I-$N^tVE@wU0eI(<vs=Bx8YLf8p^$a%goUM}p~4%fXnIKU
zv%a0-r(nF4v86vJn!qK!m1JxZ9WrAr$YugLs#1q}q?h6p@p`cSNh_jAeHG5g4*4~4
zpMQ^^wP~Vs-x5$Hvd;0x+dAAYP0LT(YeW9(g_%GkP4c<oN3m0l7UrcT=nChOopxa{
z=vzqkNa{5T$F|>HKRqdxO_dCHo$C<~70jPFjwhX@__sR~6NLWpZCym?Tmt1m6&Z15
zs5qw~BZk&=f9(U^GhAcpQYWwG(<;<TNhNP@)k^8rMb4~BMLr9(7`KFvEv&4v2YKPV
zoIEf;1GGTM&4G`BF*O8@{rGLA5a7(bWZw#&aHMQE`l~Sbb9ryV*(JHQ`LMH})qV!|
z;FQb||BVhKJdb@shZ2Cq9E<|Guz;u>-9{j~+%T)K5@6;Ds2Zp&*A!514QO|=1%rIR
zKpHB{9dc>Ki{~C}SDq9r8C1*!8ei!vWt<;E&4AAEH33QM=jL>itP!_BNLqs(K8KQt
zA_bct21KW}<TBxWweqw$O927bWfXxqZ#qVo3RfQXon;25Ob}*wfB)n1h<dz8fm{(&
zk{+G))BvFByyhA>f^It>D3EUa+gf=Y5CW-><`A+DY<k5d#R<aik<!b_7pq>fv-R|u
z9ZndFV@I(92q4oVy1x$~g(M{4I(Uy8t0ys_)+WQTpbBO`D<%H~u?uj2m2_c<i^1>`
ztAX2BUSEZMq|B2|KXw!jzYnqEKNV${XRQ8GGA=fE7UFA5l)egTyn;7uDPWX|d|L@F
z*NF9F7_>QS3MN0*!`?4(9ub8EUj0kc`}R}TUvJNn1x=z%@dUrlz6g(KQ!VMtr#vSr
zcUKYE6WGJ#)D#&;J#i%ClEohv{mb0cJL2jH<aU#SXdAQj5vjwD#|Qyj{X2#H#{BP7
z%`5ij%bVqvZael*iq70$&7)W3-bVFRzOu;xx+ZFBou-%j09WZ=fP;4$x`)I8OVy3e
z{R`*=lY6e!ca3xaBtw`cF<kyQ0LR!?SxoiV%hR-1<d+mjxHT1+(@xY-BcUlr7477|
zfvjC?n%QTpbWf#K<0-2-K{|s~pUE?y*Rw_@Yxa)+<fvPlm!$@#s~dZj-Em<fX#wIh
z7A{ni&J_zJ4yI-gO9*FlF~WuNexJR+Zc-a}e_@Q8_BmMc%j~Q{vuR*yelpf+iy*zX
zhYI2*oNMcgkFnD~hNc;>f0)A$p^-eEJ`WfPLMm*i3^K3-Tr~rj$zLdQjP&L(J~_X|
zBCp*r%_&1NWu#R{y8QmT!zpBBBkbDC?(Nr&Vc7E@z3>-5BeDCE)QTQa)6H2$oe#5*
zY&#h=gE?9r!5qL}wqhbH$B#Ku1!8Zq590Or4y+2DMS2F{2k=@QHaL-S{b8)aO`ueZ
zg&O~WudD-iRRqWe9(A->fFyXMjayIpdU%oVYq)B=3-oDl7IPq3IRSHXQGdh6O7@Q{
zoB+IR8Kvi8%K%ee8E7~Ynw<v2IP*7w_xZ>}x_|pMb@~YV4jn*E$dMd=uGOC;*&~@S
zLuBDF_HvhVj*?@YIXuxrOzNVuQ#b;SA#IN2To9YmWK45=zNoktCnKDBt2KO_M9<bk
z%v%h$=?2t0S3y|9iL1Z<VlZ;Vm=dZ%x$?veoiJmZTrYC!Ha)%Q9sxjhFb>-?|6o@{
z*gT?$a#ojm!Z04XLhQV%9bNzGSMu*zkd)MA;v}VUzLY!o#Gsblzi7Ed5rYL3?w{UH
zEC+t-IkQt8aGL~ss{_Q+YXDjRDg4{qU?~&YrFFDkJ^%btbUAm{FSkGQ%{(~zZu=g#
zC5ScMM_>8znQ_TIwP5+q5_wA1t8doJo=RtuQ5fBlyTo5&?3l$0=80gt1C*hAGqGf^
zxJN!MNHflcTM)FScEk)R7(=2(?%hjLEu4H+x>AKXK>ukuP4RkQJ$rU=sY}u<ujx?@
Vbm(OFO}OV+Sn+>Z3cpLeI9<G--je_T

diff --git a/test/test_suit/test_utils.py b/test/test_suit/test_utils.py
index af80fa3e2..b44b2d970 100644
--- 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
index 2bebcd269..afa54dd15 100755
--- 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'}
@@ -104,7 +105,7 @@ def __init__(self, kafkaAddress, schemaRegistryAddress, kafkaConnectAddress, cre
 
         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 +398,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 +412,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) \