feat: Support ClientID and Debug parameters (#85)

.github/workflows/shiftleft-go.yaml

@@ -17,23 +17,19 @@ jobs:
     timeout-minutes: 10
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v3
         with:
           go-version: 1.18
 
-      - name: Configure ssh-key for private modules
-        env:
-          SSH_KEY: ${{ secrets.ENGINEERING_SSH_KEY }}
-        run: |
-          mkdir -p ~/.ssh; echo "$SSH_KEY" > ~/.ssh/id_rsa; chmod 600 ~/.ssh/id_rsa; git config --global url."git@github.com:".insteadOf "https://github.com/"
       - name: Download dependencies
         run: make generate
 
       - name: Download ShiftLeft CLI
         run: |
           curl https://cdn.shiftleft.io/download/sl > ${GITHUB_WORKSPACE}/sl && chmod a+rx ${GITHUB_WORKSPACE}/sl
+
       - name: Extract branch name
         shell: bash
         run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
       - id: detect-aws-credentials
         args: [ '--allow-missing-credentials' ]
   - repo: https://github.com/golangci/golangci-lint
-    rev: v1.50.1
+    rev: v1.52.2
     hooks:
       - id: golangci-lint
   - repo: https://github.com/TekWizely/pre-commit-golang

Makefile

@@ -1,6 +1,7 @@
-generate: mocks
+generate: interface_mocks
+	@echo "generated"
 
-mocks:
+interface_mocks:
 	go get github.com/golang/mock/mockgen/model
 	go install github.com/golang/mock/mockgen@v1.6.0
 	mockgen -destination=./mocks/mock_kpprocessor.go -package=mocks github.com/honestbank/kp KPProducer

v2/config/config.go

@@ -16,6 +16,8 @@ type Kafka struct {
 	Password                 *string
 	ConsumerSessionTimeoutMs *int
 	ConsumerAutoOffsetReset  *string
+	ClientID                 *string
+	Debug                    *string
 }
 
 func (s Kafka) WithDefaults() Kafka {
@@ -28,6 +30,8 @@ func (s Kafka) WithDefaults() Kafka {
 		Password:                 s.Password,
 		ConsumerSessionTimeoutMs: defaultIfNil(s.ConsumerSessionTimeoutMs, 6000),
 		ConsumerAutoOffsetReset:  defaultIfNil(s.ConsumerAutoOffsetReset, "earliest"),
+		ClientID:                 defaultIfNil(s.ClientID, "rdkafka"),
+		Debug:                    s.Debug,
 	}
 }
 
@@ -53,6 +57,8 @@ func GetKafkaConfig(kafkaConfig Kafka) *kafka.ConfigMap {
 	hydrateIfNotNil(cfg, "security.protocol", kafkaConfig.SecurityProtocol)
 	hydrateIfNotNil(cfg, "sasl.username", kafkaConfig.Username)
 	hydrateIfNotNil(cfg, "sasl.password", kafkaConfig.Password)
+	hydrateIfNotNil(cfg, "debug", kafkaConfig.Debug)
+	hydrateIfNotNil(cfg, "client.id", kafkaConfig.ClientID)
 
 	return cfg
 }
@@ -62,6 +68,7 @@ func GetKafkaConsumerConfig(config Kafka) *kafka.ConfigMap {
 	hydrateIfNotNil(cfg, "group.id", &config.ConsumerGroupName)
 	hydrateIfNotNil(cfg, "auto.offset.reset", config.ConsumerAutoOffsetReset)
 	hydrateIfNotNil(cfg, "session.timeout.ms", config.ConsumerSessionTimeoutMs)
+	hydrateIfNotNil(cfg, "debug", config.Debug)
 
 	return cfg
 }