Integrate druidctl into CI pipeline (#1316)

Author: anveshreddy18

.github/dependabot.yml

@@ -13,6 +13,7 @@ updates:
       - "/"
       - "/api"
       - "/client"
+      - "/druidctl"
     schedule:
       interval: monthly
     open-pull-requests-limit: 5

.github/workflows/base.yaml

@@ -111,6 +111,10 @@ jobs:
           git config --global user.email "gardener@sap.com"
           git config --global user.name "Gardener CI/CD"
           make --directory=api check-generate
+      - name: druidctl-tidy
+        run: make --directory=druidctl tidy
+      - name: druidctl-check
+        run: make --directory=druidctl check
       - name: prepare helm charts
         run: make prepare-helm-charts
         env:
@@ -129,6 +133,8 @@ jobs:
         args:
           - name: api-test-unit
             run: make --directory=api test-unit
+          - name: druidctl-test-unit
+            run: make --directory=druidctl test
           - name: test-unit
             run: make test-unit
           - name: test-integration
@@ -169,5 +175,7 @@ jobs:
       - prepare
     with:
       linter: gosec
-      run: make sast-report
+      run: |
+        make sast-report
+        make --directory=druidctl sast-report
       go-version: '1.25'

Makefile

@@ -90,6 +90,8 @@ ci-checks:
 	@$(MAKE) --directory=api tidy
 	@$(MAKE) --directory=api check
 	@$(MAKE) --directory=api check-generate
+	@$(MAKE) --directory=druidctl tidy
+	@$(MAKE) --directory=druidctl check
 	@$(MAKE) ci-prepare-helm-charts
 	@$(MAKE) check-git-status
 

druidctl/Makefile

@@ -80,6 +80,11 @@ sast: $(GOSEC)
 	@echo "> Running gosec for druidctl module"
 	@$(GOSEC) -exclude-generated ./...
 
+.PHONY: sast-report
+sast-report: $(GOSEC)
+	@echo "> Running gosec report for druidctl module"
+	@$(GOSEC) -exclude-generated -track-suppressions -fmt=sarif -out=gosec-report.sarif -stdout ./...
+
 .PHONY: clean clean-all
 clean:
 	rm -rf $(BIN_DIR) coverage.out

druidctl/cmd/listresources/listresources.go

@@ -47,12 +47,12 @@ func (l *listResourcesCmdCtx) complete() error {
 	}
 
 	// Build etcd reference list from resource args using kubectl-compatible parsing
-	l.etcdRefList = l.GlobalOptions.BuildEtcdRefList()
+	l.etcdRefList = l.BuildEtcdRefList()
 	return nil
 }
 
 func (l *listResourcesCmdCtx) validate() error {
-	return l.GlobalOptions.ValidateResourceSelection()
+	return l.ValidateResourceSelection()
 }
 
 // execute lists the managed resources for the selected etcd resources based on the filter.

druidctl/cmd/reconciliation/command.go

@@ -80,7 +80,7 @@ Use subcommands 'trigger', 'suspend', and 'resume' to control reconciliation sta
 func NewTriggerCommand(cmdCtx *cmdutils.CommandContext) *cobra.Command {
 	var waitTillReady bool
 	var watch bool
-	var timeout time.Duration = defaultTimeout
+	var timeout = defaultTimeout
 
 	cmd := &cobra.Command{
 		Use:     "trigger [resources] [flags]",

druidctl/cmd/reconciliation/reconcile.go

@@ -29,12 +29,12 @@ func (r *reconcileCmdCtx) complete() error {
 		return fmt.Errorf("unable to create etcd client: %w", err)
 	}
 	r.etcdClient = etcdClient
-	r.etcdRefList = r.GlobalOptions.BuildEtcdRefList()
+	r.etcdRefList = r.BuildEtcdRefList()
 	return nil
 }
 
 func (r *reconcileCmdCtx) validate() error {
-	if err := r.GlobalOptions.ValidateResourceSelection(); err != nil {
+	if err := r.ValidateResourceSelection(); err != nil {
 		return err
 	}
 	// timeout is only valid if wait-till-ready is set
@@ -47,6 +47,7 @@ func (r *reconcileCmdCtx) validate() error {
 	}
 	return nil
 }
+
 // There are two types of reconciles, one where you add the reconcile annotation and exit.
 // Another where you wait till all the changes done to the Etcd resource have successfully reconciled and post reconciliation
 // all the etcd cluster members are Ready

druidctl/cmd/reconciliation/resumeetcdreconcile.go

@@ -26,12 +26,12 @@ func (r *resumeReconcileCmdCtx) complete() error {
 		return fmt.Errorf("unable to create etcd client: %w", err)
 	}
 	r.etcdClient = etcdClient
-	r.etcdRefList = r.GlobalOptions.BuildEtcdRefList()
+	r.etcdRefList = r.BuildEtcdRefList()
 	return nil
 }
 
 func (r *resumeReconcileCmdCtx) validate() error {
-	return r.GlobalOptions.ValidateResourceSelection()
+	return r.ValidateResourceSelection()
 }
 
 // execute removes the suspend reconcile annotation from the Etcd resource.

druidctl/cmd/reconciliation/suspendetcdreconcile.go

@@ -26,12 +26,12 @@ func (s *suspendReconcileCmdCtx) complete() error {
 		return fmt.Errorf("unable to create etcd client: %w", err)
 	}
 	s.etcdClient = etcdClient
-	s.etcdRefList = s.GlobalOptions.BuildEtcdRefList()
+	s.etcdRefList = s.BuildEtcdRefList()
 	return nil
 }
 
 func (s *suspendReconcileCmdCtx) validate() error {
-	return s.GlobalOptions.ValidateResourceSelection()
+	return s.ValidateResourceSelection()
 }
 
 // execute adds the suspend reconcile annotation to the Etcd resource.

druidctl/cmd/resourceprotection/etcdprotection.go

@@ -20,12 +20,12 @@ func (r *resourceProtectionCmdCtx) complete() error {
 		return fmt.Errorf("unable to create etcd client: %w", err)
 	}
 	r.etcdClient = etcdClient
-	r.etcdRefList = r.GlobalOptions.BuildEtcdRefList()
+	r.etcdRefList = r.BuildEtcdRefList()
 	return nil
 }
 
 func (r *resourceProtectionCmdCtx) validate() error {
-	return r.GlobalOptions.ValidateResourceSelection()
+	return r.ValidateResourceSelection()
 }
 
 // addDisableProtectionAnnotation adds the disable protection annotation to the Etcd resource. It makes the resources vulnerable