Merge pull request #1512 from AnandInguva:fix-no-auth

PiperOrigin-RevId: 630530928
GoogleCloudPlatform · May 3, 2024 · ba3d4e3 · ba3d4e3
2 parents 7939984 + 1e7312c
commit ba3d4e3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/v2/kafka-to-gcs/src/main/java/com/google/cloud/teleport/v2/templates/KafkaToGcs2.java b/v2/kafka-to-gcs/src/main/java/com/google/cloud/teleport/v2/templates/KafkaToGcs2.java
@@ -244,14 +244,13 @@ public static PipelineResult run(KafkaToGcsOptions options) throws UnsupportedOp
 
     options.setStreaming(true);
 
-    String kafkaSaslPlainUserName = SecretManagerUtils.getSecret(options.getUserNameSecretID());
-    String kafkaSaslPlainPassword = SecretManagerUtils.getSecret(options.getPasswordSecretID());
-
     Map<String, Object> kafkaConfig = new HashMap<>();
     // Set offset to either earliest or latest.
     kafkaConfig.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, options.getOffset());
     // Authenticate to Kafka only when user provides authentication params.
     if (useKafkaAuth) {
+      String kafkaSaslPlainUserName = SecretManagerUtils.getSecret(options.getUserNameSecretID());
+      String kafkaSaslPlainPassword = SecretManagerUtils.getSecret(options.getPasswordSecretID());
       kafkaConfig.putAll(
           ClientAuthConfig.getSaslPlainConfig(kafkaSaslPlainUserName, kafkaSaslPlainPassword));
     }
@@ -277,6 +276,7 @@ public static void validateAuthOptions(KafkaToGcsOptions options) {
     // the dataflow pipeline and Kafka broker is on the same network.
     if (options.getUserNameSecretID().isBlank() && options.getPasswordSecretID().isBlank()) {
       useKafkaAuth = false;
+      return;
     }
 
     if ((options.getUserNameSecretID().isBlank() && !options.getPasswordSecretID().isBlank())