From cb62efbc0228056131fba2c499b0182a9699b812 Mon Sep 17 00:00:00 2001 From: Nitin Date: Thu, 29 Jul 2021 18:40:21 +0530 Subject: [PATCH] DE-121 removed env variable --- main.go | 6 ++--- producer/producer_config.go | 54 +++++++++++++++++-------------------- 2 files changed, 28 insertions(+), 32 deletions(-) diff --git a/main.go b/main.go index 14affb1..7b834ac 100644 --- a/main.go +++ b/main.go @@ -42,11 +42,11 @@ func init() { configuration.Kafka.Kafka_Topic_Json = viper.GetString(configuration.Kafka.Kafka_Topic_Json) configuration.Kafka.Kafka_Topic_Protobuf = viper.GetString(configuration.Kafka.Kafka_Topic_Protobuf) - log.Printf("Env is: ", configuration.Env) - if configuration.Env == "PROD" { + //log.Printf("Env is: ", configuration.Env) + //if configuration.Env == "PROD" { configuration.Kafka.Sasl_User = viper.GetString(configuration.Kafka.Sasl_User) configuration.Kafka.Sasl_Password = viper.GetString(configuration.Kafka.Sasl_Password) - } + //} port = configuration.Server.Port log.Printf("PORT IS: ", port) diff --git a/producer/producer_config.go b/producer/producer_config.go index c1b5677..39783fe 100644 --- a/producer/producer_config.go +++ b/producer/producer_config.go @@ -19,21 +19,19 @@ var ( func GetSyncProducerConfig(kafkaConfiguration config.KafkaConfigurations, env string) *sarama.Config { config := sarama.NewConfig() - //kafkaConfiguration configuration.KafkaConfigurations - // security configs - // config.Net.TLS.Enable = true - if env == "PROD" { - config.Net.TLS.Enable = true - config.Net.TLS.Config = createTLSConfiguration() - config.Net.SASL.Enable = true - config.Net.SASL.Handshake = true - config.Net.SASL.Mechanism = sarama.SASLTypeSCRAMSHA512 - config.Net.SASL.SCRAMClientGeneratorFunc = func() sarama.SCRAMClient { - return &XDGSCRAMClient{HashGeneratorFcn: SHA512} - } - config.Net.SASL.User = kafkaConfiguration.Sasl_User - config.Net.SASL.Password = kafkaConfiguration.Sasl_Password - } + // security configs + //if env == "PROD" { + config.Net.TLS.Enable = true + config.Net.TLS.Config = createTLSConfiguration() + config.Net.SASL.Enable = true + config.Net.SASL.Handshake = true + config.Net.SASL.Mechanism = sarama.SASLTypeSCRAMSHA512 + config.Net.SASL.SCRAMClientGeneratorFunc = func() sarama.SCRAMClient { + return &XDGSCRAMClient{HashGeneratorFcn: SHA512} + } + config.Net.SASL.User = kafkaConfiguration.Sasl_User + config.Net.SASL.Password = kafkaConfiguration.Sasl_Password + //} // producer configs @@ -52,21 +50,19 @@ func GetSyncProducerConfig(kafkaConfiguration config.KafkaConfigurations, env st func GetAsyncProducerConfig(kafkaConfiguration config.KafkaConfigurations, env string) *sarama.Config { config := sarama.NewConfig() - //kafkaConfiguration configuration.KafkaConfigurations - // security configs - // config.Net.TLS.Enable = true - if env == "PROD" { - config.Net.TLS.Enable = true - config.Net.TLS.Config = createTLSConfiguration() - config.Net.SASL.Enable = true - config.Net.SASL.Handshake = true - config.Net.SASL.Mechanism = sarama.SASLMechanism(sarama.SASLTypeSCRAMSHA512) - config.Net.SASL.SCRAMClientGeneratorFunc = func() sarama.SCRAMClient { - return &XDGSCRAMClient{HashGeneratorFcn: SHA512} - } - config.Net.SASL.User = kafkaConfiguration.Sasl_User - config.Net.SASL.Password = kafkaConfiguration.Sasl_Password + // security configs + //if env == "PROD" { + config.Net.TLS.Enable = true + config.Net.TLS.Config = createTLSConfiguration() + config.Net.SASL.Enable = true + config.Net.SASL.Handshake = true + config.Net.SASL.Mechanism = sarama.SASLMechanism(sarama.SASLTypeSCRAMSHA512) + config.Net.SASL.SCRAMClientGeneratorFunc = func() sarama.SCRAMClient { + return &XDGSCRAMClient{HashGeneratorFcn: SHA512} } + config.Net.SASL.User = kafkaConfiguration.Sasl_User + config.Net.SASL.Password = kafkaConfiguration.Sasl_Password + //} // producer configs // to be changed: read from config file config.Producer.Retry.Max = 3