More tests

Author: Quinn-With-Two-Ns

temporal-envconfig/src/main/java/io/temporal/envconfig/ClientConfigProfile.java

@@ -16,13 +16,13 @@
 /** ClientConfigProfile is profile-level configuration for a client. */
 @Experimental
 public class ClientConfigProfile {
-  /** Creates a new builder to build a ClientConfigProfile. */
+  /** Creates a new builder to build a {@link ClientConfigProfile}. */
   public static Builder newBuilder() {
     return new Builder();
   }
 
   /**
-   * Creates a new builder to build a ClientConfigProfile based on an existing profile.
+   * Creates a new builder to build a {@link ClientConfigProfile} based on an existing profile.
    *
    * @param profile the existing profile to base the builder on
    * @return a new Builder instance
@@ -31,11 +31,72 @@ public static Builder newBuilder(ClientConfigProfile profile) {
     return new Builder(profile);
   }
 
-  /** Returns a default instance of ClientConfigProfile with all fields unset. */
+  /** Returns a default instance of {@link ClientConfigProfile} with all fields unset. */
   public static ClientConfigProfile getDefaultInstance() {
     return new Builder().build();
   }
 
+  /**
+   * Load a client profile from given sources, applying environment variable overrides.
+   *
+   * <p>This is a convenience method for {@link #load(LoadClientConfigProfileOptions)} with default
+   * options.
+   *
+   * @throws IOException if the config file cannot be read or parsed
+   */
+  public static ClientConfigProfile load() throws IOException {
+    return load(LoadClientConfigProfileOptions.newBuilder().build());
+  }
+
+  /**
+   * Load a client profile from given sources, applying environment variable overrides.
+   *
+   * @param options options to control loading the profile
+   * @throws IOException if the config file cannot be read or parsed
+   */
+  public static ClientConfigProfile load(LoadClientConfigProfileOptions options)
+      throws IOException {
+    if (options.isDisableFile() && options.isDisableEnv()) {
+      throw new IllegalArgumentException("Cannot have both DisableFile and DisableEnv set to true");
+    }
+    Map<String, String> env = System.getenv();
+    if (options.getEnvOverrides() != null) {
+      env = options.getEnvOverrides();
+    }
+    ClientConfigProfile clientConfigProfile = ClientConfigProfile.getDefaultInstance();
+    // If file is enabled, load it and find just the profile
+    if (!options.isDisableFile()) {
+      ClientConfig conf =
+          ClientConfig.load(
+              LoadClientConfigOptions.newBuilder()
+                  .setConfigFilePath(options.getConfigFilePath())
+                  .setConfigFileData(options.getConfigFileData())
+                  .setStrictConfigFile(options.isConfigFileStrict())
+                  .setEnvOverrides(options.getEnvOverrides())
+                  .build());
+      String profile = options.getConfigFileProfile();
+      boolean profileUnset = false;
+      if (profile == null || profile.isEmpty()) {
+        profile = env.get("TEMPORAL_PROFILE");
+      }
+      if (profile == null || profile.isEmpty()) {
+        profile = "default";
+        profileUnset = true;
+      }
+      ClientConfigProfile fileClientConfigProfile = conf.getProfiles().get(profile);
+      if (fileClientConfigProfile != null) {
+        clientConfigProfile = fileClientConfigProfile;
+      } else if (!profileUnset) {
+        throw new IllegalArgumentException("Unable to find profile " + profile + " in config data");
+      }
+    }
+    // If env is enabled, apply it on top of an empty profile
+    if (!options.isDisableEnv()) {
+      clientConfigProfile.applyEnvOverrides(options.getEnvOverrides());
+    }
+    return clientConfigProfile;
+  }
+
   private String namespace;
   private String address;
   private String apiKey;
@@ -70,48 +131,64 @@ public WorkflowServiceStubsOptions toWorkflowServiceStubsOptions() {
     if (this.metadata != null) {
       builder.addGrpcMetadataProvider(() -> this.metadata);
     }
-    if (this.tls != null && !this.tls.isDisabled()) {
+    if (this.tls != null && !Boolean.FALSE.equals(this.tls.isDisabled())) {
+      InputStream clientCertStream = null;
+      InputStream keyFileStream = null;
+      InputStream trustCertCollectionInputStream = null;
       try {
-        InputStream clientCertStream;
         if (this.tls.getClientCertPath() != null && !this.tls.getClientCertPath().isEmpty()) {
           clientCertStream = Files.newInputStream(Paths.get(this.tls.getClientCertPath()));
         } else if (this.tls.getClientCertData() != null
             && this.tls.getClientCertData().length > 0) {
           clientCertStream = new ByteArrayInputStream(this.tls.getClientCertData());
-        } else {
-          clientCertStream = null;
         }
 
-        InputStream keyFile;
         if (this.tls.getClientKeyPath() != null && !this.tls.getClientKeyPath().isEmpty()) {
-          keyFile = Files.newInputStream(Paths.get(this.tls.getClientKeyPath()));
+          keyFileStream = Files.newInputStream(Paths.get(this.tls.getClientKeyPath()));
         } else if (this.tls.getClientKeyData() != null && this.tls.getClientKeyData().length > 0) {
-          keyFile = new ByteArrayInputStream(this.tls.getClientKeyData());
-        } else {
-          keyFile = null;
+          keyFileStream = new ByteArrayInputStream(this.tls.getClientKeyData());
         }
 
-        InputStream trustCertCollectionInputStream;
         if (this.tls.getServerCACertPath() != null && !this.tls.getServerCACertPath().isEmpty()) {
           trustCertCollectionInputStream =
               Files.newInputStream(Paths.get(this.tls.getServerCACertPath()));
         } else if (this.tls.getServerCACertData() != null
             && this.tls.getServerCACertData().length > 0) {
           trustCertCollectionInputStream = new ByteArrayInputStream(this.tls.getServerCACertData());
-        } else {
-          trustCertCollectionInputStream = null;
         }
 
         SslContextBuilder sslContextBuilder = SslContextBuilder.forClient();
         if (trustCertCollectionInputStream != null) {
           sslContextBuilder.trustManager(trustCertCollectionInputStream);
-        } else if (this.tls.isDisableHostVerification()) {
+        } else if (Boolean.TRUE.equals(this.tls.isDisableHostVerification())) {
           sslContextBuilder.trustManager(InsecureTrustManagerFactory.INSTANCE);
         }
-        sslContextBuilder.keyManager(clientCertStream, keyFile);
+        sslContextBuilder.keyManager(clientCertStream, keyFileStream);
         builder.setSslContext(sslContextBuilder.build());
       } catch (IOException e) {
         throw new RuntimeException("Unable to create SSL context", e);
+      } finally {
+        if (clientCertStream != null) {
+          try {
+            clientCertStream.close();
+          } catch (IOException e) {
+            // Ignore
+          }
+        }
+        if (keyFileStream != null) {
+          try {
+            keyFileStream.close();
+          } catch (IOException e) {
+            // Ignore
+          }
+        }
+        if (trustCertCollectionInputStream != null) {
+          try {
+            trustCertCollectionInputStream.close();
+          } catch (IOException e) {
+            // Ignore
+          }
+        }
       }
       if (this.tls.getServerName() != null && !this.tls.getServerName().isEmpty()) {
         builder.setChannelInitializer(c -> c.overrideAuthority(this.tls.getServerName()));
@@ -137,53 +214,6 @@ public WorkflowClientOptions toWorkflowClientOptions() {
     return builder.build();
   }
 
-  public static ClientConfigProfile load() throws IOException {
-    return load(LoadClientConfigProfileOptions.newBuilder().build());
-  }
-
-  public static ClientConfigProfile load(LoadClientConfigProfileOptions options)
-      throws IOException {
-    if (options.isDisableFile() && options.isDisableEnv()) {
-      throw new IllegalArgumentException("Cannot have both DisableFile and DisableEnv set to true");
-    }
-    Map<String, String> env = System.getenv();
-    if (options.getEnvOverrides() != null) {
-      env = options.getEnvOverrides();
-    }
-    ClientConfigProfile clientConfigProfile = ClientConfigProfile.getDefaultInstance();
-    // If file is enabled, load it and find just the profile
-    if (!options.isDisableFile()) {
-      ClientConfig conf =
-          ClientConfig.load(
-              LoadClientConfigOptions.newBuilder()
-                  .setConfigFilePath(options.getConfigFilePath())
-                  .setConfigFileData(options.getConfigFileData())
-                  .setStrictConfigFile(options.isConfigFileStrict())
-                  .setEnvOverrides(options.getEnvOverrides())
-                  .build());
-      String profile = options.getConfigFileProfile();
-      boolean profileUnset = false;
-      if (profile == null || profile.isEmpty()) {
-        profile = env.get("TEMPORAL_PROFILE");
-      }
-      if (profile == null || profile.isEmpty()) {
-        profile = "default";
-        profileUnset = true;
-      }
-      ClientConfigProfile fileClientConfigProfile = conf.getProfiles().get(profile);
-      if (fileClientConfigProfile != null) {
-        clientConfigProfile = fileClientConfigProfile;
-      } else if (!profileUnset) {
-        throw new IllegalArgumentException("Unable to find profile " + profile + " in config data");
-      }
-    }
-    // If env is enabled, apply it on top of an empty profile
-    if (!options.isDisableEnv()) {
-      clientConfigProfile.applyEnvOverrides(options.getEnvOverrides());
-    }
-    return clientConfigProfile;
-  }
-
   private void applyEnvOverrides(Map<String, String> overrideEnvVars) {
     Map<String, String> env = System.getenv();
     if (overrideEnvVars != null) {

temporal-envconfig/src/main/java/io/temporal/envconfig/ClientConfigTLS.java

@@ -15,26 +15,31 @@ public static Builder newBuilder(ClientConfigTLS config) {
     return new Builder(config);
   }
 
-  private final boolean disabled;
+  /** Returns a default instance of {@link ClientConfigTLS} with all fields unset. */
+  public static ClientConfigTLS getDefaultInstance() {
+    return new Builder().build();
+  }
+
+  private final Boolean disabled;
   private final String clientCertPath;
   private final byte[] clientCertData;
   private final String clientKeyPath;
   private final byte[] clientKeyData;
   private final String serverCACertPath;
   private final byte[] serverCACertData;
   private final String serverName;
-  private final boolean disableHostVerification;
+  private final Boolean disableHostVerification;
 
   private ClientConfigTLS(
-      boolean disabled,
+      Boolean disabled,
       String clientCertPath,
       byte[] clientCertData,
       String clientKeyPath,
       byte[] clientKeyData,
       String serverCACertPath,
       byte[] serverCACertData,
       String serverName,
-      boolean disableHostVerification) {
+      Boolean disableHostVerification) {
     this.disabled = disabled;
     this.clientCertPath = clientCertPath;
     this.clientCertData = clientCertData;
@@ -46,7 +51,7 @@ private ClientConfigTLS(
     this.disableHostVerification = disableHostVerification;
   }
 
-  public boolean isDisabled() {
+  public Boolean isDisabled() {
     return disabled;
   }
 
@@ -78,7 +83,7 @@ public String getServerName() {
     return serverName;
   }
 
-  public boolean isDisableHostVerification() {
+  public Boolean isDisableHostVerification() {
     return disableHostVerification;
   }
 
@@ -93,9 +98,9 @@ public static class Builder {
     private byte[] clientKeyData;
     private String serverCACertPath;
     private byte[] serverCACertData;
-    private boolean disabled;
+    private Boolean disabled;
     private String serverName;
-    private boolean disableHostVerification;
+    private Boolean disableHostVerification;
 
     private Builder() {}
 
@@ -112,7 +117,7 @@ private Builder(ClientConfigTLS clientConfigTLS) {
     }
 
     /** Disable TLS. Default: false. */
-    public Builder setDisabled(boolean disabled) {
+    public Builder setDisabled(Boolean disabled) {
       this.disabled = disabled;
       return this;
     }
@@ -163,7 +168,7 @@ public Builder setServerCACertData(byte[] serverCACertData) {
     }
 
     /** Disable server host verification. Default: false */
-    public Builder setDisableHostVerification(boolean disableHostVerification) {
+    public Builder setDisableHostVerification(Boolean disableHostVerification) {
       this.disableHostVerification = disableHostVerification;
       return this;
     }

temporal-envconfig/src/main/java/io/temporal/envconfig/ClientConfigToml.java

@@ -65,7 +65,7 @@ protected TomlClientConfigProfile() {}
   @JsonInclude(JsonInclude.Include.NON_EMPTY)
   static class TomlClientConfigTLS {
     @JsonProperty("disabled")
-    public boolean disabled;
+    public Boolean disabled;
 
     @JsonProperty("client_cert_path")
     public String clientCertPath;
@@ -89,20 +89,20 @@ static class TomlClientConfigTLS {
     public String serverName;
 
     @JsonProperty("disable_host_verification")
-    public boolean disableHostVerification;
+    public Boolean disableHostVerification;
 
     protected TomlClientConfigTLS() {}
 
     TomlClientConfigTLS(
-        boolean disabled,
+        Boolean disabled,
         String clientCertPath,
         String clientCertData,
         String clientKeyPath,
         String clientKeyData,
         String serverCACertPath,
         String serverCACertData,
         String serverName,
-        boolean disableHostVerification) {
+        Boolean disableHostVerification) {
       this.disabled = disabled;
       this.clientCertPath = clientCertPath;
       this.clientCertData = clientCertData;

temporal-envconfig/src/main/java/io/temporal/envconfig/LoadClientConfigOptions.java

@@ -6,20 +6,27 @@
 /** Options for loading a client config via {@link ClientConfig#load(LoadClientConfigOptions)} */
 @Experimental
 public class LoadClientConfigOptions {
+  /** Create a builder for {@link LoadClientConfigOptions}. */
   public static Builder newBuilder() {
     return new Builder();
   }
 
+  /** Create a builder from an existing {@link LoadClientConfigOptions}. */
   public static Builder newBuilder(LoadClientConfigOptions options) {
     return new Builder(options);
   }
 
+  /** Returns a default instance of {@link LoadClientConfigOptions} with all fields unset. */
+  public static LoadClientConfigOptions getDefaultInstance() {
+    return new Builder().build();
+  }
+
   private final String configFilePath;
   private final byte[] configFileData;
   private final boolean strictConfigFile;
   private final Map<String, String> envOverrides;
 
-  public LoadClientConfigOptions(
+  private LoadClientConfigOptions(
       String configFilePath,
       byte[] configFileData,
       boolean strictConfigFile,
@@ -61,11 +68,6 @@ private Builder(LoadClientConfigOptions options) {
       this.envOverrides = options.envOverrides;
     }
 
-    public LoadClientConfigOptions build() {
-      return new LoadClientConfigOptions(
-          configFilePath, configFileData, strictConfigFile, envOverrides);
-    }
-
     /** If true, will error if there are unrecognized keys. Defaults to false. */
     public Builder setStrictConfigFile(boolean configFileStrict) {
       this.strictConfigFile = configFileStrict;
@@ -100,5 +102,10 @@ public Builder setConfigFilePath(String configFilePath) {
       this.configFilePath = configFilePath;
       return this;
     }
+
+    public LoadClientConfigOptions build() {
+      return new LoadClientConfigOptions(
+          configFilePath, configFileData, strictConfigFile, envOverrides);
+    }
   }
 }