From f8a684cfb56197d122af43b9fbb8a7d28b59225a Mon Sep 17 00:00:00 2001
From: Hitesh Madan <hitesh.madan@snowflake.com>
Date: Fri, 4 Oct 2024 15:31:20 -0700
Subject: [PATCH] Fix testUtils to not repeatedly do keypair generation (#855)

TestUtils has four unexpected behaviors:

When there is no profile.json available, we do keypair generation many many times in every testcase instead of doing it once. Fixed this.
The no-profile-json code path ends up hitting snowflake.qa1.int.snowflakecomputing.com from unit tests (should be hitting a mock)
If a profile.json is being used for local testing, all unit tests start using it too because TestUtils ends up reading the same profile.json. This is highly unexpected.
Profile.json parsing behavior between prod and test codepaths is different. the former is okay with just the URL being specified, the latter forces specification of scheme, host, port, ssl.
Fixing (1) with this PR.
---
 .../java/net/snowflake/ingest/TestUtils.java  | 48 ++++++++++++-------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/test/java/net/snowflake/ingest/TestUtils.java b/src/test/java/net/snowflake/ingest/TestUtils.java
index f512dca86..349a372e2 100644
--- a/src/test/java/net/snowflake/ingest/TestUtils.java
+++ b/src/test/java/net/snowflake/ingest/TestUtils.java
@@ -58,7 +58,7 @@ public class TestUtils {
 
   private static final ObjectMapper mapper = new ObjectMapper();
 
-  private static ObjectNode profile = null;
+  private static boolean isInitialized = false;
 
   private static String user = "";
 
@@ -109,7 +109,7 @@ private static void init() throws NoSuchAlgorithmException, InvalidKeySpecExcept
     Path path = Paths.get(testProfilePath);
 
     if (Files.exists(path)) {
-      profile = (ObjectNode) mapper.readTree(new String(Files.readAllBytes(path)));
+      ObjectNode profile = (ObjectNode) mapper.readTree(new String(Files.readAllBytes(path)));
 
       user = profile.get(USER).asText();
       account = profile.get(ACCOUNT).asText();
@@ -141,6 +141,8 @@ private static void init() throws NoSuchAlgorithmException, InvalidKeySpecExcept
       privateKey = keyPair.getPrivate();
       privateKeyPem = java.util.Base64.getEncoder().encodeToString(privateKey.getEncoded());
     }
+
+    isInitialized = true;
   }
 
   /** @return profile path that will be used for tests. */
@@ -153,21 +155,21 @@ private static String getTestProfilePath() {
   }
 
   public static String getUser() throws Exception {
-    if (profile == null) {
+    if (!isInitialized) {
       init();
     }
     return user;
   }
 
   public static String getAccount() throws Exception {
-    if (profile == null) {
+    if (!isInitialized) {
       init();
     }
     return account;
   }
 
   public static String getAccountURL() throws Exception {
-    if (profile == null) {
+    if (!isInitialized) {
       init();
     }
 
@@ -175,7 +177,7 @@ public static String getAccountURL() throws Exception {
   }
 
   public static String getRole() throws Exception {
-    if (profile == null) {
+    if (!isInitialized) {
       init();
     }
 
@@ -183,42 +185,42 @@ public static String getRole() throws Exception {
   }
 
   public static String getWarehouse() throws Exception {
-    if (profile == null) {
+    if (!isInitialized) {
       init();
     }
     return warehouse;
   }
 
   public static String getHost() throws Exception {
-    if (profile == null) {
+    if (!isInitialized) {
       init();
     }
     return host;
   }
 
   public static String getPrivateKey() throws Exception {
-    if (profile == null) {
+    if (!isInitialized) {
       init();
     }
     return privateKeyPem;
   }
 
   public static KeyPair getKeyPair() throws Exception {
-    if (profile == null) {
+    if (!isInitialized) {
       init();
     }
     return keyPair;
   }
 
   public static String getDatabase() throws Exception {
-    if (profile == null) {
+    if (!isInitialized) {
       init();
     }
     return database;
   }
 
   public static String getSchema() throws Exception {
-    if (profile == null) {
+    if (!isInitialized) {
       init();
     }
     return schema;
@@ -226,7 +228,7 @@ public static String getSchema() throws Exception {
 
   public static Properties getProperties(Constants.BdecVersion bdecVersion, boolean useDefaultRole)
       throws Exception {
-    if (profile == null) {
+    if (!isInitialized) {
       init();
     }
     Properties props = new Properties();
@@ -272,7 +274,10 @@ public static Connection getConnection(boolean isStreamingConnection) throws Exc
       return streamingConn;
     }
 
-    if (profile == null) init();
+    if (!isInitialized) {
+      init();
+    }
+
     // check first to see if we have the Snowflake JDBC
     Class.forName("net.snowflake.client.jdbc.SnowflakeDriver");
 
@@ -321,7 +326,10 @@ public static ResultSet executeQuery(String query) {
    * @throws Exception
    */
   public static SimpleIngestManager getManager(String pipe) throws Exception {
-    if (profile == null) init();
+    if (!isInitialized) {
+      init();
+    }
+
     return new SimpleIngestManager(
         account, user, database + "." + schema + "." + pipe, privateKey, scheme, host, port);
   }
@@ -337,7 +345,10 @@ public static SimpleIngestManager getManager(String pipe) throws Exception {
    */
   public static SimpleIngestManager getManager(String pipe, final String userAgentSuffix)
       throws Exception {
-    if (profile == null) init();
+    if (!isInitialized) {
+      init();
+    }
+
     return new SimpleIngestManager(
         account,
         user,
@@ -355,7 +366,10 @@ public static SimpleIngestManager getManager(String pipe, final String userAgent
    */
   public static SimpleIngestManager getManagerUsingBuilderPattern(
       String pipe, final String userAgentSuffix) throws Exception {
-    if (profile == null) init();
+    if (!isInitialized) {
+      init();
+    }
+
     return new SimpleIngestManager.Builder()
         .setAccount(account)
         .setUser(user)