remove sarama sasl 'mechanism' config and typo in KafkaTLSProducerEnabled

Author: sesquipedalian-dev

kafka.go

@@ -90,13 +90,6 @@ func (om *OpenMock) saramaConsumerConfig() (config *cluster.Config, seedBrokers
 		config.Net.SASL.Enable = true
 		config.Net.SASL.User = saslUsername
 		config.Net.SASL.Password = saslPassword
-
-		saslMechanism := om.KafkaSaslMechanism
-		if om.KafkaSaslConsumerMechanism != "" {
-			saslMechanism = om.KafkaSaslConsumerMechanism
-		}
-
-		config.Net.SASL.Mechanism = sarama.SASLMechanism(saslMechanism)
 	}
 
 	seedBrokers = om.KafkaSeedBrokers
@@ -110,7 +103,7 @@ func (om *OpenMock) saramaConsumerConfig() (config *cluster.Config, seedBrokers
 func (om *OpenMock) saramaProducerConfig() (config *sarama.Config, seedBrokers []string) {
 	config = &sarama.Config{}
 
-	shouldEnableTLS := om.KafkaTLSProducerEnabeld || om.KafkaTLSEnabled
+	shouldEnableTLS := om.KafkaTLSProducerEnabled || om.KafkaTLSEnabled
 	if shouldEnableTLS {
 		config.Net.TLS.Enable = true
 	}
@@ -129,13 +122,6 @@ func (om *OpenMock) saramaProducerConfig() (config *sarama.Config, seedBrokers [
 		config.Net.SASL.Enable = true
 		config.Net.SASL.User = saslUsername
 		config.Net.SASL.Password = saslPassword
-
-		saslMechanism := om.KafkaSaslMechanism
-		if om.KafkaSaslProducerMechanism != "" {
-			saslMechanism = om.KafkaSaslProducerMechanism
-		}
-
-		config.Net.SASL.Mechanism = sarama.SASLMechanism(saslMechanism)
 	}
 
 	seedBrokers = om.KafkaSeedBrokers

openmock.go

@@ -27,25 +27,22 @@ type OpenMock struct {
 	AdminHTTPHost    string `env:"OPENMOCK_ADMIN_HTTP_HOST" envDefault:"0.0.0.0"`
 
 	// Kafka channel
-	KafkaEnabled       bool     `env:"OPENMOCK_KAFKA_ENABLED" envDefault:"false"`
-	KafkaClientID      string   `env:"OPENMOCK_KAFKA_CLIENT_ID" envDefault:"openmock"`
-	KafkaSeedBrokers   []string `env:"OPENMOCK_KAFKA_SEED_BROKERS" envDefault:"kafka:9092" envSeparator:","`
-	KafkaSaslUsername  string   `env:"OPENMOCK_KAFKA_SASL_USERNAME" envDefault:""`
-	KafkaSaslPassword  string   `env:"OPENMOCK_KAFKA_SASL_PASSWORD" envDefault:""`
-	KafkaSaslMechanism string   `env:"OPENMOCK_KAFKA_SASL_MECHANISM" envDefault:"PLAIN"`
-	KafkaTLSEnabled    bool     `env:"OPENMOCK_KAFKA_TLS_ENABLED" envDefault:"false"`
-
-	KafkaProducerSeedBrokers   []string `env:"OPENMOCK_KAFKA_PRODUCER_SEED_BROKERS" envDefault:"" envSeparator:","`
-	KafkaSaslProducerUsername  string   `env:"OPENMOCK_KAFKA_SASL_PRODUCER_USERNAME" envDefault:""`
-	KafkaSaslProducerPassword  string   `env:"OPENMOCK_KAFKA_SASL_PRODUCER_PASSWORD" envDefault:""`
-	KafkaSaslProducerMechanism string   `env:"OPENMOCK_KAFKA_SASL_PRODUCER_MECHANISM" envDefault:""`
-	KafkaTLSProducerEnabeld    bool     `env:"OPENMOCK_KAFKA_TLS_PRODUCER_ENABLED" envDefault:""`
-
-	KafkaConsumerSeedBrokers   []string `env:"OPENMOCK_KAFKA_CONSUMER_SEED_BROKERS" envDefault:"" envSeparator:","`
-	KafkaSaslConsumerUsername  string   `env:"OPENMOCK_KAFKA_SASL_CONSUMER_USERNAME" envDefault:""`
-	KafkaSaslConsumerPassword  string   `env:"OPENMOCK_KAFKA_SASL_CONSUMER_PASSWORD" envDefault:""`
-	KafkaSaslConsumerMechanism string   `env:"OPENMOCK_KAFKA_SASL_CONSUMER_MECHANISM" envDefault:""`
-	KafkaTLSConsumerEnabled    bool     `env:"OPENMOCK_KAFKA_TLS_CONSUMER_ENABLED" envDefault:""`
+	KafkaEnabled      bool     `env:"OPENMOCK_KAFKA_ENABLED" envDefault:"false"`
+	KafkaClientID     string   `env:"OPENMOCK_KAFKA_CLIENT_ID" envDefault:"openmock"`
+	KafkaSeedBrokers  []string `env:"OPENMOCK_KAFKA_SEED_BROKERS" envDefault:"kafka:9092" envSeparator:","`
+	KafkaSaslUsername string   `env:"OPENMOCK_KAFKA_SASL_USERNAME" envDefault:""`
+	KafkaSaslPassword string   `env:"OPENMOCK_KAFKA_SASL_PASSWORD" envDefault:""`
+	KafkaTLSEnabled   bool     `env:"OPENMOCK_KAFKA_TLS_ENABLED" envDefault:"false"`
+
+	KafkaProducerSeedBrokers  []string `env:"OPENMOCK_KAFKA_PRODUCER_SEED_BROKERS" envDefault:"" envSeparator:","`
+	KafkaSaslProducerUsername string   `env:"OPENMOCK_KAFKA_SASL_PRODUCER_USERNAME" envDefault:""`
+	KafkaSaslProducerPassword string   `env:"OPENMOCK_KAFKA_SASL_PRODUCER_PASSWORD" envDefault:""`
+	KafkaTLSProducerEnabled   bool     `env:"OPENMOCK_KAFKA_TLS_PRODUCER_ENABLED" envDefault:""`
+
+	KafkaConsumerSeedBrokers  []string `env:"OPENMOCK_KAFKA_CONSUMER_SEED_BROKERS" envDefault:"" envSeparator:","`
+	KafkaSaslConsumerUsername string   `env:"OPENMOCK_KAFKA_SASL_CONSUMER_USERNAME" envDefault:""`
+	KafkaSaslConsumerPassword string   `env:"OPENMOCK_KAFKA_SASL_CONSUMER_PASSWORD" envDefault:""`
+	KafkaTLSConsumerEnabled   bool     `env:"OPENMOCK_KAFKA_TLS_CONSUMER_ENABLED" envDefault:""`
 
 	// AMQP channel
 	AMQPEnabled bool   `env:"OPENMOCK_AMQP_ENABLED" envDefault:"false"`