fix: ignore old client go packages in renovate

Signed-off-by: Thomas Schuetz <thomas.schuetz@t-sc.eu>

.github/workflows/build_container.yaml

@@ -13,7 +13,7 @@ on:
       - "**.md"
 
 env:
-  GO_VERSION: "~1.22"
+  GO_VERSION: "~1.20"
   IMAGE_NAME: "k8sgpt"
 defaults:
   run:
@@ -22,7 +22,7 @@ defaults:
 jobs:
   prepare_ci_run:
     name: Prepare CI Run
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       GIT_SHA: ${{ steps.extract_branch.outputs.GIT_SHA }}
       BRANCH: ${{ steps.extract_branch.outputs.BRANCH }}
@@ -33,7 +33,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
 
       - name: Extract branch name
         id: extract_branch
@@ -61,7 +61,7 @@ jobs:
   build_image:
     name: Build Container Image
     needs: prepare_ci_run
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     env:
       BRANCH: ${{ needs.prepare_ci_run.outputs.BRANCH }}
       DATETIME: ${{ needs.prepare_ci_run.outputs.DATETIME }}
@@ -70,14 +70,14 @@ jobs:
       RELEASE_REGISTRY: "localhost:5000/k8sgpt"
     steps:
       - name: Check out code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3
+        uses: docker/setup-buildx-action@4b4e9c3e2d4531116a6f8ba8e71fc6e2cb6e6c8c # v2
 
       - name: Build Docker Image
-        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6
+        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 # v4
         with:
           context: .
           platforms: linux/amd64
@@ -96,7 +96,7 @@ jobs:
           outputs: type=docker,dest=/tmp/${{ env.IMAGE_NAME }}-image.tar
 
       - name: Upload image as artifact
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3
         with:
           name: ${{ env.IMAGE_NAME }}-image.tar
           path: /tmp/${{ env.IMAGE_NAME }}-image.tar
@@ -105,7 +105,7 @@ jobs:
     name: Upload images to ghcr registry
     needs: [ prepare_ci_run, build_image ]
     if: github.event_name == 'push' && needs.prepare_ci_run.outputs.NON_FORKED_AND_NON_ROBOT_RUN == 'true' # only run on push to main/maintenance branches
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     env:
       DATETIME: ${{ needs.prepare_ci_run.outputs.DATETIME }}
       BUILD_TIME: ${{ needs.prepare_ci_run.outputs.BUILD_TIME }}
@@ -115,10 +115,10 @@ jobs:
       contents: read # Needed for checking out the repository
     steps:
       - name: Check out code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
+        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2
         with:
           registry: "ghcr.io"
           username: ${{ github.actor }}
@@ -126,10 +126,10 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3
+        uses: docker/setup-buildx-action@4b4e9c3e2d4531116a6f8ba8e71fc6e2cb6e6c8c # v2
 
       - name: Build Docker Image
-        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6
+        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 # v4
         with:
           context: .
           file: ./container/Dockerfile
@@ -144,4 +144,4 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           push: true
           cache-from: type=gha,scope=${{ github.ref_name }}-${{ env.IMAGE_NAME }}
-          cache-to: type=gha,scope=${{ github.ref_name }}-${{ env.IMAGE_NAME }}
+          cache-to: type=gha,scope=${{ github.ref_name }}-${{ env.IMAGE_NAME }}

.github/workflows/golangci_lint.yaml

@@ -2,17 +2,17 @@ name: Run golangci-lint
 
 on:
   pull_request:
-    branches: [main]
+    branches: [ main ]
 
 jobs:
   golangci-lint:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code into the Go module directory
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # v7
+        uses: reviewdog/action-golangci-lint@53f8eabb87b40b1a2c63ec75b0d418bd0f4aa919 # v2
         with:
-          version: v2.0
-          only-new-issues: true
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          reporter: github-pr-check

.github/workflows/release.yaml

@@ -23,9 +23,9 @@ jobs:
     # Release-please creates a PR that tracks all changes
     steps:
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-     
-      - uses: google-github-actions/release-please-action@e4dc86ba9405554aeba3c6bb2d169500e7d3b4ee # v4.1.1
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
+
+      - uses: google-github-actions/release-please-action@c078ea33917ab8cfa5300e48f4b7e6b16606aede # v3
         id: release
         with:
           command: manifest
@@ -40,32 +40,18 @@ jobs:
       - release-please
     runs-on: ubuntu-latest
     steps:
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-        with:
-          # this might remove tools that are actually needed,
-          # if set to "true" but frees about 6 GB
-          tool-cache: false
-          # all of these default to true, but feel free to set to
-          # "false" if necessary for your workflow
-          android: false
-          dotnet: false
-          haskell: false
-          large-packages: true
-          docker-images: true
-          swap-storage: true
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
         with:
           fetch-depth: 0
       - name: Set up Go
-        uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
+        uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4
         with:
-          go-version: '1.22'
+          go-version: '1.20'
       - name: Download Syft
-        uses: anchore/sbom-action/download-syft@55dc4ee22412511ee8c3142cbea40418e6cec693 # v0.17.8
+        uses: anchore/sbom-action/download-syft@422cb34a0f8b599678c41b21163ea6088edb2624 # v0.14.1
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6
+        uses: goreleaser/goreleaser-action@f82d6c1c344bcacabba2c841718984797f664a6b # v4
         with:
           # either 'goreleaser' (default) or 'goreleaser-pro'
           distribution: goreleaser
@@ -73,14 +59,12 @@ jobs:
           args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.K8SGPT_BOT_SECRET }}
-      - name: Update new version in krew-index
-        uses: rajatjindal/krew-release-bot@3d9faef30a82761d610544f62afddca00993eef9 # v0.0.47
 
   build-container:
     if: needs.release-please.outputs.releases_created == 'true'
     needs:
       - release-please
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       contents: write
       packages: write
@@ -90,23 +74,23 @@ jobs:
       IMAGE_NAME: k8sgpt
     steps:
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
         with:
           submodules: recursive
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3
+        uses: docker/setup-buildx-action@4b4e9c3e2d4531116a6f8ba8e71fc6e2cb6e6c8c # v2
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
+        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2
         with:
           registry: "ghcr.io"
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Docker Image
-        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6
+        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 # v4
         with:
           context: .
           file: ./container/Dockerfile
@@ -120,14 +104,14 @@ jobs:
           cache-to: type=gha,scope=${{ github.ref_name }}-${{ env.IMAGE_TAG }}
 
       - name: Generate SBOM
-        uses: anchore/sbom-action@55dc4ee22412511ee8c3142cbea40418e6cec693 # v0.17.8
+        uses: anchore/sbom-action@422cb34a0f8b599678c41b21163ea6088edb2624 # v0.14.1
         with:
           image: ${{ env.IMAGE_TAG }}
           artifact-name: sbom-${{ env.IMAGE_NAME }}
           output-file: ./sbom-${{ env.IMAGE_NAME }}.spdx.json
 
       - name: Attach SBOM to release
-        uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2
+        uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
         with:
           tag_name: ${{ needs.release-please.outputs.tag_name }}
-          files: ./sbom-${{ env.IMAGE_NAME }}.spdx.json
+          files: ./sbom-${{ env.IMAGE_NAME }}.spdx.json

.github/workflows/semantic_pr.yaml

@@ -10,13 +10,13 @@ defaults:
     shell: bash
 jobs:
   validate:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       contents: read # Needed for checking out the repository
       pull-requests: read # Needed for reading prs
     steps:
       - name: Validate Pull Request
-        uses: amannn/action-semantic-pull-request@0723387faaf9b38adef4775cd42cfd5155ed6017 # v5.5.3
+        uses: amannn/action-semantic-pull-request@c3cd5d1ea3580753008872425915e343e351ab54 # v5.2.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.github/workflows/test.yaml

@@ -9,22 +9,19 @@ on:
       - main
 
 env:
-  GO_VERSION: "~1.22"
+    GO_VERSION: "~1.20"
 
 jobs:
   build:
+
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
 
       - name: Set up Go
-        uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
+        uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4
         with:
           go-version: ${{ env.GO_VERSION }}
 
-      - name: Run test
-        run: go test ./... -coverprofile=coverage.txt
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      - name: Test
+        run: go test -v ./...

.gitignore

@@ -1,8 +1,5 @@
-.idea
-__debug*
 .DS_Store
 k8sgpt*
-!charts/k8sgpt
 *.vscode
 dist/
 

.goreleaser.yaml

@@ -1,4 +1,3 @@
-version: 2
 # This is an example .goreleaser.yml file with some sensible defaults.
 # Make sure to check the documentation at https://goreleaser.com
 before:
@@ -15,18 +14,14 @@ builds:
       - windows
       - darwin
     ldflags:
-      - -s -w
-      - -X main.version={{.Version}}
-      - -X main.commit={{.ShortCommit}}
-      - -X main.Date={{.CommitDate}}
+          - -s -w -X main.version={{.Version}}
 
 nfpms:
-  - file_name_template: "{{ .ProjectName }}_{{ .Arch }}"
-    maintainer: "K8sGPT Maintainers <contact@k8sgpt.ai>"
+  - file_name_template: '{{ .ProjectName }}_{{ .Arch }}'
     homepage: https://k8sgpt.ai
     description: >-
       K8sGPT is a tool for scanning your kubernetes clusters, diagnosing and triaging issues in simple english. It has SRE experience codified into it’s analyzers and helps to pull out the most relevant information to enrich it with AI.
-    license: "Apache-2.0"
+    license: "MIT"
     formats:
       - deb
       - rpm
@@ -35,7 +30,7 @@ nfpms:
     section: utils
     contents:
       - src: ./LICENSE
-        dst: /usr/share/doc/k8sgpt/copyright
+        dst: /usr/share/doc/nfpm/copyright
         file_info:
           mode: 0644
 
@@ -54,23 +49,25 @@ archives:
       {{- if .Arm }}v{{ .Arm }}{{ end }}
     # use zip for windows archives
     format_overrides:
-      - goos: windows
-        format: zip
+    - goos: windows
+      format: zip
 
 brews:
   - name: k8sgpt
     homepage: https://k8sgpt.ai
-    repository:
+    tap:
       owner: k8sgpt-ai
       name: homebrew-k8sgpt
 
 checksum:
-  name_template: "checksums.txt"
+  name_template: 'checksums.txt'
 
 snapshot:
   name_template: "{{ incpatch .Version }}-next"
 
-  # skip: true
+changelog:
+  skip: true
+
 # The lines beneath this are called `modelines`. See `:help modeline`
 # Feel free to remove those if you don't want/use them.
 # yaml-language-server: $schema=https://goreleaser.com/static/schema.json

.krew.yaml

@@ -1,110 +0,0 @@
-apiVersion: krew.googlecontainertools.github.com/v1alpha2
-kind: Plugin
-metadata:
-  name: gpt
-spec:
-  version: {{ .TagName }}
-  homepage: https://github.com/k8sgpt-ai/k8sgpt
-  shortDescription: "Giving Kubernetes Superpowers to everyone"
-  description: |
-    A tool for scanning your Kubernetes clusters, diagnosing, and triaging issues in simple English.
-  platforms:
-    ##########
-    # Darwin #
-    ##########
-    - selector:
-        matchLabels:
-          os: darwin
-          arch: amd64
-      {{addURIAndSha "https://github.com/k8sgpt-ai/k8sgpt/releases/download/{{ .TagName }}/k8sgpt_Darwin_x86_64.tar.gz" .TagName | indent 6 }}
-      files:
-        - from: "k8sgpt"
-          to: "kubectl-gpt"
-        - from: "LICENSE"
-          to: "."
-      bin: kubectl-gpt
-    - selector:
-        matchLabels:
-          os: darwin
-          arch: arm64
-      {{addURIAndSha "https://github.com/k8sgpt-ai/k8sgpt/releases/download/{{ .TagName }}/k8sgpt_Darwin_arm64.tar.gz" .TagName | indent 6 }}
-      files:
-        - from: "k8sgpt"
-          to: "kubectl-gpt"
-        - from: "LICENSE"
-          to: "."
-      bin: kubectl-gpt
-
-    #########
-    # Linux #
-    #########
-    - selector:
-        matchLabels:
-          os: linux
-          arch: amd64
-      {{addURIAndSha "https://github.com/k8sgpt-ai/k8sgpt/releases/download/{{ .TagName }}/k8sgpt_Linux_x86_64.tar.gz" .TagName | indent 6 }}
-      files:
-        - from: "k8sgpt"
-          to: "kubectl-gpt"
-        - from: "LICENSE"
-          to: "."
-      bin: kubectl-gpt
-    - selector:
-        matchLabels:
-          os: linux
-          arch: arm64
-      {{addURIAndSha "https://github.com/k8sgpt-ai/k8sgpt/releases/download/{{ .TagName }}/k8sgpt_Linux_arm64.tar.gz" .TagName | indent 6 }}
-      files:
-        - from: "k8sgpt"
-          to: "kubectl-gpt"
-        - from: "LICENSE"
-          to: "."
-      bin: kubectl-gpt
-    - selector:
-        matchLabels:
-          os: linux
-          arch: "386"
-      {{addURIAndSha "https://github.com/k8sgpt-ai/k8sgpt/releases/download/{{ .TagName }}/k8sgpt_Linux_i386.tar.gz" .TagName | indent 6 }}
-      files:
-        - from: "k8sgpt"
-          to: "kubectl-gpt"
-        - from: "LICENSE"
-          to: "."
-      bin: kubectl-gpt
-
-    ###########
-    # Windows #
-    ###########
-    - selector:
-        matchLabels:
-          os: windows
-          arch: amd64
-      {{addURIAndSha "https://github.com/k8sgpt-ai/k8sgpt/releases/download/{{ .TagName }}/k8sgpt_Windows_x86_64.zip" .TagName | indent 6 }}
-      files:
-        - from: "k8sgpt"
-          to: "kubectl-gpt"
-        - from: "LICENSE"
-          to: "."
-      bin: kubectl-gpt
-    - selector:
-        matchLabels:
-          os: windows
-          arch: arm64
-      {{addURIAndSha "https://github.com/k8sgpt-ai/k8sgpt/releases/download/{{ .TagName }}/k8sgpt_Windows_arm64.zip" .TagName | indent 6 }}
-      files:
-        - from: "k8sgpt"
-          to: "kubectl-gpt"
-        - from: "LICENSE"
-          to: "."
-      bin: kubectl-gpt
-    - selector:
-        matchLabels:
-          os: windows
-          arch: "386"
-      {{addURIAndSha "https://github.com/k8sgpt-ai/k8sgpt/releases/download/{{ .TagName }}/k8sgpt_Windows_i386.zip" .TagName | indent 6 }}
-      files:
-        - from: "k8sgpt"
-          to: "kubectl-gpt"
-        - from: "LICENSE"
-          to: "."
-      bin: kubectl-gpt

.release-please-manifest.json

@@ -1 +1 @@
-{".":"0.4.5"}
+{".":"0.2.8"}

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 We're happy that you want to contribute to this project. Please read the sections to make the process as smooth as possible.
 
 ## Requirements
-- Golang `1.23`
+- Golang `1.20`
 - An OpenAI API key
   * OpenAI API keys can be obtained from [OpenAI](https://platform.openai.com/account/api-keys)
   * You can set the API key for k8sgpt using `./k8sgpt auth key`
@@ -17,7 +17,7 @@ We're happy that you want to contribute to this project. Please read the section
 - We are also happy to help you find something to work on. Just reach out to us.
 
 **Getting in touch with the community**
-* Join our [#k8sgpt slack channel](https://join.slack.com/t/k8sgpt/shared_invite/zt-1rwe5fpzq-VNtJK8DmYbbm~iWL1H34nw)
+* Join our [#k8sgpt slack channel](https://slack.cloud-native.io/channels/k8sgpt)
 * Introduce yourself on the slack channel or open an issue to let us know that you are interested in contributing
 
 **Discuss issues**
@@ -30,7 +30,7 @@ We're happy that you want to contribute to this project. Please read the section
 - Assign yourself to the issue, if you are working on it (if you are not a member of the organization, please leave a comment on the issue)
 - Make your changes
 - Keep pull requests small and focused, if you have multiple changes, please open multiple PRs
-- Create a pull request back to the upstream repository and follow the [pull request template](.github/pull_request_template.md) guidelines.
+- Create a pull request back to the upstream repository and follow follow the [pull request template](.github/pull_request_template.md) guidelines.
 - Wait for a review and address any comments
 
 **Opening PRs**

Makefile

@@ -10,8 +10,6 @@ ROOT_PACKAGE=github.com/k8sgpt-ai/k8sgpt
 SHELL := /bin/bash
 DIRS=$(shell ls)
 GO=go
-GOOS ?= $(shell go env GOOS)
-GOARCH ?= $(shell go env GOARCH)
 
 .DEFAULT_GOAL := help
 
@@ -54,7 +52,7 @@ all: tidy add-copyright lint cover build
 build: 
 	@echo "$(shell go version)"
 	@echo "===========> Building binary $(BUILDAPP) *[Git Info]: $(VERSION)-$(GIT_COMMIT)"
-	@export CGO_ENABLED=0 && go build -o $(BUILDAPP) -ldflags "-s -w -X main.version=dev -X main.commit=$$(git rev-parse --short HEAD) -X main.date=$$(date +%FT%TZ)" $(BUILDFILE)
+	@export CGO_ENABLED=0 && go build -o $(BUILDAPP) -ldflags '-s -w' $(BUILDFILE)
 
 ## tidy: tidy go.mod
 .PHONY: tidy
@@ -63,21 +61,17 @@ tidy:
 
 ## deploy: Deploy k8sgpt
 .PHONY: deploy
-deploy: helm
+deploy:
 	@echo "===========> Deploying k8sgpt"
-	$(HELM) install k8sgpt charts/k8sgpt -n k8sgpt --create-namespace
-
-## update: Update k8sgpt
-.PHONY: update
-update: helm
-	@echo "===========> Updating k8sgpt"
-	$(HELM) upgrade k8sgpt charts/k8sgpt -n k8sgpt
+	@$(call funcsecret)
 
 ## undeploy: Undeploy k8sgpt
 .PHONY: undeploy
-undeploy: helm
+undeploy:
 	@echo "===========> Undeploying k8sgpt"
-	$(HELM) uninstall k8sgpt -n k8sgpt
+	kubectl delete secret ai-backend-secret --namespace=k8sgpt
+	kubectl delete -f container/manifests
+	kubectl delete ns k8sgpt
 
 ## docker-build: Build docker image
 .PHONY: docker-build
@@ -85,6 +79,7 @@ docker-build:
 	@echo "===========> Building docker image"
 	docker buildx build --build-arg=VERSION="$$(git describe --tags --abbrev=0)" --build-arg=COMMIT="$$(git rev-parse --short HEAD)" --build-arg DATE="$$(date +%FT%TZ)" --platform="linux/amd64,linux/arm64" -t ${IMG} -f container/Dockerfile . --push
 
+
 ## fmt: Run go fmt against code.
 .PHONY: fmt
 fmt:
@@ -98,7 +93,7 @@ vet:
 ## lint: Run go lint against code.
 .PHONY: lint
 lint:
-	@golangci-lint run -v --timeout=5m ./...
+	@golangci-lint run -v ./...
 
 ## style: Code style -> fmt,vet,lint
 .PHONY: style
@@ -142,16 +137,11 @@ copyright.add: tools.verify.addlicense
 #	@addlicense -y $(shell date +"%Y") -v -c "K8sgpt AI." -f $(LICENSE_TEMPLATE) $(CODE_DIRS)
 	@echo "===========> End the copyright is added..."
 
-# =====
-# Tools
-
-HELM_VERSION ?= v3.11.3
-
-helm:
-	if ! test -f  $(OUTPUT_DIR)/helm-$(GOOS)-$(GOARCH); then \
-		curl -L https://get.helm.sh/helm-$(HELM_VERSION)-$(GOOS)-$(GOARCH).tar.gz | tar xz; \
-		mv $(GOOS)-$(GOARCH)/helm $(OUTPUT_DIR)/helm-$(GOOS)-$(GOARCH); \
-		chmod +x $(OUTPUT_DIR)/helm-$(GOOS)-$(GOARCH); \
-		rm -rf ./$(GOOS)-$(GOARCH)/; \
-	fi
-HELM=$(OUTPUT_DIR)/helm-$(GOOS)-$(GOARCH)
+define funcsecret
+ifndef SECRET
+	$(error SECRET environment variable is not set)
+endif
+	kubectl create ns k8sgpt || true
+	kubectl create secret generic ai-backend-secret --from-literal=secret-key=$(SECRET) --namespace=k8sgpt || true
+	kubectl apply -f container/manifests
+endef

README.md

@@ -1,55 +1,23 @@
-<picture>
-  <source media="(prefers-color-scheme: dark)" srcset="./images/banner-white.png" width="600px;">
-  <img alt="Text changing depending on mode. Light: 'So light!' Dark: 'So dark!'" src="./images/banner-black.png" width="600px;">
-</picture>
-<br/>
+  <img src="./images/banner-white.png" width="600px;" />
 
 ![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/k8sgpt-ai/k8sgpt)
 ![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/k8sgpt-ai/k8sgpt/release.yaml)
 ![GitHub release (latest by date)](https://img.shields.io/github/v/release/k8sgpt-ai/k8sgpt)
 [![OpenSSF Best Practices](https://bestpractices.coreinfrastructure.org/projects/7272/badge)](https://bestpractices.coreinfrastructure.org/projects/7272)
 [![Link to documentation](https://img.shields.io/static/v1?label=%F0%9F%93%96&message=Documentation&color=blue)](https://docs.k8sgpt.ai/)
-[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fk8sgpt-ai%2Fk8sgpt.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fk8sgpt-ai%2Fk8sgpt?ref=badge_shield)
-[![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-[![Go version](https://img.shields.io/github/go-mod/go-version/k8sgpt-ai/k8sgpt.svg)](https://github.com/k8sgpt-ai/k8sgpt)
-[![codecov](https://codecov.io/github/k8sgpt-ai/k8sgpt/graph/badge.svg?token=ZLR7NG8URE)](https://codecov.io/github/k8sgpt-ai/k8sgpt)
-![GitHub last commit (branch)](https://img.shields.io/github/last-commit/k8sgpt-ai/k8sgpt/main)
 
 `k8sgpt` is a tool for scanning your Kubernetes clusters, diagnosing, and triaging issues in simple English.
 
 It has SRE experience codified into its analyzers and helps to pull out the most relevant information to enrich it with AI.
 
-_Out of the box integration with OpenAI, Azure, Cohere, Amazon Bedrock, Google Gemini and local models._
+<a href="https://www.producthunt.com/posts/k8sgpt?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-k8sgpt" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=389489&theme=light" alt="K8sGPT - K8sGPT&#0032;gives&#0032;Kubernetes&#0032;Superpowers&#0032;to&#0032;everyone | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
 
-<a href="https://www.producthunt.com/posts/k8sgpt?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-k8sgpt" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=389489&theme=light" alt="K8sGPT - K8sGPT&#0032;gives&#0032;Kubernetes&#0032;Superpowers&#0032;to&#0032;everyone | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a> <a href="https://hellogithub.com/repository/9dfe44c18dfb4d6fa0181baf8b2cf2e1" target="_blank"><img src="https://abroad.hellogithub.com/v1/widgets/recommend.svg?rid=9dfe44c18dfb4d6fa0181baf8b2cf2e1&claim_uid=gqG4wmzkMrP0eFy" alt="Featured｜HelloGitHub" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+# Installation
 
 
-<img src="images/demo4.gif" width="650px">
+## Linux/Mac via brew
 
-# Table of Contents
-- [Overview](#k8sgpt)
-- [Installation](#cli-installation)
-- [Quick Start](#quick-start)
-- [Analyzers](#analyzers)
-- [Examples](#examples)
-- [LLM AI Backends](#llm-ai-backends)
-- [Key Features](#key-features)
-- [Documentation](#documentation)
-- [Contributing](#contributing)
-- [Community](#community)
-- [License](#license)
-
-# CLI Installation
-
-### Linux/Mac via brew
-
-```sh
-brew install k8sgpt
 ```
-
-or
-
-```sh
 brew tap k8sgpt-ai/k8sgpt
 brew install k8sgpt
 ```
@@ -57,20 +25,20 @@ brew install k8sgpt
 <details>
   <summary>RPM-based installation (RedHat/CentOS/Fedora)</summary>
 
-**32 bit:**
-
+  **32 bit:**
   <!---x-release-please-start-version-->
-
   ```
-  sudo rpm -ivh https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.5/k8sgpt_386.rpm
+  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.2.8/k8sgpt_386.rpm
+  sudo rpm -ivh k8sgpt_386.rpm
   ```
   <!---x-release-please-end-->
 
-**64 bit:**
+  **64 bit:**
 
   <!---x-release-please-start-version-->
   ```
-  sudo rpm -ivh https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.5/k8sgpt_amd64.rpm
+  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.2.8/k8sgpt_amd64.rpm
+  sudo rpm -ivh -i k8sgpt_amd64.rpm
   ```
   <!---x-release-please-end-->
 </details>
@@ -78,26 +46,20 @@ brew install k8sgpt
 <details>
   <summary>DEB-based installation (Ubuntu/Debian)</summary>
 
-**32 bit:**
-
+  **32 bit:**
   <!---x-release-please-start-version-->
-
-```
-curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.5/k8sgpt_386.deb
-sudo dpkg -i k8sgpt_386.deb
-```
-
+  ```
+  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.2.8/k8sgpt_386.deb
+  sudo dpkg -i k8sgpt_386.deb
+  ```
   <!---x-release-please-end-->
-
-**64 bit:**
+  **64 bit:**
 
   <!---x-release-please-start-version-->
-
-```
-curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.5/k8sgpt_amd64.deb
-sudo dpkg -i k8sgpt_amd64.deb
-```
-
+  ```
+  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.2.8/k8sgpt_amd64.deb
+  sudo dpkg -i k8sgpt_amd64.deb
+  ```
   <!---x-release-please-end-->
 </details>
 
@@ -105,65 +67,63 @@ sudo dpkg -i k8sgpt_amd64.deb
 
   <summary>APK-based installation (Alpine)</summary>
 
-**32 bit:**
-
+  **32 bit:**
   <!---x-release-please-start-version-->
   ```
-  wget https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.5/k8sgpt_386.apk
-  apk add --allow-untrusted k8sgpt_386.apk
+  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.2.8/k8sgpt_386.apk
+  apk add k8sgpt_386.apk
   ```
   <!---x-release-please-end-->
-
-**64 bit:**
-
+  **64 bit:**
   <!---x-release-please-start-version-->
   ```
-  wget https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.5/k8sgpt_amd64.apk
-  apk add --allow-untrusted k8sgpt_amd64.apk
+  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.2.8/k8sgpt_amd64.apk
+  apk add k8sgpt_amd64.apk
   ```
-  <!---x-release-please-end-->
+  <!---x-release-please-end-->x
 </details>
 
 <details>
   <summary>Failing Installation on WSL or Linux (missing gcc)</summary>
   When installing Homebrew on WSL or Linux, you may encounter the following error:
 
-```
-==> Installing k8sgpt from k8sgpt-ai/k8sgpt Error: The following formula cannot be installed from a bottle and must be
-built from the source. k8sgpt Install Clang or run brew install gcc.
-```
+  ```
+  ==> Installing k8sgpt from k8sgpt-ai/k8sgpt Error: The following formula cannot be installed from a bottle and must be
+  built from the source. k8sgpt Install Clang or run brew install gcc.
+  ```
 
 If you install gcc as suggested, the problem will persist. Therefore, you need to install the build-essential package.
-
-```
-   sudo apt-get update
-   sudo apt-get install build-essential
-```
-
+  ```
+     sudo apt-get update
+     sudo apt-get install build-essential
+  ```
 </details>
 
-### Windows
 
-- Download the latest Windows binaries of **k8sgpt** from the [Release](https://github.com/k8sgpt-ai/k8sgpt/releases)
+## Windows
+
+* Download the latest Windows binaries of **k8sgpt** from the [Release](https://github.com/k8sgpt-ai/k8sgpt/releases)
   tab based on your system architecture.
-- Extract the downloaded package to your desired location. Configure the system _PATH_ environment variable with the binary location
+* Extract the downloaded package to your desired location. Configure the system *path* variable with the binary location
 
-## Operator Installation
 
-To install within a Kubernetes cluster please use our `k8sgpt-operator` with installation instructions available [here](https://github.com/k8sgpt-ai/k8sgpt-operator)
+## Verify installation
 
-_This mode of operation is ideal for continuous monitoring of your cluster and can integrate with your existing monitoring such as Prometheus and Alertmanager._
+* Run `k8sgpt version`
+
+<hr>
 
 ## Quick Start
 
-- Currently, the default AI provider is OpenAI, you will need to generate an API key from [OpenAI](https://openai.com)
-  - You can do this by running `k8sgpt generate` to open a browser link to generate it
-- Run `k8sgpt auth add` to set it in k8sgpt.
-  - You can provide the password directly using the `--password` flag.
-- Run `k8sgpt filters` to manage the active filters used by the analyzer. By default, all filters are executed during analysis.
-- Run `k8sgpt analyze` to run a scan.
-- And use `k8sgpt analyze --explain` to get a more detailed explanation of the issues.
-- You also run `k8sgpt analyze --with-doc` (with or without the explain flag) to get the official documentation from Kubernetes.
+* Currently the default AI provider is OpenAI, you will need to generate an API key from [OpenAI](https://openai.com)
+  * You can do this by running `k8sgpt generate` to open a browser link to generate it
+* Run `k8sgpt auth` to set it in k8sgpt.
+  * You can provide the password directly using the `--password` flag.
+* Run `k8sgpt filters` to manage the active filters used by the analyzer. By default, all filters are executed during analysis.
+* Run `k8sgpt analyze` to run a scan.
+* And use `k8sgpt analyze --explain` to get a more detailed explanation of the issues.
+
+<img src="images/demo4.gif" width=650px; />
 
 ## Analyzers
 
@@ -184,56 +144,42 @@ you will be able to write your own analyzers.
 - [x] deploymentAnalyzer
 - [x] cronJobAnalyzer
 - [x] nodeAnalyzer
-- [x] mutatingWebhookAnalyzer
-- [x] validatingWebhookAnalyzer
 
 #### Optional
 
 - [x] hpaAnalyzer
 - [x] pdbAnalyzer
 - [x] networkPolicyAnalyzer
-- [x] gatewayClass
-- [x] gateway
-- [x] httproute
-- [x] logAnalyzer
 
-## Examples
-
-_Run a scan with the default analyzers_
+## Usage
 
 ```
-k8sgpt generate
-k8sgpt auth add
-k8sgpt analyze --explain
-k8sgpt analyze --explain --with-doc
+Kubernetes debugging powered by AI
+
+Usage:
+  k8sgpt [command]
+
+Available Commands:
+  analyze     This command will find problems within your Kubernetes cluster
+  auth        Authenticate with your chosen backend
+  completion  Generate the autocompletion script for the specified shell
+  filters     Manage filters for analyzing Kubernetes resources
+  generate    Generate Key for your chosen backend (opens browser)
+  help        Help about any command
+  integration Intergrate another tool into K8sGPT
+  serve       Runs k8sgpt as a server
+  version     Print the version number of k8sgpt
+
+Flags:
+      --config string        config file (default is $HOME/.k8sgpt.yaml)
+  -h, --help                 help for k8sgpt
+      --kubeconfig string    Path to a kubeconfig. Only required if out-of-cluster. (default "$HOME/.kube/config")
+      --kubecontext string   Kubernetes context to use. Only required if out-of-cluster.
+
+Use "k8sgpt [command] --help" for more information about a command.
 ```
 
-_Filter on resource_
-
-```
-k8sgpt analyze --explain --filter=Service
-```
-
-_Filter by namespace_
-
-```
-k8sgpt analyze --explain --filter=Pod --namespace=default
-```
-
-_Output to JSON_
-
-```
-k8sgpt analyze --explain --filter=Service --output=json
-```
-
-_Anonymize during explain_
-
-```
-k8sgpt analyze --explain --filter=Service --output=json --anonymize
-```
-
-<details>
-<summary> Using filters </summary>
+_Manage filters_
 
 _List filters_
 
@@ -252,7 +198,7 @@ k8sgpt filters add [filter(s)]
 - Simple filter : `k8sgpt filters add Service`
 - Multiple filters : `k8sgpt filters add Ingress,Pod`
 
-_Remove default filters_
+_Add default filters_
 
 ```
 k8sgpt filters remove [filter(s)]
@@ -263,29 +209,72 @@ k8sgpt filters remove [filter(s)]
 - Simple filter : `k8sgpt filters remove Service`
 - Multiple filters : `k8sgpt filters remove Ingress,Pod`
 
-</details>
+_Run a scan with the default analyzers_
+
+```
+k8sgpt generate
+k8sgpt auth
+k8sgpt analyze --explain
+```
+
+_Filter on resource_
+
+```
+k8sgpt analyze --explain --filter=Service
+```
+
+_Filter by namespace_
+```
+k8sgpt analyze --explain --filter=Pod --namespace=default
+```
+
+_Output to JSON_
+
+```
+k8sgpt analyze --explain --filter=Service --output=json
+```
+
+_Anonymize during explain_
+
+```
+k8sgpt analyze --explain --filter=Service --output=json --anonymize
+```
+
+### How does anonymization work?
+
+With this option, the data is anonymized before being sent to the AI Backend. During the analysis execution, `k8sgpt` retrieves sensitive data (Kubernetes object names, labels, etc.). This data is masked when sent to the AI backend and replaced by a key that can be used to de-anonymize the data when the solution is returned to the user.
 
 <details>
 
-<summary> Additional commands </summary>
-
-_List configured backends_
-
-```
-k8sgpt auth list
+1. Error reported during analysis:
+```bash
+Error: HorizontalPodAutoscaler uses StatefulSet/fake-deployment as ScaleTargetRef which does not exist.
 ```
 
-_Update configured backends_
-
-```
-k8sgpt auth update $MY_BACKEND1,$MY_BACKEND2..
+2. Payload sent to the AI backend:
+```bash
+Error: HorizontalPodAutoscaler uses StatefulSet/tGLcCRcHa1Ce5Rs as ScaleTargetRef which does not exist.
 ```
 
-_Remove configured backends_
+3. Payload returned by the AI:
+```bash
+The Kubernetes system is trying to scale a StatefulSet named tGLcCRcHa1Ce5Rs using the HorizontalPodAutoscaler, but it cannot find the StatefulSet. The solution is to verify that the StatefulSet name is spelled correctly and exists in the same namespace as the HorizontalPodAutoscaler.
+```
 
+4. Payload returned to the user:
+```bash
+The Kubernetes system is trying to scale a StatefulSet named fake-deployment using the HorizontalPodAutoscaler, but it cannot find the StatefulSet. The solution is to verify that the StatefulSet name is spelled correctly and exists in the same namespace as the HorizontalPodAutoscaler.
 ```
-k8sgpt auth remove -b $MY_BACKEND1,$MY_BACKEND2..
-```
+
+**Anonymization does not currently apply to events.**
+
+</details>
+
+### Additional commands
+
+<details>
+
+_Manage integrations_
 
 _List integrations_
 
@@ -320,284 +309,59 @@ k8sgpt serve
 _Analysis with serve mode_
 
 ```
-grpcurl -plaintext -d '{"namespace": "k8sgpt", "explain" : "true"}' localhost:8080 schema.v1.ServerAnalyzerService/Analyze
-{
-  "status": "OK"
-}
-```
-
-_Analysis with custom headers_
-
-```
-k8sgpt analyze --explain --custom-headers CustomHeaderKey:CustomHeaderValue
-```
-
-_Print analysis stats_
-
-```
-k8sgpt analyze -s
-The stats mode allows for debugging and understanding the time taken by an analysis by displaying the statistics of each analyzer.
-- Analyzer Ingress took 47.125583ms
-- Analyzer PersistentVolumeClaim took 53.009167ms
-- Analyzer CronJob took 57.517792ms
-- Analyzer Deployment took 156.6205ms
-- Analyzer Node took 160.109833ms
-- Analyzer ReplicaSet took 245.938333ms
-- Analyzer StatefulSet took 448.0455ms
-- Analyzer Pod took 5.662594708s
-- Analyzer Service took 38.583359166s
-```
-
-_Diagnostic information_
-
-To collect diagnostic information use the following command to create a `dump_<timestamp>_json` in your local directory.
-```
-k8sgpt dump
+curl -X GET "http://localhost:8080/analyze?namespace=k8sgpt&explain=false"
 ```
 
 </details>
 
-## LLM AI Backends
+## Running local models
 
-K8sGPT uses the chosen LLM, generative AI provider when you want to explain the analysis results using --explain flag e.g. `k8sgpt analyze --explain`. You can use `--backend` flag to specify a configured provider (it's `openai` by default).
-
-You can list available providers using `k8sgpt auth list`:
-
-```
-Default:
-> openai
-Active:
-Unused:
-> openai
-> localai
-> ollama
-> azureopenai
-> cohere
-> amazonbedrock
-> amazonsagemaker
-> google
-> huggingface
-> noopai
-> googlevertexai
-> watsonxai
-> customrest
-> ibmwatsonxai
-```
-
-For detailed documentation on how to configure and use each provider see [here](https://docs.k8sgpt.ai/reference/providers/backend/).
-
-_To set a new default provider_
-
-```
-k8sgpt auth default -p azureopenai
-Default provider set to azureopenai
-```
-
-## Key Features
+To run local models, it is possible to use OpenAI compatible APIs, for instance [LocalAI](https://github.com/go-skynet/LocalAI) which uses [llama.cpp](https://github.com/ggerganov/llama.cpp) and [ggml](https://github.com/ggerganov/ggml) to run inference on consumer-grade hardware. Models supported by LocalAI for instance are Vicuna, Alpaca, LLaMA, Cerebras, GPT4ALL, GPT4ALL-J and koala. 
 
 <details>
 
-With this option, the data is anonymized before being sent to the AI Backend. During the analysis execution, `k8sgpt` retrieves sensitive data (Kubernetes object names, labels, etc.). This data is masked when sent to the AI backend and replaced by a key that can be used to de-anonymize the data when the solution is returned to the user.
+To run local inference, you need to download the models first, for instance you can find `ggml` compatible models in [huggingface.com](https://huggingface.co/models?search=ggml) (for example vicuna, alpaca and koala).
 
-<summary> Anonymization </summary>
+### Start the API server
 
-1. Error reported during analysis:
+To start the API server, follow the instruction in [LocalAI](https://github.com/go-skynet/LocalAI#example-use-gpt4all-j-model).
 
-```bash
-Error: HorizontalPodAutoscaler uses StatefulSet/fake-deployment as ScaleTargetRef which does not exist.
+### Run k8sgpt
+
+To run k8sgpt, run `k8sgpt auth` with the `localai` backend:
+
+```
+k8sgpt auth --backend localai --model <model_name> --baseurl http://localhost:8080/v1
 ```
 
-2. Payload sent to the AI backend:
+When being asked for an API key, just press enter.
+
+Now you can analyze with the `localai` backend:
 
-```bash
-Error: HorizontalPodAutoscaler uses StatefulSet/tGLcCRcHa1Ce5Rs as ScaleTargetRef which does not exist.
 ```
-
-3. Payload returned by the AI:
-
-```bash
-The Kubernetes system is trying to scale a StatefulSet named tGLcCRcHa1Ce5Rs using the HorizontalPodAutoscaler, but it cannot find the StatefulSet. The solution is to verify that the StatefulSet name is spelled correctly and exists in the same namespace as the HorizontalPodAutoscaler.
+k8sgpt analyze --explain --backend localai
 ```
 
-4. Payload returned to the user:
-
-```bash
-The Kubernetes system is trying to scale a StatefulSet named fake-deployment using the HorizontalPodAutoscaler, but it cannot find the StatefulSet. The solution is to verify that the StatefulSet name is spelled correctly and exists in the same namespace as the HorizontalPodAutoscaler.
-```
-
-### Further Details
-
-Note: **Anonymization does not currently apply to events.**
-
-_In a few analysers like Pod, we feed to the AI backend the event messages which are not known beforehand thus we are not masking them for the **time being**._
-
-- The following is the list of analysers in which data is **being masked**:-
-
-  - Statefulset
-  - Service
-  - PodDisruptionBudget
-  - Node
-  - NetworkPolicy
-  - Ingress
-  - HPA
-  - Deployment
-  - Cronjob
-
-- The following is the list of analysers in which data is **not being masked**:-
-
-  - ReplicaSet
-  - PersistentVolumeClaim
-  - Pod
-  - Log
-  - **_\*Events_**
-
-**\*Note**:
-
-- k8gpt will not mask the above analysers because they do not send any identifying information except **Events** analyser.
-- Masking for **Events** analyzer is scheduled in the near future as seen in this [issue](https://github.com/k8sgpt-ai/k8sgpt/issues/560). _Further research has to be made to understand the patterns and be able to mask the sensitive parts of an event like pod name, namespace etc._
-
-- The following is the list of fields which are not **being masked**:-
-
-  - Describe
-  - ObjectStatus
-  - Replicas
-  - ContainerStatus
-  - **_\*Event Message_**
-  - ReplicaStatus
-  - Count (Pod)
-
-**\*Note**:
-
-- It is quite possible the payload of the event message might have something like "super-secret-project-pod-X crashed" which we don't currently redact _(scheduled in the near future as seen in this [issue](https://github.com/k8sgpt-ai/k8sgpt/issues/560))_.
-
-### Proceed with care
-
-- The K8gpt team recommends using an entirely different backend **(a local model) in critical production environments**. By using a local model, you can rest assured that everything stays within your DMZ, and nothing is leaked.
-- If there is any uncertainty about the possibility of sending data to a public LLM (open AI, Azure AI) and it poses a risk to business-critical operations, then, in such cases, the use of public LLM should be avoided based on personal assessment and the jurisdiction of risks involved.
-
 </details>
 
-<details>
-<summary> Configuration management</summary>
+## Configuration
 
 `k8sgpt` stores config data in the `$XDG_CONFIG_HOME/k8sgpt/k8sgpt.yaml` file. The data is stored in plain text, including your OpenAI key.
 
 Config file locations:
-| OS | Path |
-| ------- | ------------------------------------------------ |
-| MacOS | ~/Library/Application Support/k8sgpt/k8sgpt.yaml |
-| Linux | ~/.config/k8sgpt/k8sgpt.yaml |
-| Windows | %LOCALAPPDATA%/k8sgpt/k8sgpt.yaml |
+| OS      | Path                                             |
+|---------|--------------------------------------------------|
+| MacOS   | ~/Library/Application Support/k8sgpt/k8sgpt.yaml |
+| Linux   | ~/.config/k8sgpt/k8sgpt.yaml                     |
+| Windows | %LOCALAPPDATA%/k8sgpt/k8sgpt.yaml                |
 
-</details>
-
-<details>
-There may be scenarios where caching remotely is preferred.
-In these scenarios K8sGPT supports AWS S3 or Azure Blob storage Integration.
-
-<summary> Remote caching </summary>
-<em>Note: You can configure and use only one remote cache at a time</em>
-
-_Adding a remote cache_
-
-- AWS S3
-  - _As a prerequisite `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` are required as environmental variables._
-  - Configuration, `k8sgpt cache add s3 --region <aws region> --bucket <name>`
-  - Minio Configuration with HTTP endpoint ` k8sgpt cache add s3 --bucket <name> --endpoint <http://localhost:9000>`
-  - Minio Configuration with HTTPs endpoint, skipping TLS verification ` k8sgpt cache add s3 --bucket <name> --endpoint <https://localhost:9000> --insecure`
-    - K8sGPT will create the bucket if it does not exist
-- Azure Storage
-  - We support a number of [techniques](https://learn.microsoft.com/en-us/azure/developer/go/azure-sdk-authentication?tabs=bash#2-authenticate-with-azure) to authenticate against Azure
-  - Configuration, `k8sgpt cache add azure --storageacc <storage account name> --container <container name>`
-    - K8sGPT assumes that the storage account already exist and it will create the container if it does not exist
-    - It is the **user** responsibility have to grant specific permissions to their identity in order to be able to upload blob files and create SA containers (e.g Storage Blob Data Contributor)
-- Google Cloud Storage
-  - _As a prerequisite `GOOGLE_APPLICATION_CREDENTIALS` are required as environmental variables._
-  - Configuration, ` k8sgpt cache add gcs --region <gcp region> --bucket <name> --projectid <project id>`
-    - K8sGPT will create the bucket if it does not exist
-
-_Listing cache items_
-
-```
-k8sgpt cache list
-```
-
-_Purging an object from the cache_
-Note: purging an object using this command will delete upstream files, so it requires appropriate permissions.
-
-```
-k8sgpt cache purge $OBJECT_NAME
-```
-
-_Removing the remote cache_
-Note: this will not delete the upstream S3 bucket or Azure storage container
-
-```
-k8sgpt cache remove
-```
-
-</details>
-
-<details>
-<summary> Custom Analyzers</summary>
-
-There may be scenarios where you wish to write your own analyzer in a language of your choice.
-K8sGPT now supports the ability to do so by abiding by the [schema](https://github.com/k8sgpt-ai/schemas/blob/main/protobuf/schema/v1/custom_analyzer.proto) and serving the analyzer for consumption.
-To do so, define the analyzer within the K8sGPT configuration and it will add it into the scanning process.
-In addition to this you will need to enable the following flag on analysis:
-
-```
-k8sgpt analyze --custom-analysis
-```
-
-Here is an example local host analyzer in [Rust](https://github.com/k8sgpt-ai/host-analyzer)
-When this is run on `localhost:8080` the K8sGPT config can pick it up with the following additions:
-
-```
-custom_analyzers:
-  - name: host-analyzer
-    connection:
-      url: localhost
-      port: 8080
-```
-
-This now gives the ability to pass through hostOS information ( from this analyzer example ) to K8sGPT to use as context with normal analysis.
-
-_See the docs on how to write a custom analyzer_
-
-_Listing custom analyzers configured_
-```
-k8sgpt custom-analyzer list
-```
-
-_Adding custom analyzer without install_
-```
-k8sgpt custom-analyzer add --name my-custom-analyzer --port 8085
-```
-
-_Removing custom analyzer_
-```
-k8sgpt custom-analyzer remove --names "my-custom-analyzer,my-custom-analyzer-2"
-```
-
-</details>
-
-## Documentation
-
-Find our official documentation available [here](https://docs.k8sgpt.ai)
 
 ## Contributing
 
 Please read our [contributing guide](./CONTRIBUTING.md).
-
 ## Community
-
-Find us on [Slack](https://join.slack.com/t/k8sgpt/shared_invite/zt-276pa9uyq-pxAUr4TCVHubFxEvLZuT1Q)
+Find us on [Slack](https://join.slack.com/t/k8sgpt/shared_invite/zt-1rwe5fpzq-VNtJK8DmYbbm~iWL1H34nw)
 
 <a href="https://github.com/k8sgpt-ai/k8sgpt/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=k8sgpt-ai/k8sgpt" />
 </a>
-
-## License
-
-[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fk8sgpt-ai%2Fk8sgpt.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fk8sgpt-ai%2Fk8sgpt?ref=badge_large)

SECURITY.md

@@ -8,4 +8,4 @@ For example if there is a vulnerability in release `0.1.0` we will fix that rele
 
 ## Reporting a Vulnerability
 
-If you are aware of a vulnerability please feel free to disclose it responsibly to contact@k8sgpt.ai or to one of our maintainers in our Slack community.
+If you are aware of a vulnverability please feel free to disclose it responsibly to contact@k8sgpt.ai or to one of our maintainers in our Slack community.

charts/k8sgpt/Chart.yaml

@@ -1,6 +0,0 @@
-apiVersion: v2
-appVersion: v0.3.0 #x-release-please-version
-description: A Helm chart for K8SGPT
-name: k8sgpt
-type: application
-version: 1.0.0

charts/k8sgpt/templates/_helpers.tpl

@@ -1,44 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "k8sgpt.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "k8sgpt.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "k8sgpt.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "k8sgpt.labels" -}}
-helm.sh/chart: {{ include "k8sgpt.chart" . }}
-app.kubernetes.io/name: {{ include "k8sgpt.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion }}
-{{- end }}
-{{- end }}

charts/k8sgpt/templates/deployment.yaml

@@ -1,61 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ template "k8sgpt.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
-  {{- if .Values.deployment.annotations }}
-  annotations:
-  {{- toYaml .Values.deployment.annotations | nindent 4 }}
-  {{- end }}
-  labels:
-    {{- include "k8sgpt.labels" . | nindent 4 }}
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: {{ include "k8sgpt.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: {{ include "k8sgpt.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-    spec:
-      {{- if .Values.deployment.securityContext }}
-      securityContext:
-        {{- toYaml .Values.deployment.securityContext | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ template "k8sgpt.fullname" . }}
-      containers:
-      - name: k8sgpt-container
-        imagePullPolicy: {{ .Values.deployment.imagePullPolicy }}
-        image: {{ .Values.deployment.image.repository }}:{{ .Values.deployment.image.tag | default .Chart.AppVersion }}
-        ports:
-        - containerPort: 8080
-        args: ["serve"]
-        {{- if .Values.deployment.resources }}
-        resources:
-        {{- toYaml .Values.deployment.resources | nindent 10 }}
-        {{- end }}
-        env:
-        - name: K8SGPT_MODEL
-          value: {{ .Values.deployment.env.model }}
-        - name: K8SGPT_BACKEND
-          value: {{ .Values.deployment.env.backend }}
-        {{- if .Values.secret.secretKey }}
-        - name: K8SGPT_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: ai-backend-secret
-              key: secret-key
-        {{- end }}
-        - name: XDG_CONFIG_HOME
-          value: /k8sgpt-config/
-        - name: XDG_CACHE_HOME
-          value: /k8sgpt-config/
-        volumeMounts:
-        - mountPath: /k8sgpt-config
-          name: config
-      volumes:
-      - emptyDir: {}
-        name: config

charts/k8sgpt/templates/rolebinding.yaml

@@ -1,15 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ template "k8sgpt.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
-  labels:
-    {{- include "k8sgpt.labels" . | nindent 4 }}
-subjects:
-- kind: ServiceAccount
-  name: {{ template "k8sgpt.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
-roleRef:
-  kind: ClusterRole
-  name: {{ template "k8sgpt.fullname" . }}
-  apiGroup: rbac.authorization.k8s.io

charts/k8sgpt/templates/sa.yaml

@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ template "k8sgpt.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
-  labels:
-    {{- include "k8sgpt.labels" . | nindent 4 }}

charts/k8sgpt/templates/secret.yaml

@@ -1,10 +0,0 @@
-{{- if .Values.secret.secretKey }}
-apiVersion: v1
-data:
-  secret-key: {{ .Values.secret.secretKey }}
-kind: Secret
-metadata:
-  name: ai-backend-secret
-  namespace: {{ .Release.Namespace | quote }}
-type: Opaque
-{{- end}}

charts/k8sgpt/templates/service.yaml

@@ -1,22 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "k8sgpt.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
-  labels:
-    {{- include "k8sgpt.labels" . | nindent 4 }}
-  {{- if .Values.service.annotations }}
-  annotations:
-  {{- toYaml .Values.service.annotations | nindent 4 }}
-  {{- end }}
-spec:
-  selector:
-    app.kubernetes.io/name: {{ include "k8sgpt.name" . }}
-  ports:
-    - name: http
-      port: 8080
-      targetPort: 8080
-    - name: metrics
-      port: 8081
-      targetPort: 8081
-  type: {{ .Values.service.type }}

charts/k8sgpt/templates/serviceMonitor.yaml

@@ -1,21 +0,0 @@
-{{- if .Values.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ template "k8sgpt.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
-  labels:
-    {{- include "k8sgpt.labels" . | nindent 4 }}
-  {{- if .Values.serviceMonitor.additionalLabels }}
-    {{- toYaml .Values.serviceMonitor.additionalLabels | nindent 4 }}
-  {{- end }}
-spec:
-  endpoints:
-  - honorLabels: true
-    path: /metrics
-    port: metrics
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: {{ include "k8sgpt.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}

charts/k8sgpt/values.yaml

@@ -1,30 +0,0 @@
-deployment:
-  image:
-    repository: ghcr.io/k8sgpt-ai/k8sgpt
-    tag: "" # defaults to Chart.appVersion if unspecified
-  imagePullPolicy: Always
-  annotations: {}
-  env:
-    model: "gpt-3.5-turbo"
-    backend: "openai" # one of: [ openai | llama ]
-  resources:
-    limits:
-      cpu: "1"
-      memory: "512Mi"
-    requests:
-      cpu: "0.2"
-      memory: "156Mi"
-  securityContext: {}
-  # Set securityContext.runAsUser/runAsGroup if necessary. Values below were taken from https://github.com/k8sgpt-ai/k8sgpt/blob/main/container/Dockerfile
-  # runAsUser: 65532
-  # runAsGroup: 65532
-secret:
-  secretKey: "" # base64 encoded OpenAI token
-
-service:
-  type: ClusterIP
-  annotations: {}
-
-serviceMonitor:
-  enabled: false
-  additionalLabels: {}

cmd/analyze/analyze.go

@@ -16,31 +16,22 @@ package analyze
 import (
 	"fmt"
 	"os"
-	"os/signal"
-	"syscall"
 
 	"github.com/fatih/color"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/ai/interactive"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/analysis"
 	"github.com/spf13/cobra"
 )
 
 var (
-	explain         bool
-	backend         string
-	output          string
-	filters         []string
-	language        string
-	nocache         bool
-	namespace       string
-	labelSelector   string
-	anonymize       bool
-	maxConcurrency  int
-	withDoc         bool
-	interactiveMode bool
-	customAnalysis  bool
-	customHeaders   []string
-	withStats       bool
+	explain        bool
+	backend        string
+	output         string
+	filters        []string
+	language       string
+	nocache        bool
+	namespace      string
+	anonymize      bool
+	maxConcurrency int
 )
 
 // AnalyzeCmd represents the problems command
@@ -51,81 +42,42 @@ var AnalyzeCmd = &cobra.Command{
 	Long: `This command will find problems within your Kubernetes cluster and
 	provide you with a list of issues that need to be resolved`,
 	Run: func(cmd *cobra.Command, args []string) {
-		// Create analysis configuration first.
-		config, err := analysis.NewAnalysis(
-			backend,
-			language,
-			filters,
-			namespace,
-			labelSelector,
-			nocache,
-			explain,
-			maxConcurrency,
-			withDoc,
-			interactiveMode,
-			customHeaders,
-			withStats,
-		)
 
+		// AnalysisResult configuration
+		config, err := analysis.NewAnalysis(backend,
+			language, filters, namespace, nocache, explain, maxConcurrency)
 		if err != nil {
 			color.Red("Error: %v", err)
 			os.Exit(1)
 		}
-		defer config.Close()
 
-		if customAnalysis {
-			config.RunCustomAnalysis()
+		analysisErrors := config.RunAnalysis()
+		if len(analysisErrors) != 0 {
+			for _, err := range analysisErrors {
+				color.Red("Error: %s", err)
+			}
 		}
-		config.RunAnalysis()
 
 		if explain {
-			if err := config.GetAIResults(output, anonymize); err != nil {
+			err := config.GetAIResults(output, anonymize)
+			if err != nil {
 				color.Red("Error: %v", err)
 				os.Exit(1)
 			}
 		}
+
 		// print results
-		output_data, err := config.PrintOutput(output)
+		output, err := config.PrintOutput(output)
 		if err != nil {
 			color.Red("Error: %v", err)
 			os.Exit(1)
 		}
-
-		if withStats {
-			statsData := config.PrintStats()
-			fmt.Println(string(statsData))
-		}
-
-		fmt.Println(string(output_data))
-
-		if interactiveMode && explain {
-			if output == "json" {
-				color.Yellow("Caution: interactive mode using --json enabled may use additional tokens.")
-			}
-			sigs := make(chan os.Signal, 1)
-			signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
-			interactiveClient := interactive.NewInteractionRunner(config, output_data)
-
-			go interactiveClient.StartInteraction()
-			for {
-				select {
-				case res := <-sigs:
-					switch res {
-					default:
-						os.Exit(0)
-					}
-				case res := <-interactiveClient.State:
-					switch res {
-					case interactive.E_EXITED:
-						os.Exit(0)
-					}
-				}
-			}
-		}
+		fmt.Println(string(output))
 	},
 }
 
 func init() {
+
 	// namespace flag
 	AnalyzeCmd.Flags().StringVarP(&namespace, "namespace", "n", "", "Namespace to analyze")
 	// no cache flag
@@ -137,23 +89,11 @@ func init() {
 	// explain flag
 	AnalyzeCmd.Flags().BoolVarP(&explain, "explain", "e", false, "Explain the problem to me")
 	// add flag for backend
-	AnalyzeCmd.Flags().StringVarP(&backend, "backend", "b", "", "Backend AI provider")
+	AnalyzeCmd.Flags().StringVarP(&backend, "backend", "b", "openai", "Backend AI provider")
 	// output as json
 	AnalyzeCmd.Flags().StringVarP(&output, "output", "o", "text", "Output format (text, json)")
 	// add language options for output
 	AnalyzeCmd.Flags().StringVarP(&language, "language", "l", "english", "Languages to use for AI (e.g. 'English', 'Spanish', 'French', 'German', 'Italian', 'Portuguese', 'Dutch', 'Russian', 'Chinese', 'Japanese', 'Korean')")
 	// add max concurrency
 	AnalyzeCmd.Flags().IntVarP(&maxConcurrency, "max-concurrency", "m", 10, "Maximum number of concurrent requests to the Kubernetes API server")
-	// kubernetes doc flag
-	AnalyzeCmd.Flags().BoolVarP(&withDoc, "with-doc", "d", false, "Give me the official documentation of the involved field")
-	// interactive mode flag
-	AnalyzeCmd.Flags().BoolVarP(&interactiveMode, "interactive", "i", false, "Enable interactive mode that allows further conversation with LLM about the problem. Works only with --explain flag")
-	// custom analysis flag
-	AnalyzeCmd.Flags().BoolVarP(&customAnalysis, "custom-analysis", "z", false, "Enable custom analyzers")
-	// add custom headers flag
-	AnalyzeCmd.Flags().StringSliceVarP(&customHeaders, "custom-headers", "r", []string{}, "Custom Headers, <key>:<value> (e.g CustomHeaderKey:CustomHeaderValue AnotherHeader:AnotherValue)")
-	// label selector flag
-	AnalyzeCmd.Flags().StringVarP(&labelSelector, "selector", "L", "", "Label selector (label query) to filter on, supports '=', '==', and '!='. (e.g. -L key1=value1,key2=value2). Matching objects must satisfy all of the specified label constraints.")
-	// print stats
-	AnalyzeCmd.Flags().BoolVarP(&withStats, "with-stat", "s", false, "Print analysis stats. This option disables errors display.")
 }

cmd/auth/add.go

@@ -1,188 +0,0 @@
-/*
-Copyright 2023 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package auth
-
-import (
-	"fmt"
-	"os"
-	"strings"
-	"syscall"
-
-	"github.com/fatih/color"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/ai"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	"golang.org/x/term"
-)
-
-const (
-	defaultBackend = "openai"
-	defaultModel   = "gpt-4o"
-)
-
-var addCmd = &cobra.Command{
-	Use:   "add",
-	Short: "Add new provider",
-	Long:  "The add command allows to configure a new backend AI provider",
-	PreRun: func(cmd *cobra.Command, args []string) {
-		backend, _ := cmd.Flags().GetString("backend")
-		if strings.ToLower(backend) == "azureopenai" {
-			_ = cmd.MarkFlagRequired("engine")
-			_ = cmd.MarkFlagRequired("baseurl")
-		}
-		if strings.ToLower(backend) == "amazonsagemaker" {
-			_ = cmd.MarkFlagRequired("endpointname")
-			_ = cmd.MarkFlagRequired("providerRegion")
-		}
-		if strings.ToLower(backend) == "amazonbedrock" {
-			_ = cmd.MarkFlagRequired("providerRegion")
-		}
-		if strings.ToLower(backend) == "ibmwatsonxai" {
-			_ = cmd.MarkFlagRequired("providerId")
-		}
-	},
-	Run: func(cmd *cobra.Command, args []string) {
-
-		validBackend := func(validBackends []string, backend string) bool {
-			for _, b := range validBackends {
-				if b == backend {
-					return true
-				}
-			}
-			return false
-		}
-
-		// check if backend is not empty and a valid value
-		if backend == "" {
-			color.Yellow(fmt.Sprintf("Warning: backend input is empty, will use the default value: %s", defaultBackend))
-			backend = defaultBackend
-		} else {
-			if !validBackend(ai.Backends, backend) {
-				color.Red("Error: Backend AI accepted values are '%v'", strings.Join(ai.Backends, ", "))
-				os.Exit(1)
-			}
-		}
-
-		// get ai configuration
-		err := viper.UnmarshalKey("ai", &configAI)
-		if err != nil {
-			color.Red("Error: %v", err)
-			os.Exit(1)
-		}
-
-		// search for provider with same name
-		providerIndex := -1
-		for i, provider := range configAI.Providers {
-			if backend == provider.Name {
-				providerIndex = i
-				break
-			}
-		}
-
-		if providerIndex != -1 {
-			// provider with same name exists, update provider info
-			color.Yellow("Provider with same name already exists.")
-			os.Exit(1)
-		}
-
-		// check if model is not empty
-		if model == "" {
-			model = defaultModel
-			color.Yellow(fmt.Sprintf("Warning: model input is empty, will use the default value: %s", defaultModel))
-		}
-		if temperature > 1.0 || temperature < 0.0 {
-			color.Red("Error: temperature ranges from 0 to 1.")
-			os.Exit(1)
-		}
-		if topP > 1.0 || topP < 0.0 {
-			color.Red("Error: topP ranges from 0 to 1.")
-			os.Exit(1)
-		}
-		if topK < 1 || topK > 100 {
-			color.Red("Error: topK ranges from 1 to 100.")
-			os.Exit(1)
-		}
-
-		if ai.NeedPassword(backend) && password == "" {
-			fmt.Printf("Enter %s Key: ", backend)
-			bytePassword, err := term.ReadPassword(int(syscall.Stdin))
-			if err != nil {
-				color.Red("Error reading %s Key from stdin: %s", backend,
-					err.Error())
-				os.Exit(1)
-			}
-			password = strings.TrimSpace(string(bytePassword))
-		}
-
-		// create new provider object
-		newProvider := ai.AIProvider{
-			Name:           backend,
-			Model:          model,
-			Password:       password,
-			BaseURL:        baseURL,
-			EndpointName:   endpointName,
-			Engine:         engine,
-			Temperature:    temperature,
-			ProviderRegion: providerRegion,
-			ProviderId:     providerId,
-			CompartmentId:  compartmentId,
-			TopP:           topP,
-			TopK:           topK,
-			MaxTokens:      maxTokens,
-			OrganizationId: organizationId,
-		}
-
-		if providerIndex == -1 {
-			// provider with same name does not exist, add new provider to list
-			configAI.Providers = append(configAI.Providers, newProvider)
-			viper.Set("ai", configAI)
-			if err := viper.WriteConfig(); err != nil {
-				color.Red("Error writing config file: %s", err.Error())
-				os.Exit(1)
-			}
-			color.Green("%s added to the AI backend provider list", backend)
-		}
-	},
-}
-
-func init() {
-	// add flag for backend
-	addCmd.Flags().StringVarP(&backend, "backend", "b", defaultBackend, "Backend AI provider")
-	// add flag for model
-	addCmd.Flags().StringVarP(&model, "model", "m", defaultModel, "Backend AI model")
-	// add flag for password
-	addCmd.Flags().StringVarP(&password, "password", "p", "", "Backend AI password")
-	// add flag for url
-	addCmd.Flags().StringVarP(&baseURL, "baseurl", "u", "", "URL AI provider, (e.g `http://localhost:8080/v1`)")
-	// add flag for endpointName
-	addCmd.Flags().StringVarP(&endpointName, "endpointname", "n", "", "Endpoint Name, e.g. `endpoint-xxxxxxxxxxxx` (only for amazonbedrock, amazonsagemaker backends)")
-	// add flag for topP
-	addCmd.Flags().Float32VarP(&topP, "topp", "", 0.5, "Probability Cutoff: Set a threshold (0.0-1.0) to limit word choices. Higher values add randomness, lower values increase predictability.")
-	// add flag for topK
-	addCmd.Flags().Int32VarP(&topK, "topk", "c", 50, "Sampling Cutoff: Set a threshold (1-100) to restrict the sampling process to the top K most probable words at each step. Higher values lead to greater variability, lower values increases predictability.")
-	// max tokens
-	addCmd.Flags().IntVarP(&maxTokens, "maxtokens", "l", 2048, "Specify a maximum output length. Adjust (1-...) to control text length. Higher values produce longer output, lower values limit length")
-	// add flag for temperature
-	addCmd.Flags().Float32VarP(&temperature, "temperature", "t", 0.7, "The sampling temperature, value ranges between 0 ( output be more deterministic) and 1 (more random)")
-	// add flag for azure open ai engine/deployment name
-	addCmd.Flags().StringVarP(&engine, "engine", "e", "", "Azure AI deployment name (only for azureopenai backend)")
-	//add flag for amazonbedrock region name
-	addCmd.Flags().StringVarP(&providerRegion, "providerRegion", "r", "", "Provider Region name (only for amazonbedrock, googlevertexai backend)")
-	//add flag for vertexAI/WatsonxAI Project ID
-	addCmd.Flags().StringVarP(&providerId, "providerId", "i", "", "Provider specific ID for e.g. project (only for googlevertexai/ibmwatsonxai backend)")
-	//add flag for OCI Compartment ID
-	addCmd.Flags().StringVarP(&compartmentId, "compartmentId", "k", "", "Compartment ID for generative AI model (only for oci backend)")
-	// add flag for openai organization
-	addCmd.Flags().StringVarP(&organizationId, "organizationId", "o", "", "OpenAI or AzureOpenAI Organization ID (only for openai and azureopenai backend)")
-}

cmd/auth/auth.go

@@ -14,51 +14,107 @@ limitations under the License.
 package auth
 
 import (
+	"fmt"
+	"os"
+	"strings"
+	"syscall"
+
+	"github.com/fatih/color"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/ai"
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+	"golang.org/x/term"
 )
 
 var (
-	backend        string
-	password       string
-	baseURL        string
-	endpointName   string
-	model          string
-	engine         string
-	temperature    float32
-	providerRegion string
-	providerId     string
-	compartmentId  string
-	topP           float32
-	topK           int32
-	maxTokens      int
-	organizationId string
+	backend  string
+	password string
+	baseURL  string
+	model    string
 )
 
-var configAI ai.AIConfiguration
-
 // authCmd represents the auth command
 var AuthCmd = &cobra.Command{
 	Use:   "auth",
 	Short: "Authenticate with your chosen backend",
 	Long:  `Provide the necessary credentials to authenticate with your chosen backend.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		if len(args) == 0 {
-			_ = cmd.Help()
-			return
+
+		// get ai configuration
+		var configAI ai.AIConfiguration
+		err := viper.UnmarshalKey("ai", &configAI)
+		if err != nil {
+			color.Red("Error: %v", err)
+			os.Exit(1)
 		}
+
+		// search for provider with same name
+		providerIndex := -1
+		for i, provider := range configAI.Providers {
+			if backend == provider.Name {
+				providerIndex = i
+				break
+			}
+		}
+
+		// check if backend is not empty
+		if backend == "" {
+			color.Red("Error: Backend AI cannot be empty.")
+			os.Exit(1)
+		}
+
+		color.Green("Using %s as backend AI provider", backend)
+
+		// check if model is not empty
+		if model == "" {
+			color.Red("Error: Model cannot be empty.")
+			os.Exit(1)
+		}
+
+		if ai.NeedPassword(backend) && password == "" {
+			fmt.Printf("Enter %s Key: ", backend)
+			bytePassword, err := term.ReadPassword(int(syscall.Stdin))
+			if err != nil {
+				color.Red("Error reading %s Key from stdin: %s", backend,
+					err.Error())
+				os.Exit(1)
+			}
+			password = strings.TrimSpace(string(bytePassword))
+		}
+
+		// create new provider object
+		newProvider := ai.AIProvider{
+			Name:     backend,
+			Model:    model,
+			Password: password,
+			BaseURL:  baseURL,
+		}
+
+		if providerIndex == -1 {
+			// provider with same name does not exist, add new provider to list
+			configAI.Providers = append(configAI.Providers, newProvider)
+			color.Green("New provider added")
+		} else {
+			// provider with same name exists, update provider info
+			configAI.Providers[providerIndex] = newProvider
+			color.Green("Provider updated")
+		}
+		viper.Set("ai", configAI)
+		if err := viper.WriteConfig(); err != nil {
+			color.Red("Error writing config file: %s", err.Error())
+			os.Exit(1)
+		}
+		color.Green("key added")
 	},
 }
 
 func init() {
-	// add subcommand to list backends
-	AuthCmd.AddCommand(listCmd)
-	// add subcommand to create new backend provider
-	AuthCmd.AddCommand(addCmd)
-	// add subcommand to remove new backend provider
-	AuthCmd.AddCommand(removeCmd)
-	// add subcommand to set default backend provider
-	AuthCmd.AddCommand(defaultCmd)
-	// add subcommand to update backend provider
-	AuthCmd.AddCommand(updateCmd)
+	// add flag for backend
+	AuthCmd.Flags().StringVarP(&backend, "backend", "b", "openai", "Backend AI provider")
+	// add flag for model
+	AuthCmd.Flags().StringVarP(&model, "model", "m", "gpt-3.5-turbo", "Backend AI model")
+	// add flag for password
+	AuthCmd.Flags().StringVarP(&password, "password", "p", "", "Backend AI password")
+	// add flag for url
+	AuthCmd.Flags().StringVarP(&baseURL, "baseurl", "u", "", "URL AI provider, (e.g `http://localhost:8080/v1`)")
 }

cmd/auth/default.go

@@ -1,79 +0,0 @@
-/*
-Copyright 2023 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package auth
-
-import (
-	"os"
-	"strings"
-
-	"github.com/fatih/color"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-)
-
-var (
-	providerName string
-)
-
-var defaultCmd = &cobra.Command{
-	Use:   "default",
-	Short: "Set your default AI backend provider",
-	Long:  "The command to set your new default AI backend provider (default is openai)",
-	Run: func(cmd *cobra.Command, args []string) {
-		err := viper.UnmarshalKey("ai", &configAI)
-		if err != nil {
-			color.Red("Error: %v", err)
-			os.Exit(1)
-		}
-		if providerName == "" {
-			if configAI.DefaultProvider != "" {
-				color.Yellow("Your default provider is %s", configAI.DefaultProvider)
-			} else {
-				color.Yellow("Your default provider is openai")
-			}
-			os.Exit(0)
-		}
-		// lowercase the provider name
-		providerName = strings.ToLower(providerName)
-
-		// Check if the provider is in the provider list
-		providerExists := false
-		for _, provider := range configAI.Providers {
-			if provider.Name == providerName {
-				providerExists = true
-			}
-		}
-		if !providerExists {
-			color.Red("Error: Provider %s does not exist", providerName)
-			os.Exit(1)
-		}
-		// Set the default provider
-		configAI.DefaultProvider = providerName
-
-		viper.Set("ai", configAI)
-		// Viper write config
-		err = viper.WriteConfig()
-		if err != nil {
-			color.Red("Error: %v", err)
-			os.Exit(1)
-		}
-		// Print acknowledgement
-		color.Green("Default provider set to %s", providerName)
-	},
-}
-
-func init() {
-	// provider name flag
-	defaultCmd.Flags().StringVarP(&providerName, "provider", "p", "", "The name of the provider to set as default")
-}

cmd/auth/list.go

@@ -1,98 +0,0 @@
-/*
-Copyright 2023 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package auth
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/fatih/color"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/ai"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-)
-
-var details bool
-
-var listCmd = &cobra.Command{
-	Use:   "list",
-	Short: "List configured providers",
-	Long:  "The list command displays a list of configured providers",
-	Run: func(cmd *cobra.Command, args []string) {
-
-		// get ai configuration
-		err := viper.UnmarshalKey("ai", &configAI)
-		if err != nil {
-			color.Red("Error: %v", err)
-			os.Exit(1)
-		}
-
-		// Print the default if it is set
-		fmt.Print(color.YellowString("Default: \n"))
-		if configAI.DefaultProvider != "" {
-			fmt.Printf("> %s\n", color.BlueString(configAI.DefaultProvider))
-		} else {
-			fmt.Printf("> %s\n", color.BlueString("openai"))
-		}
-
-		// Get list of all AI Backends and only print them if they are not in the provider list
-		fmt.Print(color.YellowString("Active: \n"))
-		for _, aiBackend := range ai.Backends {
-			providerExists := false
-			for _, provider := range configAI.Providers {
-				if provider.Name == aiBackend {
-					providerExists = true
-				}
-			}
-			if providerExists {
-				fmt.Printf("> %s\n", color.GreenString(aiBackend))
-				if details {
-					for _, provider := range configAI.Providers {
-						if provider.Name == aiBackend {
-							printDetails(provider)
-						}
-					}
-				}
-			}
-		}
-		fmt.Print(color.YellowString("Unused: \n"))
-		for _, aiBackend := range ai.Backends {
-			providerExists := false
-			for _, provider := range configAI.Providers {
-				if provider.Name == aiBackend {
-					providerExists = true
-				}
-			}
-			if !providerExists {
-				fmt.Printf("> %s\n", color.RedString(aiBackend))
-			}
-		}
-	},
-}
-
-func init() {
-	listCmd.Flags().BoolVar(&details, "details", false, "Print active provider configuration details")
-}
-
-func printDetails(provider ai.AIProvider) {
-	if provider.Model != "" {
-		fmt.Printf("   - Model: %s\n", provider.Model)
-	}
-	if provider.Engine != "" {
-		fmt.Printf("   - Engine: %s\n", provider.Engine)
-	}
-	if provider.BaseURL != "" {
-		fmt.Printf("   - BaseURL: %s\n", provider.BaseURL)
-	}
-}

cmd/auth/remove.go

@@ -1,77 +0,0 @@
-/*
-Copyright 2023 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package auth
-
-import (
-	"os"
-	"strings"
-
-	"github.com/fatih/color"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-)
-
-var removeCmd = &cobra.Command{
-	Use:   "remove",
-	Short: "Remove provider(s)",
-	Long:  "The command to remove AI backend provider(s)",
-	PreRun: func(cmd *cobra.Command, args []string) {
-		_ = cmd.MarkFlagRequired("backends")
-	},
-	Run: func(cmd *cobra.Command, args []string) {
-		if backend == "" {
-			color.Red("Error: backends must be set.")
-			_ = cmd.Help()
-			return
-		}
-		inputBackends := strings.Split(backend, ",")
-
-		err := viper.UnmarshalKey("ai", &configAI)
-		if err != nil {
-			color.Red("Error: %v", err)
-			os.Exit(1)
-		}
-
-		for _, b := range inputBackends {
-			foundBackend := false
-			for i, provider := range configAI.Providers {
-				if b == provider.Name {
-					foundBackend = true
-					configAI.Providers = append(configAI.Providers[:i], configAI.Providers[i+1:]...)
-					if configAI.DefaultProvider == b {
-						configAI.DefaultProvider = "openai"
-					}
-					color.Green("%s deleted from the AI backend provider list", b)
-					break
-				}
-			}
-			if !foundBackend {
-				color.Red("Error: %s does not exist in configuration file. Please use k8sgpt auth new.", b)
-				os.Exit(1)
-			}
-		}
-
-		viper.Set("ai", configAI)
-		if err := viper.WriteConfig(); err != nil {
-			color.Red("Error writing config file: %s", err.Error())
-			os.Exit(1)
-		}
-
-	},
-}
-
-func init() {
-	// add flag for backends
-	removeCmd.Flags().StringVarP(&backend, "backends", "b", "", "Backend AI providers to remove (separated by a comma)")
-}

cmd/auth/update.go

@@ -1,120 +0,0 @@
-/*
-Copyright 2023 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package auth
-
-import (
-	"os"
-	"strings"
-
-	"github.com/fatih/color"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-)
-
-var updateCmd = &cobra.Command{
-	Use:   "update",
-	Short: "Update a backend provider",
-	Long:  "The command to update an AI backend provider",
-	// Args:  cobra.ExactArgs(1),
-	PreRun: func(cmd *cobra.Command, args []string) {
-		_ = cmd.MarkFlagRequired("backend")
-		backend, _ := cmd.Flags().GetString("backend")
-		if strings.ToLower(backend) == "azureopenai" {
-			_ = cmd.MarkFlagRequired("engine")
-			_ = cmd.MarkFlagRequired("baseurl")
-		}
-		organizationId, _ := cmd.Flags().GetString("organizationId")
-		if strings.ToLower(backend) != "azureopenai" && strings.ToLower(backend) != "openai" {
-			if organizationId != "" {
-				color.Red("Error: organizationId must be empty for backends other than azureopenai or openai.")
-				os.Exit(1)
-			}
-		}
-	},
-	Run: func(cmd *cobra.Command, args []string) {
-
-		// get ai configuration
-		err := viper.UnmarshalKey("ai", &configAI)
-		if err != nil {
-			color.Red("Error: %v", err)
-			os.Exit(1)
-		}
-
-		backend, _ := cmd.Flags().GetString("backend")
-
-		if temperature > 1.0 || temperature < 0.0 {
-			color.Red("Error: temperature ranges from 0 to 1.")
-			os.Exit(1)
-		}
-
-		foundBackend := false
-		for i, provider := range configAI.Providers {
-			if backend == provider.Name {
-				foundBackend = true
-				if backend != "" {
-					configAI.Providers[i].Name = backend
-					color.Blue("Backend name updated successfully")
-				}
-				if model != "" {
-					configAI.Providers[i].Model = model
-					color.Blue("Model updated successfully")
-				}
-				if password != "" {
-					configAI.Providers[i].Password = password
-					color.Blue("Password updated successfully")
-				}
-				if baseURL != "" {
-					configAI.Providers[i].BaseURL = baseURL
-					color.Blue("Base URL updated successfully")
-				}
-				if engine != "" {
-					configAI.Providers[i].Engine = engine
-				}
-				if organizationId != "" {
-					configAI.Providers[i].OrganizationId = organizationId
-					color.Blue("Organization Id updated successfully")
-				}
-				configAI.Providers[i].Temperature = temperature
-				color.Green("%s updated in the AI backend provider list", backend)
-			}
-		}
-		if !foundBackend {
-			color.Red("Error: %s does not exist in configuration file. Please use k8sgpt auth new.", args[0])
-			os.Exit(1)
-		}
-
-		viper.Set("ai", configAI)
-		if err := viper.WriteConfig(); err != nil {
-			color.Red("Error writing config file: %s", err.Error())
-			os.Exit(1)
-		}
-	},
-}
-
-func init() {
-	// update flag for backend
-	updateCmd.Flags().StringVarP(&backend, "backend", "b", "", "Update backend AI provider")
-	// update flag for model
-	updateCmd.Flags().StringVarP(&model, "model", "m", "", "Update backend AI model")
-	// update flag for password
-	updateCmd.Flags().StringVarP(&password, "password", "p", "", "Update backend AI password")
-	// update flag for url
-	updateCmd.Flags().StringVarP(&baseURL, "baseurl", "u", "", "Update URL AI provider, (e.g `http://localhost:8080/v1`)")
-	// add flag for temperature
-	updateCmd.Flags().Float32VarP(&temperature, "temperature", "t", 0.7, "The sampling temperature, value ranges between 0 ( output be more deterministic) and 1 (more random)")
-	// update flag for azure open ai engine/deployment name
-	updateCmd.Flags().StringVarP(&engine, "engine", "e", "", "Update Azure AI deployment name")
-	// update flag for organizationId
-	updateCmd.Flags().StringVarP(&organizationId, "organizationId", "o", "", "Update OpenAI or Azure organization Id")
-}

cmd/cache/add.go

@@ -1,85 +0,0 @@
-/*
-Copyright 2023 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-package cache
-
-import (
-	"fmt"
-	"os"
-	"strings"
-
-	"github.com/fatih/color"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/cache"
-	"github.com/spf13/cobra"
-)
-
-var (
-	region string
-	//nolint:unused
-	bucketName     string
-	storageAccount string
-	containerName  string
-	projectId      string
-	endpoint       string
-	insecure       bool
-)
-
-// addCmd represents the add command
-var addCmd = &cobra.Command{
-	Use:   "add [cache type]",
-	Short: "Add a remote cache",
-	Long: `This command allows you to add a remote cache to store the results of an analysis.
-	The supported cache types are:
-	- Azure Blob storage (e.g., k8sgpt cache add azure)
-	- Google Cloud storage (e.g., k8sgpt cache add gcs)
-	- S3 (e.g., k8sgpt cache add s3)
-	- Interplex (e.g., k8sgpt cache add interplex)`,
-	Run: func(cmd *cobra.Command, args []string) {
-		if len(args) == 0 {
-			color.Red("Error: Please provide a value for cache types. Run k8sgpt cache add --help")
-			os.Exit(1)
-		}
-		fmt.Println(color.YellowString("Adding remote based cache"))
-		cacheType := args[0]
-		remoteCache, err := cache.NewCacheProvider(strings.ToLower(cacheType), bucketName, region, endpoint, storageAccount, containerName, projectId, insecure)
-		if err != nil {
-			color.Red("Error: %v", err)
-			os.Exit(1)
-		}
-		err = cache.AddRemoteCache(remoteCache)
-		if err != nil {
-			color.Red("Error: %v", err)
-			os.Exit(1)
-		}
-	},
-}
-
-func init() {
-	CacheCmd.AddCommand(addCmd)
-	addCmd.Flags().StringVarP(&region, "region", "r", "us-east-1", "The region to use for the AWS S3 or GCS cache")
-	addCmd.Flags().StringVarP(&endpoint, "endpoint", "e", "", "The S3 or minio endpoint")
-	addCmd.Flags().BoolVarP(&insecure, "insecure", "i", false, "Skip TLS verification for S3/Minio custom endpoint")
-	addCmd.Flags().StringVarP(&bucketName, "bucket", "b", "", "The name of the AWS S3 bucket to use for the cache")
-	addCmd.Flags().StringVarP(&projectId, "projectid", "p", "", "The GCP project ID")
-	addCmd.Flags().StringVarP(&storageAccount, "storageacc", "s", "", "The Azure storage account name of the container")
-	addCmd.Flags().StringVarP(&containerName, "container", "c", "", "The Azure container name to use for the cache")
-	addCmd.MarkFlagsRequiredTogether("storageacc", "container")
-	// Tedious check to ensure we don't include arguments from different providers
-	addCmd.MarkFlagsMutuallyExclusive("region", "storageacc")
-	addCmd.MarkFlagsMutuallyExclusive("region", "container")
-	addCmd.MarkFlagsMutuallyExclusive("bucket", "storageacc")
-	addCmd.MarkFlagsMutuallyExclusive("bucket", "container")
-	addCmd.MarkFlagsMutuallyExclusive("projectid", "storageacc")
-	addCmd.MarkFlagsMutuallyExclusive("projectid", "container")
-}

cmd/cache/cache.go

@@ -1,35 +0,0 @@
-/*
-Copyright 2023 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-package cache
-
-import (
-	"github.com/spf13/cobra"
-)
-
-// cacheCmd represents the cache command
-var CacheCmd = &cobra.Command{
-	Use:   "cache",
-	Short: "For working with the cache the results of an analysis",
-	Long:  `Cache commands allow you to add a remote cache, list the contents of the cache, and remove items from the cache.`,
-	Run: func(cmd *cobra.Command, args []string) {
-		err := cmd.Help()
-		if err != nil {
-			panic(err)
-		}
-	},
-}
-
-func init() {
-}

cmd/cache/get.go

@@ -1,45 +0,0 @@
-/*
-Copyright 2023 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-package cache
-
-import (
-	"fmt"
-	"github.com/fatih/color"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/cache"
-	"github.com/spf13/cobra"
-	"os"
-)
-
-// listCmd represents the list command
-var getCmd = &cobra.Command{
-	Use:   "get",
-	Short: "Get the current cache",
-	Long:  `Returns the current remote cache being used`,
-	Run: func(cmd *cobra.Command, args []string) {
-
-		// load remote cache if it is configured
-		c, err := cache.GetCacheConfiguration()
-		if err != nil {
-			color.Red("Error: %v", err)
-			os.Exit(1)
-		}
-		fmt.Printf("Current remote cache is: %s", c.GetName())
-	},
-}
-
-func init() {
-	CacheCmd.AddCommand(getCmd)
-
-}

cmd/cache/list.go

@@ -1,67 +0,0 @@
-/*
-Copyright 2023 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-package cache
-
-import (
-	"os"
-	"reflect"
-
-	"github.com/fatih/color"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/cache"
-	"github.com/olekukonko/tablewriter"
-	"github.com/spf13/cobra"
-)
-
-// listCmd represents the list command
-var listCmd = &cobra.Command{
-	Use:   "list",
-	Short: "List the contents of the cache",
-	Long:  `This command allows you to list the contents of the cache.`,
-	Run: func(cmd *cobra.Command, args []string) {
-
-		// load remote cache if it is configured
-		c, err := cache.GetCacheConfiguration()
-		if err != nil {
-			color.Red("Error: %v", err)
-			os.Exit(1)
-		}
-		names, err := c.List()
-		if err != nil {
-			color.Red("Error: %v", err)
-			os.Exit(1)
-		}
-
-		var headers []string
-		obj := cache.CacheObjectDetails{}
-		objType := reflect.TypeOf(obj)
-		for i := 0; i < objType.NumField(); i++ {
-			field := objType.Field(i)
-			headers = append(headers, field.Name)
-		}
-
-		table := tablewriter.NewWriter(os.Stdout)
-		table.SetHeader(headers)
-
-		for _, v := range names {
-			table.Append([]string{v.Name, v.UpdatedAt.String()})
-		}
-		table.Render()
-	},
-}
-
-func init() {
-	CacheCmd.AddCommand(listCmd)
-
-}

cmd/cache/purge.go

@@ -1,54 +0,0 @@
-/*
-Copyright 2023 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-package cache
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/fatih/color"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/cache"
-	"github.com/spf13/cobra"
-)
-
-var purgeCmd = &cobra.Command{
-	Use:   "purge [object name]",
-	Short: "Purge a remote cache",
-	Long:  "This command allows you to delete/purge one object from the cache",
-	Run: func(cmd *cobra.Command, args []string) {
-		if len(args) == 0 {
-			color.Red("Error: Please provide a value for object name. Run k8sgpt cache purge --help")
-			os.Exit(1)
-		}
-		objectKey := args[0]
-		fmt.Println(color.YellowString("Purging a remote cache."))
-		c, err := cache.GetCacheConfiguration()
-		if err != nil {
-			color.Red("Error: %v", err)
-			os.Exit(1)
-		}
-
-		err = c.Remove(objectKey)
-		if err != nil {
-			color.Red("Error: %v", err)
-			os.Exit(1)
-		}
-		fmt.Println(color.GreenString("Object deleted."))
-	},
-}
-
-func init() {
-	CacheCmd.AddCommand(purgeCmd)
-}

cmd/cache/remove.go

@@ -1,43 +0,0 @@
-/*
-Copyright 2023 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-package cache
-
-import (
-	"os"
-
-	"github.com/fatih/color"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/cache"
-	"github.com/spf13/cobra"
-)
-
-// removeCmd represents the remove command
-var removeCmd = &cobra.Command{
-	Use:   "remove",
-	Short: "Remove the remote cache",
-	Long:  `This command allows you to remove the remote cache and use the default filecache.`,
-	Run: func(cmd *cobra.Command, args []string) {
-
-		err := cache.RemoveRemoteCache()
-		if err != nil {
-			color.Red("Error: %v", err)
-			os.Exit(1)
-		}
-		color.Green("Successfully removed the remote cache")
-	},
-}
-
-func init() {
-	CacheCmd.AddCommand(removeCmd)
-}

cmd/customAnalyzer/add.go

@@ -1,73 +0,0 @@
-/*
-Copyright 2023 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package customanalyzer
-
-import (
-	"os"
-
-	"github.com/fatih/color"
-	customAnalyzer "github.com/k8sgpt-ai/k8sgpt/pkg/custom_analyzer"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-)
-
-var (
-	name string
-	url  string
-	port int
-)
-
-var addCmd = &cobra.Command{
-	Use:     "add",
-	Aliases: []string{"add"},
-	Short:   "This command will add a custom analyzer from source",
-	Long:    "This command allows you to add/remote/list an existing custom analyzer.",
-	Run: func(cmd *cobra.Command, args []string) {
-		err := viper.UnmarshalKey("custom_analyzers", &configCustomAnalyzer)
-		if err != nil {
-			color.Red("Error: %v", err)
-			os.Exit(1)
-		}
-		analyzer := customAnalyzer.NewCustomAnalyzer()
-
-		// Check if configuration is valid
-		err = analyzer.Check(configCustomAnalyzer, name, url, port)
-		if err != nil {
-			color.Red("Error adding custom analyzer: %s", err.Error())
-			os.Exit(1)
-		}
-
-		configCustomAnalyzer = append(configCustomAnalyzer, customAnalyzer.CustomAnalyzerConfiguration{
-			Name: name,
-			Connection: customAnalyzer.Connection{
-				Url:  url,
-				Port: port,
-			},
-		})
-
-		viper.Set("custom_analyzers", configCustomAnalyzer)
-		if err := viper.WriteConfig(); err != nil {
-			color.Red("Error writing config file: %s", err.Error())
-			os.Exit(1)
-		}
-		color.Green("%s added to the custom analyzers config list", name)
-
-	},
-}
-
-func init() {
-	addCmd.Flags().StringVarP(&name, "name", "n", "my-custom-analyzer", "Name of the custom analyzer.")
-	addCmd.Flags().StringVarP(&url, "url", "u", "localhost", "URL for the custom analyzer connection.")
-	addCmd.Flags().IntVarP(&port, "port", "r", 8085, "Port for the custom analyzer connection.")
-}

cmd/customAnalyzer/customAnalyzer.go

@@ -1,43 +0,0 @@
-/*
-Copyright 2023 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package customanalyzer
-
-import (
-	customAnalyzer "github.com/k8sgpt-ai/k8sgpt/pkg/custom_analyzer"
-	"github.com/spf13/cobra"
-)
-
-var configCustomAnalyzer []customAnalyzer.CustomAnalyzerConfiguration
-
-// authCmd represents the auth command
-var CustomAnalyzerCmd = &cobra.Command{
-	Use:   "custom-analyzer",
-	Short: "Manage a custom analyzer",
-	Long:  `This command allows you to manage custom analyzers, including adding, removing, and listing them.`,
-	Run: func(cmd *cobra.Command, args []string) {
-		if len(args) == 0 {
-			_ = cmd.Help()
-			return
-		}
-	},
-}
-
-func init() {
-	// add subcommand to add custom analyzer
-	CustomAnalyzerCmd.AddCommand(addCmd)
-	// remove subcomment to remove custom analyzer
-	CustomAnalyzerCmd.AddCommand(removeCmd)
-	// list subcomment to list custom analyzer
-	CustomAnalyzerCmd.AddCommand(listCmd)
-}

cmd/customAnalyzer/list.go

@@ -1,60 +0,0 @@
-/*
-Copyright 2023 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package customanalyzer
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/fatih/color"
-	customAnalyzer "github.com/k8sgpt-ai/k8sgpt/pkg/custom_analyzer"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-)
-
-var details bool
-
-var listCmd = &cobra.Command{
-	Use:   "list",
-	Short: "List configured custom analyzers",
-	Long:  "The list command displays a list of configured custom analyzers",
-	Run: func(cmd *cobra.Command, args []string) {
-
-		// get custom_analyzers configuration
-		err := viper.UnmarshalKey("custom_analyzers", &configCustomAnalyzer)
-		if err != nil {
-			color.Red("Error: %v", err)
-			os.Exit(1)
-		}
-
-		// Get list of all Custom Analyers configured
-		fmt.Print(color.YellowString("Active: \n"))
-		for _, analyzer := range configCustomAnalyzer {
-			fmt.Printf("> %s\n", color.GreenString(analyzer.Name))
-			if details {
-				printDetails(analyzer)
-			}
-		}
-	},
-}
-
-func init() {
-	listCmd.Flags().BoolVar(&details, "details", false, "Print custom analyzers configuration details")
-}
-
-func printDetails(analyzer customAnalyzer.CustomAnalyzerConfiguration) {
-	fmt.Printf("   - Url: %s\n", analyzer.Connection.Url)
-	fmt.Printf("   - Port: %d\n", analyzer.Connection.Port)
-
-}

cmd/customAnalyzer/remove.go

@@ -1,90 +0,0 @@
-/*
-Copyright 2023 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package customanalyzer
-
-import (
-	"os"
-	"strings"
-
-	"github.com/fatih/color"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-)
-
-var (
-	names string
-)
-
-var removeCmd = &cobra.Command{
-	Use:   "remove",
-	Short: "Remove custom analyzer(s)",
-	Long:  "The command to remove custom analyzer(s)",
-	PreRun: func(cmd *cobra.Command, args []string) {
-		// Ensure that the "names" flag is provided before running the command
-		_ = cmd.MarkFlagRequired("names")
-	},
-	Run: func(cmd *cobra.Command, args []string) {
-		if names == "" {
-			// Display an error message and show command help if "names" is not set
-			color.Red("Error: names must be set.")
-			_ = cmd.Help()
-			return
-		}
-		// Split the provided names by comma
-		inputCustomAnalyzers := strings.Split(names, ",")
-
-		// Load the custom analyzers from the configuration file
-		err := viper.UnmarshalKey("custom_analyzers", &configCustomAnalyzer)
-		if err != nil {
-			// Display an error message if the configuration cannot be loaded
-			color.Red("Error: %v", err)
-			os.Exit(1)
-		}
-
-		// Iterate over each input analyzer name
-		for _, inputAnalyzer := range inputCustomAnalyzers {
-			foundAnalyzer := false
-			// Search for the analyzer in the current configuration
-			for i, analyzer := range configCustomAnalyzer {
-				if analyzer.Name == inputAnalyzer {
-					foundAnalyzer = true
-
-					// Remove the analyzer from the configuration list
-					configCustomAnalyzer = append(configCustomAnalyzer[:i], configCustomAnalyzer[i+1:]...)
-					color.Green("%s deleted from the custom analyzer list", analyzer.Name)
-					break
-				}
-			}
-			if !foundAnalyzer {
-				// Display an error if the analyzer is not found in the configuration
-				color.Red("Error: %s does not exist in configuration file. Please use k8sgpt custom-analyzer add.", inputAnalyzer)
-				os.Exit(1)
-			}
-		}
-
-		// Save the updated configuration back to the file
-		viper.Set("custom_analyzers", configCustomAnalyzer)
-		if err := viper.WriteConfig(); err != nil {
-			// Display an error if the configuration cannot be written
-			color.Red("Error writing config file: %s", err.Error())
-			os.Exit(1)
-		}
-
-	},
-}
-
-func init() {
-	// add flag for names
-	removeCmd.Flags().StringVarP(&names, "names", "n", "", "Custom analyzers to remove (separated by a comma)")
-}

cmd/dump/dump.go

@@ -1,113 +0,0 @@
-/*
-Copyright 2023 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package dump
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"os"
-	"time"
-
-	"github.com/fatih/color"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/ai"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	"k8s.io/apimachinery/pkg/version"
-)
-
-type K8sGPTInfo struct {
-	Version string
-	Commit  string
-	Date    string
-}
-type DumpOut struct {
-	AIConfiguration        ai.AIConfiguration
-	ActiveFilters          []string
-	KubenetesServerVersion *version.Info
-	K8sGPTInfo             K8sGPTInfo
-}
-
-var DumpCmd = &cobra.Command{
-	Use:   "dump",
-	Short: "Creates a dumpfile for debugging issues with K8sGPT",
-	Long:  `The dump command will create a dump.*.json which will contain K8sGPT non-sensitive configuration information.`,
-	Run: func(cmd *cobra.Command, args []string) {
-
-		// Fetch the configuration object(s)
-		// get ai configuration
-		var configAI ai.AIConfiguration
-		err := viper.UnmarshalKey("ai", &configAI)
-		if err != nil {
-			color.Red("Error: %v", err)
-			os.Exit(1)
-		}
-
-		var newProvider []ai.AIProvider
-		for _, config := range configAI.Providers {
-			// we blank out the custom headers for data protection reasons
-			config.CustomHeaders = make([]http.Header, 0)
-			// blank out the password
-			if len(config.Password) > 4 {
-				config.Password = config.Password[:4] + "***"
-			} else {
-				// If the password is shorter than 4 characters
-				config.Password = "***"
-			}
-			newProvider = append(newProvider, config)
-		}
-		configAI.Providers = newProvider
-		activeFilters := viper.GetStringSlice("active_filters")
-		kubecontext := viper.GetString("kubecontext")
-		kubeconfig := viper.GetString("kubeconfig")
-		client, err := kubernetes.NewClient(kubecontext, kubeconfig)
-		if err != nil {
-			color.Red("Error: %v", err)
-			os.Exit(1)
-		}
-		v, err := client.Client.Discovery().ServerVersion()
-		if err != nil {
-			color.Yellow("Could not find kubernetes server version")
-		}
-		var dumpOut DumpOut = DumpOut{
-			AIConfiguration:        configAI,
-			ActiveFilters:          activeFilters,
-			KubenetesServerVersion: v,
-			K8sGPTInfo: K8sGPTInfo{
-				Version: viper.GetString("Version"),
-				Commit:  viper.GetString("Commit"),
-				Date:    viper.GetString("Date"),
-			},
-		}
-		// Serialize dumpOut to JSON
-		jsonData, err := json.MarshalIndent(dumpOut, "", " ")
-		if err != nil {
-			color.Red("Error: %v", err)
-			os.Exit(1)
-		}
-		// Write JSON data to file
-		f := fmt.Sprintf("dump_%s.json", time.Now().Format("20060102150405"))
-		err = os.WriteFile(f, jsonData, 0644)
-		if err != nil {
-			color.Red("Error: %v", err)
-			os.Exit(1)
-		}
-		color.Green("Dump created successfully: %s", f)
-	},
-}
-
-func init() {
-
-}

cmd/filters/add.go

@@ -45,13 +45,6 @@ var addCmd = &cobra.Command{
 			for _, filter := range availableFilters {
 				if filter == f {
 					foundFilter = true
-
-					// WARNING: This is to enable users correctly understand implications
-					// of enabling logs
-					if filter == "Log" {
-						color.Yellow("Warning: by enabling logs, you will be sending potentially sensitive data to the AI backend.")
-					}
-
 					break
 				}
 			}

cmd/filters/filters.go

@@ -25,7 +25,7 @@ var FiltersCmd = &cobra.Command{
 	You can list available filters to analyze resources.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) == 0 {
-			_ = cmd.Help()
+			cmd.Help()
 			return
 		}
 	},

cmd/filters/list.go

@@ -15,11 +15,9 @@ package filters
 
 import (
 	"fmt"
-	"slices"
 
 	"github.com/fatih/color"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/analyzer"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/integration"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/util"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -32,40 +30,36 @@ var listCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		activeFilters := viper.GetStringSlice("active_filters")
 		coreFilters, additionalFilters, integrationFilters := analyzer.ListFilters()
-		integration := integration.NewIntegration()
+
 		availableFilters := append(append(coreFilters, additionalFilters...), integrationFilters...)
 
 		if len(activeFilters) == 0 {
 			activeFilters = coreFilters
 		}
 		inactiveFilters := util.SliceDiff(availableFilters, activeFilters)
-		fmt.Print(color.YellowString("Active: \n"))
+		fmt.Printf(color.YellowString("Active: \n"))
 		for _, filter := range activeFilters {
+
 			// if the filter is an integration, mark this differently
-			// but if the integration is inactive, remove
-			if slices.Contains(integrationFilters, filter) {
+			if util.SliceContainsString(integrationFilters, filter) {
 				fmt.Printf("> %s\n", color.BlueString("%s (integration)", filter))
 			} else {
-				// This strange bit of logic will loop through every integration via
-				// OwnsAnalyzer subcommand to check the filter and as the integrationFilters...
-				// was no match, we know this isn't part of an active integration
-				if _, err := integration.AnalyzerByIntegration(filter); err != nil {
-					fmt.Printf("> %s\n", color.GreenString(filter))
-				}
+				fmt.Printf("> %s\n", color.GreenString(filter))
 			}
 		}
 
 		// display inactive filters
 		if len(inactiveFilters) != 0 {
-			fmt.Print(color.YellowString("Unused: \n"))
+			fmt.Printf(color.YellowString("Unused: \n"))
 			for _, filter := range inactiveFilters {
 				// if the filter is an integration, mark this differently
-				if slices.Contains(integrationFilters, filter) {
+				if util.SliceContainsString(integrationFilters, filter) {
 					fmt.Printf("> %s\n", color.BlueString("%s (integration)", filter))
 				} else {
 					fmt.Printf("> %s\n", color.RedString(filter))
 				}
 			}
 		}
+
 	},
 }

cmd/generate/generate.go

@@ -15,17 +15,15 @@ package generate
 
 import (
 	"fmt"
-	"os/exec"
-	"runtime"
-
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"os/exec"
+	"runtime"
 )
 
 var (
-	backend     string
-	backendType string
+	backend string
 )
 
 // generateCmd represents the auth command
@@ -35,7 +33,7 @@ var GenerateCmd = &cobra.Command{
 	Long:  `Opens your browser to generate a key for your chosen backend.`,
 	Run: func(cmd *cobra.Command, args []string) {
 
-		backendType = viper.GetString("backend_type")
+		backendType := viper.GetString("backend_type")
 		if backendType == "" {
 			// Set the default backend
 			backend = "openai"
@@ -45,7 +43,7 @@ var GenerateCmd = &cobra.Command{
 			backendType = backend
 		}
 		fmt.Println("")
-		openbrowser("https://platform.openai.com/api-keys")
+		openbrowser("https://beta.openai.com/account/api-keys")
 	},
 }
 
@@ -81,12 +79,12 @@ func openbrowser(url string) {
 func printInstructions(isGui bool, backendType string) {
 	fmt.Println("")
 	if isGui {
-		color.Green("Opening: https://platform.openai.com/api-keys to generate a key for %s", backendType)
+		color.Green("Opening: https://beta.openai.com/account/api-keys to generate a key for %s", backendType)
 		fmt.Println("")
 	} else {
-		color.Green("Please open: https://platform.openai.com/api-keys to generate a key for %s", backendType)
+		color.Green("Please open: https://beta.openai.com/account/api-keys to generate a key for %s", backendType)
 		fmt.Println("")
 	}
-	color.Green("Please copy the generated key and run `k8sgpt auth add` to add it to your config file")
+	color.Green("Please copy the generated key and run `k8sgpt auth` to add it to your config file")
 	fmt.Println("")
 }

cmd/integration/activate.go

@@ -15,14 +15,10 @@ package integration
 
 import (
 	"github.com/fatih/color"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/analyzer"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/integration"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
-var skipInstall bool
-
 // activateCmd represents the activate command
 var activateCmd = &cobra.Command{
 	Use:   "activate [integration]",
@@ -31,17 +27,10 @@ var activateCmd = &cobra.Command{
 	Args:  cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		integrationName := args[0]
-		coreFilters, _, _ := analyzer.ListFilters()
-
-		// Update filters
-		activeFilters := viper.GetStringSlice("active_filters")
-		if len(activeFilters) == 0 {
-			activeFilters = coreFilters
-		}
 
 		integration := integration.NewIntegration()
 		// Check if the integation exists
-		err := integration.Activate(integrationName, namespace, activeFilters, skipInstall)
+		err := integration.Activate(integrationName, namespace)
 		if err != nil {
 			color.Red("Error: %v", err)
 			return
@@ -53,5 +42,5 @@ var activateCmd = &cobra.Command{
 
 func init() {
 	IntegrationCmd.AddCommand(activateCmd)
-	activateCmd.Flags().BoolVarP(&skipInstall, "no-install", "s", false, "Only activate the integration filter without installing the filter (for example, if that filter plugin is already deployed in cluster, we do not need to re-install it again)")
+
 }

cmd/integration/deactivate.go

@@ -24,7 +24,7 @@ var deactivateCmd = &cobra.Command{
 	Use:   "deactivate [integration]",
 	Short: "Deactivate an integration",
 	Args:  cobra.ExactArgs(1),
-	Long:  `For example e.g. k8sgpt integration deactivate prometheus`,
+	Long:  `For example e.g. k8sgpt integration deactivate trivy`,
 	Run: func(cmd *cobra.Command, args []string) {
 		integrationName := args[0]
 

cmd/integration/integration.go

@@ -25,14 +25,14 @@ var (
 var IntegrationCmd = &cobra.Command{
 	Use:     "integration",
 	Aliases: []string{"integrations"},
-	Short:   "Integrate another tool into K8sGPT",
-	Long: `Integrate another tool into K8sGPT. For example:
+	Short:   "Intergrate another tool into K8sGPT",
+	Long: `Intergrate another tool into K8sGPT. For example:
 	
-	k8sgpt integration activate prometheus
+	k8sgpt integration activate trivy
 	
-	This would allow you to connect to prometheus running with your cluster.`,
+	This would allow you to deploy trivy into your cluster and use a K8sGPT analyzer to parse trivy results.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		_ = cmd.Help()
+		cmd.Help()
 	},
 }
 

cmd/root.go

@@ -19,11 +19,9 @@ import (
 	"path/filepath"
 
 	"github.com/adrg/xdg"
+	"github.com/fatih/color"
 	"github.com/k8sgpt-ai/k8sgpt/cmd/analyze"
 	"github.com/k8sgpt-ai/k8sgpt/cmd/auth"
-	"github.com/k8sgpt-ai/k8sgpt/cmd/cache"
-	customanalyzer "github.com/k8sgpt-ai/k8sgpt/cmd/customAnalyzer"
-	"github.com/k8sgpt-ai/k8sgpt/cmd/dump"
 	"github.com/k8sgpt-ai/k8sgpt/cmd/filters"
 	"github.com/k8sgpt-ai/k8sgpt/cmd/generate"
 	"github.com/k8sgpt-ai/k8sgpt/cmd/integration"
@@ -37,9 +35,7 @@ var (
 	cfgFile     string
 	kubecontext string
 	kubeconfig  string
-	Version     string
-	Commit      string
-	Date        string
+	version     string
 )
 
 // rootCmd represents the base command when called without any subcommands
@@ -54,13 +50,8 @@ var rootCmd = &cobra.Command{
 
 // Execute adds all child commands to the root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the rootCmd.
-func Execute(v string, c string, d string) {
-	Version = v
-	Commit = c
-	Date = d
-	viper.Set("Version", Version)
-	viper.Set("Commit", Commit)
-	viper.Set("Date", Date)
+func Execute(v string) {
+	version = v
 	err := rootCmd.Execute()
 	if err != nil {
 		os.Exit(1)
@@ -74,14 +65,11 @@ func init() {
 
 	rootCmd.AddCommand(auth.AuthCmd)
 	rootCmd.AddCommand(analyze.AnalyzeCmd)
-	rootCmd.AddCommand(dump.DumpCmd)
 	rootCmd.AddCommand(filters.FiltersCmd)
 	rootCmd.AddCommand(generate.GenerateCmd)
 	rootCmd.AddCommand(integration.IntegrationCmd)
 	rootCmd.AddCommand(serve.ServeCmd)
-	rootCmd.AddCommand(cache.CacheCmd)
-	rootCmd.AddCommand(customanalyzer.CustomAnalyzerCmd)
-	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", fmt.Sprintf("Default config file (%s/k8sgpt/k8sgpt.yaml)", xdg.ConfigHome))
+	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.k8sgpt.yaml)")
 	rootCmd.PersistentFlags().StringVar(&kubecontext, "kubecontext", "", "Kubernetes context to use. Only required if out-of-cluster.")
 	rootCmd.PersistentFlags().StringVar(&kubeconfig, "kubeconfig", "", "Path to a kubeconfig. Only required if out-of-cluster.")
 }
@@ -99,7 +87,7 @@ func initConfig() {
 		viper.SetConfigType("yaml")
 		viper.SetConfigName("k8sgpt")
 
-		_ = viper.SafeWriteConfig()
+		viper.SafeWriteConfig()
 	}
 
 	viper.Set("kubecontext", kubecontext)
@@ -110,7 +98,6 @@ func initConfig() {
 
 	// If a config file is found, read it in.
 	if err := viper.ReadInConfig(); err == nil {
-		_ = 1
 		//	fmt.Fprintln(os.Stderr, "Using config file:", viper.ConfigFileUsed())
 	}
 }
@@ -129,7 +116,14 @@ func performConfigMigrationIfNeeded() {
 	err = util.EnsureDirExists(configDir)
 	cobra.CheckErr(err)
 
+	if oldConfigExists && newConfigExists {
+		fmt.Fprintln(os.Stderr, color.RedString("Warning: Legacy config file at `%s` detected! This file will be ignored!", oldConfig))
+		return
+	}
+
 	if oldConfigExists && !newConfigExists {
+		fmt.Fprintln(os.Stderr, color.RedString("Performing config file migration from `%s` to `%s`", oldConfig, newConfig))
+
 		err = os.Rename(oldConfig, newConfig)
 		cobra.CheckErr(err)
 	}

cmd/serve/serve.go

@@ -15,29 +15,17 @@ package serve
 
 import (
 	"os"
-	"strconv"
-
-	k8sgptserver "github.com/k8sgpt-ai/k8sgpt/pkg/server"
 
 	"github.com/fatih/color"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/ai"
+	k8sgptserver "github.com/k8sgpt-ai/k8sgpt/pkg/server"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"go.uber.org/zap"
-)
-
-const (
-	defaultTemperature float32 = 0.7
-	defaultTopP        float32 = 1.0
-	defaultTopK        int32   = 50
-	defaultMaxTokens   int     = 2048
 )
 
 var (
-	port        string
-	metricsPort string
-	backend     string
-	enableHttp  bool
+	port    string
+	backend string
 )
 
 var ServeCmd = &cobra.Command{
@@ -54,91 +42,22 @@ var ServeCmd = &cobra.Command{
 		}
 		var aiProvider *ai.AIProvider
 		if len(configAI.Providers) == 0 {
-			// we validate and set temperature for our backend
-			temperature := func() float32 {
-				env := os.Getenv("K8SGPT_TEMPERATURE")
-				if env == "" {
-					return defaultTemperature
-				}
-				temperature, err := strconv.ParseFloat(env, 32)
-				if err != nil {
-					color.Red("Unable to convert Temperature value: %v", err)
-					os.Exit(1)
-				}
-				if temperature > 1.0 || temperature < 0.0 {
-					color.Red("Error: temperature ranges from 0 to 1.")
-					os.Exit(1)
-				}
-				return float32(temperature)
-			}
-			topP := func() float32 {
-				env := os.Getenv("K8SGPT_TOP_P")
-				if env == "" {
-					return defaultTopP
-				}
-				topP, err := strconv.ParseFloat(env, 32)
-				if err != nil {
-					color.Red("Unable to convert topP value: %v", err)
-					os.Exit(1)
-				}
-				if topP > 1.0 || topP < 0.0 {
-					color.Red("Error: topP ranges from 0 to 1.")
-					os.Exit(1)
-				}
-				return float32(topP)
-			}
-			topK := func() int32 {
-				env := os.Getenv("K8SGPT_TOP_K")
-				if env == "" {
-					return defaultTopK
-				}
-				topK, err := strconv.ParseFloat(env, 32)
-				if err != nil {
-					color.Red("Unable to convert topK value: %v", err)
-					os.Exit(1)
-				}
-				if topK < 10 || topK > 100 {
-					color.Red("Error: topK ranges from 1 to 100.")
-					os.Exit(1)
-				}
-				return int32(topK)
-			}
-			maxTokens := func() int {
-				env := os.Getenv("K8SGPT_MAX_TOKENS")
-				if env == "" {
-					return defaultMaxTokens
-				}
-				maxTokens, err := strconv.ParseInt(env, 10, 32)
-				if err != nil {
-					color.Red("Unable to convert maxTokens value: %v", err)
-					os.Exit(1)
-				}
-				return int(maxTokens)
-			}
 			// Check for env injection
 			backend = os.Getenv("K8SGPT_BACKEND")
 			password := os.Getenv("K8SGPT_PASSWORD")
 			model := os.Getenv("K8SGPT_MODEL")
 			baseURL := os.Getenv("K8SGPT_BASEURL")
-			engine := os.Getenv("K8SGPT_ENGINE")
-			proxyEndpoint := os.Getenv("K8SGPT_PROXY_ENDPOINT")
-			providerId := os.Getenv("K8SGPT_PROVIDER_ID")
+
 			// If the envs are set, allocate in place to the aiProvider
 			// else exit with error
-			envIsSet := backend != "" || password != "" || model != ""
+			envIsSet := backend != "" || password != "" || model != "" || baseURL != ""
+
 			if envIsSet {
 				aiProvider = &ai.AIProvider{
-					Name:          backend,
-					Password:      password,
-					Model:         model,
-					BaseURL:       baseURL,
-					Engine:        engine,
-					ProxyEndpoint: proxyEndpoint,
-					ProviderId:    providerId,
-					Temperature:   temperature(),
-					TopP:          topP(),
-					TopK:          topK(),
-					MaxTokens:     maxTokens(),
+					Name:     backend,
+					Password: password,
+					Model:    model,
+					BaseURL:  baseURL,
 				}
 
 				configAI.Providers = append(configAI.Providers, *aiProvider)
@@ -156,64 +75,38 @@ var ServeCmd = &cobra.Command{
 		if aiProvider == nil {
 			for _, provider := range configAI.Providers {
 				if backend == provider.Name {
-					// the pointer to the range variable is not really an issue here, as there
-					// is a break right after, but to prevent potential future issues, a temp
-					// variable is assigned
-					p := provider
+          // he pointer to the range variable is not really an issue here, as there
+          // is a break right after, but to prevent potential future issues, a temp
+          // variable is assigned
+          p := provider
 					aiProvider = &p
 					break
 				}
 			}
 		}
 
-		if aiProvider == nil || aiProvider.Name == "" {
+		if aiProvider.Name == "" {
 			color.Red("Error: AI provider %s not specified in configuration. Please run k8sgpt auth", backend)
 			os.Exit(1)
 		}
 
-		logger, err := zap.NewProduction()
+		server := k8sgptserver.Config{
+			Backend: aiProvider.Name,
+			Port:    port,
+			Token:   aiProvider.Password,
+		}
+
+		err = server.Serve()
 		if err != nil {
-			color.Red("failed to create logger: %v", err)
+			color.Red("Error: %v", err)
 			os.Exit(1)
 		}
-		defer func() {
-			if err := logger.Sync(); err != nil {
-				color.Red("failed to sync logger: %v", err)
-				os.Exit(1)
-			}
-		}()
-
-		server := k8sgptserver.Config{
-			Backend:     aiProvider.Name,
-			Port:        port,
-			MetricsPort: metricsPort,
-			EnableHttp:  enableHttp,
-			Token:       aiProvider.Password,
-			Logger:      logger,
-		}
-		go func() {
-			if err := server.ServeMetrics(); err != nil {
-				color.Red("Error: %v", err)
-				os.Exit(1)
-			}
-		}()
-
-		go func() {
-			if err := server.Serve(); err != nil {
-				color.Red("Error: %v", err)
-				os.Exit(1)
-			}
-		}()
-
-		// Wait for both servers to exit
-		select {}
+		// override the default backend if a flag is provided
 	},
 }
 
 func init() {
 	// add flag for backend
 	ServeCmd.Flags().StringVarP(&port, "port", "p", "8080", "Port to run the server on")
-	ServeCmd.Flags().StringVarP(&metricsPort, "metrics-port", "", "8081", "Port to run the metrics-server on")
 	ServeCmd.Flags().StringVarP(&backend, "backend", "b", "openai", "Backend AI provider")
-	ServeCmd.Flags().BoolVarP(&enableHttp, "http", "", false, "Enable REST/http using gppc-gateway")
 }

cmd/version.go

@@ -14,9 +14,6 @@ limitations under the License.
 package cmd
 
 import (
-	"fmt"
-	"runtime/debug"
-
 	"github.com/spf13/cobra"
 )
 
@@ -26,21 +23,7 @@ var versionCmd = &cobra.Command{
 	Short: "Print the version number of k8sgpt",
 	Long:  `All software has versions. This is k8sgpt's`,
 	Run: func(cmd *cobra.Command, args []string) {
-		if Version == "dev" {
-			details, ok := debug.ReadBuildInfo()
-			if ok && details.Main.Version != "" && details.Main.Version != "(devel)" {
-				Version = details.Main.Version
-				for _, i := range details.Settings {
-					if i.Key == "vcs.time" {
-						Date = i.Value
-					}
-					if i.Key == "vcs.revision" {
-						Commit = i.Value
-					}
-				}
-			}
-		}
-		fmt.Printf("k8sgpt: %s (%s), built at: %s\n", Version, Commit, Date)
+		cmd.Printf("k8sgpt version %s\n", version)
 	},
 }
 

container/Dockerfile

@@ -9,12 +9,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.23-alpine3.19 AS builder
+FROM golang:1.20.3-alpine3.16 AS builder
 
 ENV CGO_ENABLED=0
-ARG VERSION
-ARG COMMIT
-ARG DATE
+
 WORKDIR /workspace
 
 COPY go.mod go.sum ./
@@ -22,7 +20,7 @@ RUN go mod download
 
 COPY ./ ./
 
-RUN go build -o /workspace/k8sgpt -ldflags "-X main.version=${VERSION} -X main.commit=${COMMIT} -X main.date=${DATE}" ./ 
+RUN go build -o /workspace/k8sgpt ./
 
 FROM gcr.io/distroless/static AS production
 
@@ -36,4 +34,4 @@ WORKDIR /
 COPY --from=builder /workspace/k8sgpt .
 USER 65532:65532
 
-ENTRYPOINT ["/k8sgpt"]
+ENTRYPOINT ["/k8sgpt"]

container/dashboards/k8sgpt-dashboard.json

@@ -47,7 +47,7 @@
                     "showLineNumbers": false,
                     "showMiniMap": false
                 },
-                "content": "![K8sGPT Logo](https://k8sgpt.ai/images/logo-black.png)",
+                "content": "![K8sGPT Logo](https://k8sgpt.ai/images/logo-white.png)",
                 "mode": "markdown"
             },
             "pluginVersion": "9.4.7",

container/manifests/deployment.yaml

@@ -0,0 +1,42 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: k8sgpt-deployment
+  namespace: k8sgpt
+  labels:
+    app: k8sgpt
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: k8sgpt
+  template:
+    metadata:
+      labels:
+        app: k8sgpt
+    spec:
+      serviceAccountName: k8sgpt
+      containers:
+      - name: k8sgpt-container
+        imagePullPolicy: Always
+        image: ghcr.io/k8sgpt-ai/k8sgpt:v0.2.8 #x-release-please-version
+        ports:
+        - containerPort: 8080
+        args: ["serve"]
+        resources:
+          limits:
+            cpu: "1"
+            memory: "512Mi"
+          requests:
+            cpu: "0.2"
+            memory: "156Mi"
+        env:
+        - name: K8SGPT_MODEL
+          value: "gpt-3.5-turbo"
+        - name: K8SGPT_BACKEND
+          value: "openai"
+        - name: K8SGPT_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: ai-backend-secret
+              key: secret-key

container/manifests/role.yaml

@@ -1,10 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "k8sgpt.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
-  labels:
-    {{- include "k8sgpt.labels" . | nindent 4 }}
+  name: k8sgpt-cluster-role-all
 rules:
 - apiGroups:
   - '*'

container/manifests/rolebinding.yaml

@@ -0,0 +1,13 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: k8sgpt-rolebinding
+  namespace: k8sgpt
+subjects:
+- kind: ServiceAccount
+  name: k8sgpt
+  namespace: k8sgpt
+roleRef:
+  kind: ClusterRole
+  name: k8sgpt-cluster-role-all
+  apiGroup: rbac.authorization.k8s.io

container/manifests/sa.yaml

@@ -0,0 +1,5 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: k8sgpt
+  namespace: k8sgpt

container/manifests/service.yaml

@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: k8sgpt-service
+  namespace: k8sgpt
+  labels:
+     app: k8sgpt
+spec:
+  selector:
+    app: k8sgpt
+  ports:
+    - name: http
+      port: 8080
+      targetPort: 8080
+  type: ClusterIP

container/manifests/serviceMonitor.yaml

@@ -0,0 +1,15 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  labels:
+    app: k8sgpt
+  name: k8sgpt-service-monitor
+  namespace: k8sgpt
+spec:
+  endpoints:
+  - honorLabels: true
+    path: /metrics
+    port: http
+  selector:
+    matchLabels:
+      app: k8sgpt

go.mod

@@ -1,277 +1,183 @@
 module github.com/k8sgpt-ai/k8sgpt
 
-go 1.23.3
+go 1.20
 
 require (
-	github.com/fatih/color v1.18.0
-	github.com/kedacore/keda/v2 v2.16.0
-	github.com/magiconair/properties v1.8.9
-	github.com/mittwald/go-helm-client v0.12.14
-	github.com/ollama/ollama v0.5.1
-	github.com/sashabaranov/go-openai v1.36.0
-	github.com/schollz/progressbar/v3 v3.17.1
-	github.com/spf13/cobra v1.8.1
-	github.com/spf13/viper v1.19.0
-	github.com/stretchr/testify v1.10.0
-	golang.org/x/term v0.29.0
-	helm.sh/helm/v3 v3.16.3
-	k8s.io/api v0.31.3
-	k8s.io/apimachinery v0.31.3
-	k8s.io/client-go v0.31.3
-	k8s.io/kubectl v0.31.1 // indirect
+	github.com/aquasecurity/trivy-operator v0.13.1
+	github.com/fatih/color v1.15.0
+	github.com/magiconair/properties v1.8.7
+	github.com/mittwald/go-helm-client v0.12.1
+	github.com/sashabaranov/go-openai v1.9.0
+	github.com/schollz/progressbar/v3 v3.13.1
+	github.com/spf13/cobra v1.7.0
+	github.com/spf13/viper v1.15.0
+	github.com/stretchr/testify v1.8.2
+	golang.org/x/term v0.7.0
+	helm.sh/helm/v3 v3.11.3
+	k8s.io/api v0.26.3
+	k8s.io/apimachinery v0.26.3
+	k8s.io/client-go v0.26.3
+	k8s.io/kubectl v0.26.3
 
 )
 
-require github.com/adrg/xdg v0.5.3
+require github.com/adrg/xdg v0.4.0
 
 require (
-	buf.build/gen/go/interplex-ai/schemas/grpc/go v1.5.1-20241117203254-a91193b62179.1
-	buf.build/gen/go/interplex-ai/schemas/protocolbuffers/go v1.35.2-20241117203254-a91193b62179.1
-	buf.build/gen/go/k8sgpt-ai/k8sgpt/grpc-ecosystem/gateway/v2 v2.24.0-20241118152629-1379a5a1889d.1
-	buf.build/gen/go/k8sgpt-ai/k8sgpt/grpc/go v1.5.1-20241118152629-1379a5a1889d.1
-	buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go v1.35.2-20241118152629-1379a5a1889d.1
-	cloud.google.com/go/storage v1.48.0
-	cloud.google.com/go/vertexai v0.13.2
-	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.1
-	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.5.0
-	github.com/IBM/watsonx-go v1.0.1
-	github.com/aws/aws-sdk-go v1.55.6
-	github.com/cohere-ai/cohere-go/v2 v2.12.2
-	github.com/go-logr/zapr v1.3.0
-	github.com/google/generative-ai-go v0.19.0
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1
-	github.com/hupe1980/go-huggingface v0.0.15
-	github.com/kyverno/policy-reporter-kyverno-plugin v1.6.4
-	github.com/olekukonko/tablewriter v0.0.5
-	github.com/oracle/oci-go-sdk/v65 v65.79.0
-	github.com/prometheus/prometheus v0.302.1
-	github.com/pterm/pterm v0.12.80
-	google.golang.org/api v0.218.0
-	gopkg.in/yaml.v2 v2.4.0
-	sigs.k8s.io/controller-runtime v0.19.3
-	sigs.k8s.io/gateway-api v1.2.1
-)
-
-require (
-	atomicgo.dev/cursor v0.2.0 // indirect
-	atomicgo.dev/keyboard v0.2.9 // indirect
-	atomicgo.dev/schedule v0.1.0 // indirect
-	cel.dev/expr v0.19.0 // indirect
-	cloud.google.com/go v0.116.0 // indirect
-	cloud.google.com/go/ai v0.8.0 // indirect
-	cloud.google.com/go/aiplatform v1.69.0 // indirect
-	cloud.google.com/go/auth v0.14.0 // indirect
-	cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
-	cloud.google.com/go/compute/metadata v0.6.0 // indirect
-	cloud.google.com/go/iam v1.2.2 // indirect
-	cloud.google.com/go/longrunning v0.6.2 // indirect
-	cloud.google.com/go/monitoring v1.21.2 // indirect
-	dario.cat/mergo v1.0.1 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
-	github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect
-	github.com/Microsoft/hcsshim v0.12.4 // indirect
-	github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
-	github.com/aws/aws-sdk-go-v2 v1.32.3 // indirect
-	github.com/aws/smithy-go v1.22.0 // indirect
-	github.com/blang/semver/v4 v4.0.0 // indirect
-	github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
-	github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
-	github.com/containerd/console v1.0.4 // indirect
-	github.com/containerd/continuity v0.4.3 // indirect
-	github.com/containerd/errdefs v0.3.0 // indirect
-	github.com/containerd/log v0.1.0 // indirect
-	github.com/containerd/platforms v0.2.1 // indirect
-	github.com/creack/pty v1.1.21 // indirect
-	github.com/distribution/reference v0.6.0 // indirect
-	github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
-	github.com/envoyproxy/go-control-plane v0.13.1 // indirect
-	github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
-	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
-	github.com/expr-lang/expr v1.16.9 // indirect
-	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
-	github.com/gofrs/flock v0.12.1 // indirect
-	github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
-	github.com/google/s2a-go v0.1.9 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
-	github.com/googleapis/gax-go/v2 v2.14.1 // indirect
-	github.com/gookit/color v1.5.4 // indirect
-	github.com/gorilla/websocket v1.5.1 // indirect
-	github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
-	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/jpillora/backoff v1.0.0 // indirect
-	github.com/kylelemons/godebug v1.1.0 // indirect
-	github.com/lithammer/fuzzysearch v1.1.8 // indirect
-	github.com/moby/sys/mountinfo v0.7.1 // indirect
-	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
-	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
-	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
-	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
-	github.com/prometheus/sigv4 v0.1.1 // indirect
-	github.com/sagikazarmark/locafero v0.6.0 // indirect
-	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
-	github.com/segmentio/fasthash v1.0.3 // indirect
-	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
-	github.com/sony/gobreaker v0.5.0 // indirect
-	github.com/sourcegraph/conc v0.3.0 // indirect
-	github.com/x448/float16 v0.8.4 // indirect
-	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
-	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/contrib/detectors/gcp v1.32.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
-	go.opentelemetry.io/otel/metric v1.34.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.34.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
-	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
-	google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
-	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	knative.dev/pkg v0.0.0-20241026180704-25f6002b00f3 // indirect
-)
-
-require (
-	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
-	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
-	github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
+	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 // indirect
+	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
+	github.com/BurntSushi/toml v1.2.1 // indirect
 	github.com/MakeNowJust/heredoc v1.0.0 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
-	github.com/Masterminds/semver/v3 v3.3.0 // indirect
-	github.com/Masterminds/sprig/v3 v3.3.0 // indirect
-	github.com/Masterminds/squirrel v1.5.4 // indirect
+	github.com/Masterminds/semver/v3 v3.2.0 // indirect
+	github.com/Masterminds/sprig/v3 v3.2.3 // indirect
+	github.com/Masterminds/squirrel v1.5.3 // indirect
+	github.com/aquasecurity/defsec v0.86.0 // indirect
+	github.com/aquasecurity/go-dep-parser v0.0.0-20230413091456-df0396537e15 // indirect
+	github.com/aquasecurity/table v1.8.0 // indirect
+	github.com/aquasecurity/tml v0.6.1 // indirect
+	github.com/aquasecurity/trivy v0.40.0 // indirect
+	github.com/aquasecurity/trivy-db v0.0.0-20230411140759-3c2ee2168575 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/chai2010/gettext-go v1.0.3 // indirect
-	github.com/containerd/containerd v1.7.23 // indirect
-	github.com/cyphar/filepath-securejoin v0.3.4 // indirect
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/docker/cli v26.1.4+incompatible // indirect
-	github.com/docker/distribution v2.8.3+incompatible // indirect
-	github.com/docker/docker v27.4.1+incompatible // indirect
-	github.com/docker/docker-credential-helpers v0.8.2 // indirect
-	github.com/docker/go-connections v0.5.0 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/chai2010/gettext-go v1.0.2 // indirect
+	github.com/containerd/containerd v1.7.0 // indirect
+	github.com/cyphar/filepath-securejoin v0.2.3 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/docker/cli v23.0.1+incompatible // indirect
+	github.com/docker/distribution v2.8.1+incompatible // indirect
+	github.com/docker/docker v23.0.3+incompatible // indirect
+	github.com/docker/docker-credential-helpers v0.7.0 // indirect
+	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
-	github.com/evanphx/json-patch v5.9.0+incompatible // indirect
+	github.com/docker/go-units v0.5.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.10.2 // indirect
+	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
-	github.com/fsnotify/fsnotify v1.8.0 // indirect
-	github.com/go-errors/errors v1.5.1 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/go-errors/errors v1.4.2 // indirect
 	github.com/go-gorp/gorp/v3 v3.1.0 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-openapi/jsonpointer v0.21.0 // indirect
-	github.com/go-openapi/jsonreference v0.21.0 // indirect
-	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonreference v0.20.2 // indirect
+	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/btree v1.1.2 // indirect
-	github.com/google/gnostic v0.7.0
-	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/gnostic v0.6.9 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/go-containerregistry v0.14.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
-	github.com/google/uuid v1.6.0 // indirect
-	github.com/gorilla/mux v1.8.1 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/gosuri/uitable v0.0.4 // indirect
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/huandu/xstrings v1.5.0 // indirect
-	github.com/imdario/mergo v0.3.16 // indirect
+	github.com/huandu/xstrings v1.4.0 // indirect
+	github.com/imdario/mergo v0.3.15 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/jmoiron/sqlx v1.4.0 // indirect
+	github.com/jmoiron/sqlx v1.3.5 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/klauspost/compress v1.16.0 // indirect
 	github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
 	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
-	github.com/lib/pq v1.10.9 // indirect
+	github.com/lib/pq v1.10.7 // indirect
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/masahiro331/go-xfs-filesystem v0.0.0-20221225060805-c02764233454 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-runewidth v0.0.16 // indirect
+	github.com/mattn/go-isatty v0.0.18 // indirect
+	github.com/mattn/go-runewidth v0.0.14 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/moby/locker v1.0.1 // indirect
-	github.com/moby/spdystream v0.4.0 // indirect
-	github.com/moby/term v0.5.0 // indirect
+	github.com/moby/spdystream v0.2.0 // indirect
+	github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
+	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
+	github.com/opencontainers/image-spec v1.1.0-rc2.0.20221020182949-4df8887994e8 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.7 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/client_golang v1.21.0-rc.0
-	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.62.0 // indirect
-	github.com/prometheus/procfs v0.15.1 // indirect
-	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/prometheus/client_golang v1.15.0
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/common v0.42.0 // indirect
+	github.com/prometheus/procfs v0.9.0 // indirect
+	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/rubenv/sql-migrate v1.7.0 // indirect
+	github.com/rubenv/sql-migrate v1.3.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/shopspring/decimal v1.4.0 // indirect
-	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/spf13/afero v1.11.0 // indirect
-	github.com/spf13/cast v1.7.0 // indirect
+	github.com/samber/lo v1.37.0 // indirect
+	github.com/shopspring/decimal v1.3.1 // indirect
+	github.com/sirupsen/logrus v1.9.0 // indirect
+	github.com/spdx/tools-golang v0.5.0 // indirect
+	github.com/spf13/afero v1.9.5 // indirect
+	github.com/spf13/cast v1.5.0 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/subosito/gotenv v1.6.0 // indirect
+	github.com/subosito/gotenv v1.4.2 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
-	github.com/xlab/treeprint v1.2.0 // indirect
-	go.opentelemetry.io/otel v1.34.0 // indirect
-	go.opentelemetry.io/otel/trace v1.34.0 // indirect
+	github.com/xlab/treeprint v1.1.0 // indirect
+	go.opentelemetry.io/otel v1.14.0 // indirect
+	go.opentelemetry.io/otel/trace v1.14.0 // indirect
+	go.starlark.net v0.0.0-20221020143700-22309ac47eac // indirect
+	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	go.uber.org/zap v1.27.0
-	golang.org/x/crypto v0.35.0 // indirect
-	golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect
-	golang.org/x/net v0.36.0
-	golang.org/x/oauth2 v0.25.0 // indirect
-	golang.org/x/sync v0.11.0 // indirect
-	golang.org/x/sys v0.30.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
-	golang.org/x/time v0.9.0 // indirect
-	google.golang.org/grpc v1.70.0
-	google.golang.org/protobuf v1.36.4 // indirect
+	go.uber.org/zap v1.24.0
+	golang.org/x/crypto v0.7.0 // indirect
+	golang.org/x/exp v0.0.0-20230124195608-d38c7dcee874 // indirect
+	golang.org/x/net v0.9.0 // indirect
+	golang.org/x/oauth2 v0.6.0 // indirect
+	golang.org/x/sync v0.1.0 // indirect
+	golang.org/x/sys v0.7.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
+	google.golang.org/grpc v1.54.0 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
-	k8s.io/apiextensions-apiserver v0.31.3
-	k8s.io/apiserver v0.31.3 // indirect
-	k8s.io/cli-runtime v0.31.1 // indirect
-	k8s.io/component-base v0.31.3 // indirect
-	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20241009091222-67ed5848f094 // indirect
-	k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e
-	oras.land/oras-go v1.2.5 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/apiextensions-apiserver v0.26.3 // indirect
+	k8s.io/apiserver v0.26.3 // indirect
+	k8s.io/cli-runtime v0.26.3 // indirect
+	k8s.io/component-base v0.26.3 // indirect
+	k8s.io/klog/v2 v2.90.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20230327201221-f5883ff37f0c // indirect
+	k8s.io/utils v0.0.0-20230313181309-38a27ef9d749 // indirect
+	oras.land/oras-go v1.2.2 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/kustomize/api v0.18.0 // indirect
-	sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
-	sigs.k8s.io/yaml v1.4.0 // indirect
+	sigs.k8s.io/kustomize/api v0.12.1 // indirect
+	sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
 )
 
 // v1.2.0 is taken from github.com/open-policy-agent/opa v0.42.0
 // v1.2.0 incompatible with github.com/docker/docker v23.0.0-rc.1+incompatible
-//replace oras.land/oras-go => oras.land/oras-go v1.2.4
-replace github.com/docker/docker => github.com/docker/docker v28.0.4+incompatible
+replace oras.land/oras-go => oras.land/oras-go v1.2.3
 
-replace dario.cat/mergo => github.com/imdario/mergo v1.0.1
+// v0.3.1-0.20230104082527-d6f58551be3f is taken from github.com/moby/buildkit v0.11.0
+// spdx logic write on v0.3.0 and incompatible with v0.3.1-0.20230104082527-d6f58551be3f
+replace github.com/spdx/tools-golang => github.com/spdx/tools-golang v0.3.0

main.go

@@ -15,12 +15,8 @@ package main
 
 import "github.com/k8sgpt-ai/k8sgpt/cmd"
 
-var (
-	version = "dev"
-	commit  = "HEAD"
-	date    = "unknown"
-)
+var version = "dev"
 
 func main() {
-	cmd.Execute(version, commit, date)
+	cmd.Execute(version)
 }

pkg/ai/amazonbedrock.go

@@ -1,330 +0,0 @@
-package ai
-
-import (
-	"context"
-	"errors"
-	"github.com/aws/aws-sdk-go/service/bedrockruntime/bedrockruntimeiface"
-	"os"
-
-	"github.com/k8sgpt-ai/k8sgpt/pkg/ai/bedrock_support"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/aws/aws-sdk-go/service/bedrockruntime"
-)
-
-const amazonbedrockAIClientName = "amazonbedrock"
-
-// AmazonBedRockClient represents the client for interacting with the AmazonCompletion Bedrock service.
-type AmazonBedRockClient struct {
-	nopCloser
-
-	client      bedrockruntimeiface.BedrockRuntimeAPI
-	model       *bedrock_support.BedrockModel
-	temperature float32
-	topP        float32
-	maxTokens   int
-}
-
-// AmazonCompletion BedRock support region list US East (N. Virginia),US West (Oregon),Asia Pacific (Singapore),Asia Pacific (Tokyo),Europe (Frankfurt)
-// https://docs.aws.amazon.com/bedrock/latest/userguide/what-is-bedrock.html#bedrock-regions
-const BEDROCK_DEFAULT_REGION = "us-east-1" // default use us-east-1 region
-
-const (
-	US_East_1      = "us-east-1"
-	US_West_2      = "us-west-2"
-	AP_Southeast_1 = "ap-southeast-1"
-	AP_Northeast_1 = "ap-northeast-1"
-	EU_Central_1   = "eu-central-1"
-	AP_South_1     = "ap-south-1"
-)
-
-var BEDROCKER_SUPPORTED_REGION = []string{
-	US_East_1,
-	US_West_2,
-	AP_Southeast_1,
-	AP_Northeast_1,
-	EU_Central_1,
-	AP_South_1,
-}
-
-var (
-	models = []bedrock_support.BedrockModel{
-		{
-			Name:       "anthropic.claude-3-5-sonnet-20240620-v1:0",
-			Completion: &bedrock_support.CohereMessagesCompletion{},
-			Response:   &bedrock_support.CohereMessagesResponse{},
-			Config: bedrock_support.BedrockModelConfig{
-				// sensible defaults
-				MaxTokens:   100,
-				Temperature: 0.5,
-				TopP:        0.9,
-				ModelName:   "anthropic.claude-3-5-sonnet-20240620-v1:0",
-			},
-		},
-		{
-			Name:       "us.anthropic.claude-3-5-sonnet-20241022-v2:0",
-			Completion: &bedrock_support.CohereCompletion{},
-			Response:   &bedrock_support.CohereResponse{},
-			Config: bedrock_support.BedrockModelConfig{
-				// sensible defaults
-				MaxTokens:   100,
-				Temperature: 0.5,
-				TopP:        0.9,
-				ModelName:   "us.anthropic.claude-3-5-sonnet-20241022-v2:0",
-			},
-		},
-		{
-			Name:       "anthropic.claude-v2",
-			Completion: &bedrock_support.CohereCompletion{},
-			Response:   &bedrock_support.CohereResponse{},
-			Config: bedrock_support.BedrockModelConfig{
-				// sensible defaults
-				MaxTokens:   100,
-				Temperature: 0.5,
-				TopP:        0.9,
-				ModelName:   "anthropic.claude-v2",
-			},
-		},
-		{
-			Name:       "anthropic.claude-v1",
-			Completion: &bedrock_support.CohereCompletion{},
-			Response:   &bedrock_support.CohereResponse{},
-			Config: bedrock_support.BedrockModelConfig{
-				// sensible defaults
-				MaxTokens:   100,
-				Temperature: 0.5,
-				TopP:        0.9,
-				ModelName:   "anthropic.claude-v1",
-			},
-		},
-		{
-			Name:       "anthropic.claude-instant-v1",
-			Completion: &bedrock_support.CohereCompletion{},
-			Response:   &bedrock_support.CohereResponse{},
-			Config: bedrock_support.BedrockModelConfig{
-				// sensible defaults
-				MaxTokens:   100,
-				Temperature: 0.5,
-				TopP:        0.9,
-				ModelName:   "anthropic.claude-instant-v1",
-			},
-		},
-		{
-			Name:       "ai21.j2-ultra-v1",
-			Completion: &bedrock_support.AI21{},
-			Response:   &bedrock_support.AI21Response{},
-			Config: bedrock_support.BedrockModelConfig{
-				// sensible defaults
-				MaxTokens:   100,
-				Temperature: 0.5,
-				TopP:        0.9,
-				ModelName:   "ai21.j2-ultra-v1",
-			},
-		},
-		{
-			Name:       "ai21.j2-jumbo-instruct",
-			Completion: &bedrock_support.AI21{},
-			Response:   &bedrock_support.AI21Response{},
-			Config: bedrock_support.BedrockModelConfig{
-				// sensible defaults
-				MaxTokens:   100,
-				Temperature: 0.5,
-				TopP:        0.9,
-				ModelName:   "ai21.j2-jumbo-instruct",
-			},
-		},
-		{
-			Name:       "amazon.titan-text-express-v1",
-			Completion: &bedrock_support.AmazonCompletion{},
-			Response:   &bedrock_support.AmazonResponse{},
-			Config: bedrock_support.BedrockModelConfig{
-				// sensible defaults
-				MaxTokens:   100,
-				Temperature: 0.5,
-				TopP:        0.9,
-				ModelName:   "amazon.titan-text-express-v1",
-			},
-		},
-		{
-			Name:       "amazon.nova-pro-v1:0",
-			Completion: &bedrock_support.AmazonCompletion{},
-			Response:   &bedrock_support.NovaResponse{},
-			Config: bedrock_support.BedrockModelConfig{
-				// sensible defaults
-				// https://docs.aws.amazon.com/nova/latest/userguide/getting-started-api.html
-				MaxTokens:   100, // max of 300k tokens
-				Temperature: 0.5,
-				TopP:        0.9,
-				ModelName:   "amazon.nova-pro-v1:0",
-			},
-		},
-		{
-			Name:       "eu.amazon.nova-pro-v1:0",
-			Completion: &bedrock_support.AmazonCompletion{},
-			Response:   &bedrock_support.NovaResponse{},
-			Config: bedrock_support.BedrockModelConfig{
-				// sensible defaults
-				// https://docs.aws.amazon.com/nova/latest/userguide/getting-started-api.html
-				MaxTokens:   100, // max of 300k tokens
-				Temperature: 0.5,
-				TopP:        0.9,
-				ModelName:   "eu.wamazon.nova-pro-v1:0",
-			},
-		},
-		{
-			Name:       "us.amazon.nova-pro-v1:0",
-			Completion: &bedrock_support.AmazonCompletion{},
-			Response:   &bedrock_support.NovaResponse{},
-			Config: bedrock_support.BedrockModelConfig{
-				// sensible defaults
-				// https://docs.aws.amazon.com/nova/latest/userguide/getting-started-api.html
-				MaxTokens:   100, // max of 300k tokens
-				Temperature: 0.5,
-				TopP:        0.9,
-				ModelName:   "us.amazon.nova-pro-v1:0",
-			},
-		},
-		{
-			Name:       "amazon.nova-lite-v1:0",
-			Completion: &bedrock_support.AmazonCompletion{},
-			Response:   &bedrock_support.NovaResponse{},
-			Config: bedrock_support.BedrockModelConfig{
-				// sensible defaults
-				MaxTokens:   100, // max of 300k tokens
-				Temperature: 0.5,
-				TopP:        0.9,
-				ModelName:   "amazon.nova-lite-v1:0",
-			},
-		},
-		{
-			Name:       "eu.amazon.nova-lite-v1:0",
-			Completion: &bedrock_support.AmazonCompletion{},
-			Response:   &bedrock_support.NovaResponse{},
-			Config: bedrock_support.BedrockModelConfig{
-				// sensible defaults
-				MaxTokens:   100, // max of 300k tokens
-				Temperature: 0.5,
-				TopP:        0.9,
-				ModelName:   "eu.amazon.nova-lite-v1:0",
-			},
-		},
-		{
-			Name:       "us.amazon.nova-lite-v1:0",
-			Completion: &bedrock_support.AmazonCompletion{},
-			Response:   &bedrock_support.NovaResponse{},
-			Config: bedrock_support.BedrockModelConfig{
-				// sensible defaults
-				MaxTokens:   100, // max of 300k tokens
-				Temperature: 0.5,
-				TopP:        0.9,
-				ModelName:   "us.amazon.nova-lite-v1:0",
-			},
-		},
-		{
-			Name:       "anthropic.claude-3-haiku-20240307-v1:0",
-			Completion: &bedrock_support.CohereCompletion{},
-			Response:   &bedrock_support.CohereResponse{},
-			Config: bedrock_support.BedrockModelConfig{
-				// sensible defaults
-				MaxTokens:   100,
-				Temperature: 0.5,
-				TopP:        0.9,
-			},
-		},
-	}
-)
-
-// GetModelOrDefault check config region
-func GetRegionOrDefault(region string) string {
-
-	if os.Getenv("AWS_DEFAULT_REGION") != "" {
-		region = os.Getenv("AWS_DEFAULT_REGION")
-	}
-	// Check if the provided model is in the list
-	for _, m := range BEDROCKER_SUPPORTED_REGION {
-		if m == region {
-			return region // Return the provided model
-		}
-	}
-
-	// Return the default model if the provided model is not in the list
-	return BEDROCK_DEFAULT_REGION
-}
-
-// Get model from string
-func (a *AmazonBedRockClient) getModelFromString(model string) (*bedrock_support.BedrockModel, error) {
-	for _, m := range models {
-		if model == m.Name {
-			return &m, nil
-		}
-	}
-	return nil, errors.New("model not found")
-}
-
-// Configure configures the AmazonBedRockClient with the provided configuration.
-func (a *AmazonBedRockClient) Configure(config IAIConfig) error {
-
-	// Create a new AWS session
-	providerRegion := GetRegionOrDefault(config.GetProviderRegion())
-
-	sess, err := session.NewSession(&aws.Config{
-		Region: aws.String(providerRegion),
-	})
-
-	if err != nil {
-		return err
-	}
-
-	foundModel, err := a.getModelFromString(config.GetModel())
-	if err != nil {
-		return err
-	}
-	// TODO: Override the completion config somehow
-
-	// Create a new BedrockRuntime client
-	a.client = bedrockruntime.New(sess)
-	a.model = foundModel
-	a.model.Config.ModelName = foundModel.Name
-	a.temperature = config.GetTemperature()
-	a.topP = config.GetTopP()
-	a.maxTokens = config.GetMaxTokens()
-
-	return nil
-}
-
-// GetCompletion sends a request to the model for generating completion based on the provided prompt.
-func (a *AmazonBedRockClient) GetCompletion(ctx context.Context, prompt string) (string, error) {
-
-	// override config defaults
-	a.model.Config.MaxTokens = a.maxTokens
-	a.model.Config.Temperature = a.temperature
-	a.model.Config.TopP = a.topP
-
-	body, err := a.model.Completion.GetCompletion(ctx, prompt, a.model.Config)
-	if err != nil {
-		return "", err
-	}
-	// Build the parameters for the model invocation
-	params := &bedrockruntime.InvokeModelInput{
-		Body:        body,
-		ModelId:     aws.String(a.model.Name),
-		ContentType: aws.String("application/json"),
-		Accept:      aws.String("application/json"),
-	}
-	// Invoke the model
-	resp, err := a.client.InvokeModelWithContext(ctx, params)
-
-	if err != nil {
-		return "", err
-	}
-
-	// Parse the response
-	return a.model.Response.ParseResponse(resp.Body)
-
-}
-
-// GetName returns the name of the AmazonBedRockClient.
-func (a *AmazonBedRockClient) GetName() string {
-	return amazonbedrockAIClientName
-}

pkg/ai/amazonsagemaker.go

@@ -1,141 +0,0 @@
-/*
-Copyright 2023 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package ai
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/aws/aws-sdk-go/service/sagemakerruntime"
-)
-
-const amazonsagemakerAIClientName = "amazonsagemaker"
-
-type SageMakerAIClient struct {
-	nopCloser
-
-	client      *sagemakerruntime.SageMakerRuntime
-	model       string
-	temperature float32
-	endpoint    string
-	topP        float32
-	topK        int32
-	maxTokens   int
-}
-
-type Generations []struct {
-	Generation struct {
-		Role    string `json:"role"`
-		Content string `json:"content"`
-	} `json:"generation"`
-}
-
-type Request struct {
-	Inputs     [][]Message `json:"inputs"`
-	Parameters Parameters  `json:"parameters"`
-}
-
-type Message struct {
-	Role    string `json:"role"`
-	Content string `json:"content"`
-}
-
-type Parameters struct {
-	MaxNewTokens int     `json:"max_new_tokens"`
-	TopP         float64 `json:"top_p"`
-	TopK         float64 `json:"top_k"`
-	Temperature  float64 `json:"temperature"`
-}
-
-func (c *SageMakerAIClient) Configure(config IAIConfig) error {
-
-	// Create a new AWS session
-	sess := session.Must(session.NewSessionWithOptions(session.Options{
-		Config:            aws.Config{Region: aws.String(config.GetProviderRegion())},
-		SharedConfigState: session.SharedConfigEnable,
-	}))
-
-	// Create a new SageMaker runtime client
-	c.client = sagemakerruntime.New(sess)
-	c.model = config.GetModel()
-	c.endpoint = config.GetEndpointName()
-	c.temperature = config.GetTemperature()
-	c.maxTokens = config.GetMaxTokens()
-	c.topP = config.GetTopP()
-	c.topK = config.GetTopK()
-	return nil
-}
-
-func (c *SageMakerAIClient) GetCompletion(_ context.Context, prompt string) (string, error) {
-	// Create a completion request
-	request := Request{
-		Inputs: [][]Message{
-			{
-				{Role: "system", Content: "DEFAULT_PROMPT"},
-				{Role: "user", Content: prompt},
-			},
-		},
-
-		Parameters: Parameters{
-			MaxNewTokens: int(c.maxTokens),
-			TopP:         float64(c.topP),
-			TopK:         float64(c.topK),
-			Temperature:  float64(c.temperature),
-		},
-	}
-
-	// Convert request to []byte
-	bytesData, err := json.Marshal(request)
-	if err != nil {
-		return "", err
-	}
-
-	// Create an input object
-	input := &sagemakerruntime.InvokeEndpointInput{
-		Body:             bytesData,
-		EndpointName:     aws.String(c.endpoint),
-		ContentType:      aws.String("application/json"), // Set the content type as per your model's requirements
-		Accept:           aws.String("application/json"), // Set the accept type as per your model's requirements
-		CustomAttributes: aws.String("accept_eula=true"),
-	}
-
-	// Call the InvokeEndpoint function
-	result, err := c.client.InvokeEndpoint(input)
-	if err != nil {
-		return "", err
-	}
-
-	// // Define a slice of Generations
-	var generations Generations
-
-	err = json.Unmarshal([]byte(string(result.Body)), &generations)
-	if err != nil {
-		return "", err
-	}
-	// Check for length of generations
-	if len(generations) != 1 {
-		return "", fmt.Errorf("Expected exactly one generation, but got %d", len(generations))
-	}
-
-	// Access the content
-	content := generations[0].Generation.Content
-	return content, nil
-}
-
-func (c *SageMakerAIClient) GetName() string {
-	return amazonsagemakerAIClientName
-}

pkg/ai/azureopenai.go

@@ -1,87 +0,0 @@
-package ai
-
-import (
-	"context"
-	"errors"
-	"net/http"
-	"net/url"
-
-	"github.com/sashabaranov/go-openai"
-)
-
-const azureAIClientName = "azureopenai"
-
-type AzureAIClient struct {
-	nopCloser
-
-	client      *openai.Client
-	model       string
-	temperature float32
-	// organizationId string
-}
-
-func (c *AzureAIClient) Configure(config IAIConfig) error {
-	token := config.GetPassword()
-	baseURL := config.GetBaseURL()
-	engine := config.GetEngine()
-	proxyEndpoint := config.GetProxyEndpoint()
-	defaultConfig := openai.DefaultAzureConfig(token, baseURL)
-	orgId := config.GetOrganizationId()
-
-	defaultConfig.AzureModelMapperFunc = func(model string) string {
-		// If you use a deployment name different from the model name, you can customize the AzureModelMapperFunc function
-		azureModelMapping := map[string]string{
-			model: engine,
-		}
-		return azureModelMapping[model]
-
-	}
-
-	if proxyEndpoint != "" {
-		proxyUrl, err := url.Parse(proxyEndpoint)
-		if err != nil {
-			return err
-		}
-		transport := &http.Transport{
-			Proxy: http.ProxyURL(proxyUrl),
-		}
-
-		defaultConfig.HTTPClient = &http.Client{
-			Transport: transport,
-		}
-	}
-	if orgId != "" {
-		defaultConfig.OrgID = orgId
-	}
-
-	client := openai.NewClientWithConfig(defaultConfig)
-	if client == nil {
-		return errors.New("error creating Azure OpenAI client")
-	}
-	c.client = client
-	c.model = config.GetModel()
-	c.temperature = config.GetTemperature()
-	return nil
-}
-
-func (c *AzureAIClient) GetCompletion(ctx context.Context, prompt string) (string, error) {
-	// Create a completion request
-	resp, err := c.client.CreateChatCompletion(ctx, openai.ChatCompletionRequest{
-		Model: c.model,
-		Messages: []openai.ChatCompletionMessage{
-			{
-				Role:    openai.ChatMessageRoleUser,
-				Content: prompt,
-			},
-		},
-		Temperature: c.temperature,
-	})
-	if err != nil {
-		return "", err
-	}
-	return resp.Choices[0].Message.Content, nil
-}
-
-func (c *AzureAIClient) GetName() string {
-	return azureAIClientName
-}

pkg/ai/bedrock_support/completions.go

@@ -1,152 +0,0 @@
-package bedrock_support
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"strings"
-)
-
-var SUPPPORTED_BEDROCK_MODELS = []string{
-	"anthropic.claude-3-5-sonnet-20240620-v1:0",
-	"us.anthropic.claude-3-5-sonnet-20241022-v2:0",
-	"anthropic.claude-v2",
-	"anthropic.claude-v1",
-	"anthropic.claude-instant-v1",
-	"ai21.j2-ultra-v1",
-	"ai21.j2-jumbo-instruct",
-	"amazon.titan-text-express-v1",
-	"amazon.nova-pro-v1:0",
-	"eu.amazon.nova-lite-v1:0",
-}
-
-type ICompletion interface {
-	GetCompletion(ctx context.Context, prompt string, modelConfig BedrockModelConfig) ([]byte, error)
-}
-
-type CohereCompletion struct {
-	completion ICompletion
-}
-
-func (a *CohereCompletion) GetCompletion(ctx context.Context, prompt string, modelConfig BedrockModelConfig) ([]byte, error) {
-	request := map[string]interface{}{
-		"prompt":               fmt.Sprintf("\n\nHuman: %s  \n\nAssistant:", prompt),
-		"max_tokens_to_sample": modelConfig.MaxTokens,
-		"temperature":          modelConfig.Temperature,
-		"top_p":                modelConfig.TopP,
-	}
-	body, err := json.Marshal(request)
-	if err != nil {
-		return []byte{}, err
-	}
-	return body, nil
-}
-
-type CohereMessagesCompletion struct {
-	completion ICompletion
-}
-
-func (a *CohereMessagesCompletion) GetCompletion(ctx context.Context, prompt string, modelConfig BedrockModelConfig) ([]byte, error) {
-	request := map[string]interface{}{
-		"max_tokens":        modelConfig.MaxTokens,
-		"temperature":       modelConfig.Temperature,
-		"top_p":             modelConfig.TopP,
-		"anthropic_version": "bedrock-2023-05-31", // Or another valid version
-		"messages": []map[string]interface{}{
-			{
-				"role":    "user",
-				"content": prompt,
-			},
-		},
-	}
-
-	body, err := json.Marshal(request)
-	if err != nil {
-		return []byte{}, err
-	}
-	return body, nil
-}
-
-type AI21 struct {
-	completion ICompletion
-}
-
-func (a *AI21) GetCompletion(ctx context.Context, prompt string, modelConfig BedrockModelConfig) ([]byte, error) {
-	request := map[string]interface{}{
-		"prompt":      prompt,
-		"maxTokens":   modelConfig.MaxTokens,
-		"temperature": modelConfig.Temperature,
-		"topP":        modelConfig.TopP,
-	}
-	body, err := json.Marshal(request)
-	if err != nil {
-		return []byte{}, err
-	}
-	return body, nil
-}
-
-type AmazonCompletion struct {
-	completion ICompletion
-}
-
-func isModelSupported(modelName string) bool {
-	for _, supportedModel := range SUPPPORTED_BEDROCK_MODELS {
-		if modelName == supportedModel {
-			return true
-		}
-	}
-	return false
-}
-
-func (a *AmazonCompletion) GetCompletion(ctx context.Context, prompt string, modelConfig BedrockModelConfig) ([]byte, error) {
-	if !isModelSupported(modelConfig.ModelName) {
-		return nil, fmt.Errorf("model %s is not supported", modelConfig.ModelName)
-	}
-	if strings.Contains(modelConfig.ModelName, "nova") {
-		return a.GetNovaCompletion(ctx, prompt, modelConfig)
-	} else {
-		return a.GetDefaultCompletion(ctx, prompt, modelConfig)
-	}
-}
-
-func (a *AmazonCompletion) GetDefaultCompletion(ctx context.Context, prompt string, modelConfig BedrockModelConfig) ([]byte, error) {
-	request := map[string]interface{}{
-		"inputText": fmt.Sprintf("\n\nUser: %s", prompt),
-		"textGenerationConfig": map[string]interface{}{
-			"maxTokenCount": modelConfig.MaxTokens,
-			"temperature":   modelConfig.Temperature,
-			"topP":          modelConfig.TopP,
-		},
-	}
-	body, err := json.Marshal(request)
-	if err != nil {
-		return []byte{}, err
-	}
-	return body, nil
-
-}
-
-func (a *AmazonCompletion) GetNovaCompletion(ctx context.Context, prompt string, modelConfig BedrockModelConfig) ([]byte, error) {
-	request := map[string]interface{}{
-		"inferenceConfig": map[string]interface{}{
-			"max_new_tokens": modelConfig.MaxTokens,
-			"temperature":    modelConfig.Temperature,
-			"topP":           modelConfig.TopP,
-		},
-		"messages": []map[string]interface{}{
-			{
-				"role": "user",
-				"content": []map[string]interface{}{
-					{
-						"text": prompt,
-					},
-				},
-			},
-		},
-	}
-	body, err := json.Marshal(request)
-	if err != nil {
-		return []byte{}, err
-	}
-	return body, nil
-}

pkg/ai/bedrock_support/completions_test.go

@@ -1,179 +0,0 @@
-package bedrock_support
-
-import (
-	"context"
-	"encoding/json"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestCohereCompletion_GetCompletion(t *testing.T) {
-	completion := &CohereCompletion{}
-	modelConfig := BedrockModelConfig{
-		MaxTokens:   100,
-		Temperature: 0.7,
-		TopP:        0.9,
-	}
-	prompt := "Test prompt"
-
-	body, err := completion.GetCompletion(context.Background(), prompt, modelConfig)
-	assert.NoError(t, err)
-
-	var request map[string]interface{}
-	err = json.Unmarshal(body, &request)
-	assert.NoError(t, err)
-
-	assert.Equal(t, "\n\nHuman: Test prompt  \n\nAssistant:", request["prompt"])
-	assert.Equal(t, 100, int(request["max_tokens_to_sample"].(float64)))
-	assert.Equal(t, 0.7, request["temperature"])
-	assert.Equal(t, 0.9, request["top_p"])
-}
-
-func TestAI21_GetCompletion(t *testing.T) {
-	completion := &AI21{}
-	modelConfig := BedrockModelConfig{
-		MaxTokens:   150,
-		Temperature: 0.6,
-		TopP:        0.8,
-	}
-	prompt := "Another test prompt"
-
-	body, err := completion.GetCompletion(context.Background(), prompt, modelConfig)
-	assert.NoError(t, err)
-
-	var request map[string]interface{}
-	err = json.Unmarshal(body, &request)
-	assert.NoError(t, err)
-
-	assert.Equal(t, "Another test prompt", request["prompt"])
-	assert.Equal(t, 150, int(request["maxTokens"].(float64)))
-	assert.Equal(t, 0.6, request["temperature"])
-	assert.Equal(t, 0.8, request["topP"])
-}
-
-func TestAmazonCompletion_GetDefaultCompletion(t *testing.T) {
-	completion := &AmazonCompletion{}
-	modelConfig := BedrockModelConfig{
-		MaxTokens:   200,
-		Temperature: 0.5,
-		TopP:        0.7,
-		ModelName:   "amazon.titan-text-express-v1",
-	}
-	prompt := "Default test prompt"
-
-	body, err := completion.GetDefaultCompletion(context.Background(), prompt, modelConfig)
-	assert.NoError(t, err)
-
-	var request map[string]interface{}
-	err = json.Unmarshal(body, &request)
-	assert.NoError(t, err)
-
-	assert.Equal(t, "\n\nUser: Default test prompt", request["inputText"])
-	textConfig := request["textGenerationConfig"].(map[string]interface{})
-	assert.Equal(t, 200, int(textConfig["maxTokenCount"].(float64)))
-	assert.Equal(t, 0.5, textConfig["temperature"])
-	assert.Equal(t, 0.7, textConfig["topP"])
-}
-
-func TestAmazonCompletion_GetNovaCompletion(t *testing.T) {
-	completion := &AmazonCompletion{}
-	modelConfig := BedrockModelConfig{
-		MaxTokens:   250,
-		Temperature: 0.4,
-		TopP:        0.6,
-		ModelName:   "amazon.nova-pro-v1:0",
-	}
-	prompt := "Nova test prompt"
-
-	body, err := completion.GetNovaCompletion(context.Background(), prompt, modelConfig)
-	assert.NoError(t, err)
-
-	var request map[string]interface{}
-	err = json.Unmarshal(body, &request)
-	assert.NoError(t, err)
-
-	inferenceConfig := request["inferenceConfig"].(map[string]interface{})
-	assert.Equal(t, 250, int(inferenceConfig["max_new_tokens"].(float64)))
-	assert.Equal(t, 0.4, inferenceConfig["temperature"])
-	assert.Equal(t, 0.6, inferenceConfig["topP"])
-
-	messages := request["messages"].([]interface{})
-	message := messages[0].(map[string]interface{})
-	content := message["content"].([]interface{})
-	contentMap := content[0].(map[string]interface{})
-	assert.Equal(t, "Nova test prompt", contentMap["text"])
-}
-
-func TestAmazonCompletion_GetCompletion_Nova(t *testing.T) {
-	completion := &AmazonCompletion{}
-	modelConfig := BedrockModelConfig{
-		MaxTokens:   250,
-		Temperature: 0.4,
-		TopP:        0.6,
-		ModelName:   "amazon.nova-pro-v1:0",
-	}
-	prompt := "Nova test prompt"
-
-	body, err := completion.GetCompletion(context.Background(), prompt, modelConfig)
-	assert.NoError(t, err)
-
-	var request map[string]interface{}
-	err = json.Unmarshal(body, &request)
-	assert.NoError(t, err)
-
-	inferenceConfig := request["inferenceConfig"].(map[string]interface{})
-	assert.Equal(t, 250, int(inferenceConfig["max_new_tokens"].(float64)))
-	assert.Equal(t, 0.4, inferenceConfig["temperature"])
-	assert.Equal(t, 0.6, inferenceConfig["topP"])
-
-	messages := request["messages"].([]interface{})
-	message := messages[0].(map[string]interface{})
-	content := message["content"].([]interface{})
-	contentMap := content[0].(map[string]interface{})
-	assert.Equal(t, "Nova test prompt", contentMap["text"])
-}
-
-func TestAmazonCompletion_GetCompletion_Default(t *testing.T) {
-	completion := &AmazonCompletion{}
-	modelConfig := BedrockModelConfig{
-		MaxTokens:   200,
-		Temperature: 0.5,
-		TopP:        0.7,
-		ModelName:   "amazon.titan-text-express-v1",
-	}
-	prompt := "Default test prompt"
-
-	body, err := completion.GetCompletion(context.Background(), prompt, modelConfig)
-	assert.NoError(t, err)
-
-	var request map[string]interface{}
-	err = json.Unmarshal(body, &request)
-	assert.NoError(t, err)
-
-	assert.Equal(t, "\n\nUser: Default test prompt", request["inputText"])
-	textConfig := request["textGenerationConfig"].(map[string]interface{})
-	assert.Equal(t, 200, int(textConfig["maxTokenCount"].(float64)))
-	assert.Equal(t, 0.5, textConfig["temperature"])
-	assert.Equal(t, 0.7, textConfig["topP"])
-}
-
-func TestAmazonCompletion_GetCompletion_UnsupportedModel(t *testing.T) {
-	completion := &AmazonCompletion{}
-	modelConfig := BedrockModelConfig{
-		MaxTokens:   200,
-		Temperature: 0.5,
-		TopP:        0.7,
-		ModelName:   "unsupported-model",
-	}
-	prompt := "Test prompt"
-
-	_, err := completion.GetCompletion(context.Background(), prompt, modelConfig)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "model unsupported-model is not supported")
-}
-
-func Test_isModelSupported(t *testing.T) {
-	assert.True(t, isModelSupported("anthropic.claude-v2"))
-	assert.False(t, isModelSupported("unsupported-model"))
-}

pkg/ai/bedrock_support/model.go

@@ -1,14 +0,0 @@
-package bedrock_support
-
-type BedrockModelConfig struct {
-	MaxTokens   int
-	Temperature float32
-	TopP        float32
-	ModelName   string
-}
-type BedrockModel struct {
-	Name       string
-	Completion ICompletion
-	Response   IResponse
-	Config     BedrockModelConfig
-}

pkg/ai/bedrock_support/model_test.go

@@ -1,59 +0,0 @@
-package bedrock_support
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestBedrockModelConfig(t *testing.T) {
-	config := BedrockModelConfig{
-		MaxTokens:   100,
-		Temperature: 0.7,
-		TopP:        0.9,
-		ModelName:   "test-model",
-	}
-
-	assert.Equal(t, 100, config.MaxTokens)
-	assert.Equal(t, float32(0.7), config.Temperature)
-	assert.Equal(t, float32(0.9), config.TopP)
-	assert.Equal(t, "test-model", config.ModelName)
-}
-
-func TestBedrockModel(t *testing.T) {
-	completion := &MockCompletion{}
-	response := &MockResponse{}
-	config := BedrockModelConfig{
-		MaxTokens:   100,
-		Temperature: 0.7,
-		TopP:        0.9,
-		ModelName:   "test-model",
-	}
-
-	model := BedrockModel{
-		Name:       "Test Model",
-		Completion: completion,
-		Response:   response,
-		Config:     config,
-	}
-
-	assert.Equal(t, "Test Model", model.Name)
-	assert.Equal(t, completion, model.Completion)
-	assert.Equal(t, response, model.Response)
-	assert.Equal(t, config, model.Config)
-}
-
-// MockCompletion is a mock implementation of the ICompletion interface
-type MockCompletion struct{}
-
-func (m *MockCompletion) GetCompletion(ctx context.Context, prompt string, config BedrockModelConfig) ([]byte, error) {
-	return []byte(`{"prompt": "mock prompt"}`), nil
-}
-
-// MockResponse is a mock implementation of the IResponse interface
-type MockResponse struct{}
-
-func (m *MockResponse) ParseResponse(body []byte) (string, error) {
-	return "mock response", nil
-}

pkg/ai/bedrock_support/responses.go

@@ -1,155 +0,0 @@
-package bedrock_support
-
-import (
-	"encoding/json"
-)
-
-type IResponse interface {
-	ParseResponse(rawResponse []byte) (string, error)
-}
-
-type CohereMessagesResponse struct {
-	response IResponse
-}
-
-func (a *CohereMessagesResponse) ParseResponse(rawResponse []byte) (string, error) {
-	type InvokeModelResponseBody struct {
-		ID      string `json:"id"`
-		Type    string `json:"type"`
-		Role    string `json:"role"`
-		Model   string `json:"model"`
-		Content []struct {
-			Type string `json:"type"`
-			Text string `json:"text"`
-		} `json:"content"`
-		StopReason   string      `json:"stop_reason"`
-		StopSequence interface{} `json:"stop_sequence"` // Could be null
-		Usage        struct {
-			InputTokens  int `json:"input_tokens"`
-			OutputTokens int `json:"output_tokens"`
-		} `json:"usage"`
-	}
-
-	output := &InvokeModelResponseBody{}
-	err := json.Unmarshal(rawResponse, output)
-	if err != nil {
-		return "", err
-	}
-
-	// Extract the text content from the Content array
-	var resultText string
-	for _, content := range output.Content {
-		if content.Type == "text" {
-			resultText += content.Text
-		}
-	}
-
-	return resultText, nil
-}
-
-type CohereResponse struct {
-	response IResponse
-}
-
-func (a *CohereResponse) ParseResponse(rawResponse []byte) (string, error) {
-	type InvokeModelResponseBody struct {
-		Completion  string `json:"completion"`
-		Stop_reason string `json:"stop_reason"`
-	}
-	output := &InvokeModelResponseBody{}
-	err := json.Unmarshal(rawResponse, output)
-	if err != nil {
-		return "", err
-	}
-	return output.Completion, nil
-}
-
-type AI21Response struct {
-	response IResponse
-}
-
-func (a *AI21Response) ParseResponse(rawResponse []byte) (string, error) {
-	type Data struct {
-		Text string `json:"text"`
-	}
-	type Completion struct {
-		Data Data `json:"data"`
-	}
-	type InvokeModelResponseBody struct {
-		Completions []Completion `json:"completions"`
-	}
-	output := &InvokeModelResponseBody{}
-	err := json.Unmarshal(rawResponse, output)
-	if err != nil {
-		return "", err
-	}
-	return output.Completions[0].Data.Text, nil
-}
-
-type AmazonResponse struct {
-	response IResponse
-}
-
-type NovaResponse struct {
-	response NResponse
-}
-type NResponse interface {
-	ParseResponse(rawResponse []byte) (string, error)
-}
-
-func (a *AmazonResponse) ParseResponse(rawResponse []byte) (string, error) {
-	type Result struct {
-		TokenCount       int    `json:"tokenCount"`
-		OutputText       string `json:"outputText"`
-		CompletionReason string `json:"completionReason"`
-	}
-	type InvokeModelResponseBody struct {
-		InputTextTokenCount int      `json:"inputTextTokenCount"`
-		Results             []Result `json:"results"`
-	}
-	output := &InvokeModelResponseBody{}
-	err := json.Unmarshal(rawResponse, output)
-	if err != nil {
-		return "", err
-	}
-	return output.Results[0].OutputText, nil
-}
-
-func (a *NovaResponse) ParseResponse(rawResponse []byte) (string, error) {
-	type Content struct {
-		Text string `json:"text"`
-	}
-
-	type Message struct {
-		Role    string    `json:"role"`
-		Content []Content `json:"content"`
-	}
-
-	type UsageDetails struct {
-		InputTokens               int `json:"inputTokens"`
-		OutputTokens              int `json:"outputTokens"`
-		TotalTokens               int `json:"totalTokens"`
-		CacheReadInputTokenCount  int `json:"cacheReadInputTokenCount"`
-		CacheWriteInputTokenCount int `json:"cacheWriteInputTokenCount,omitempty"`
-	}
-
-	type AmazonNovaResponse struct {
-		Output struct {
-			Message Message `json:"message"`
-		} `json:"output"`
-		StopReason string       `json:"stopReason"`
-		Usage      UsageDetails `json:"usage"`
-	}
-
-	response := &AmazonNovaResponse{}
-	err := json.Unmarshal(rawResponse, response)
-	if err != nil {
-		return "", err
-	}
-
-	if len(response.Output.Message.Content) > 0 {
-		return response.Output.Message.Content[0].Text, nil
-	}
-
-	return "", nil
-}

pkg/ai/bedrock_support/responses_test.go

@@ -1,65 +0,0 @@
-package bedrock_support
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestCohereResponse_ParseResponse(t *testing.T) {
-	response := &CohereResponse{}
-	rawResponse := []byte(`{"completion": "Test completion", "stop_reason": "max_tokens"}`)
-
-	result, err := response.ParseResponse(rawResponse)
-	assert.NoError(t, err)
-	assert.Equal(t, "Test completion", result)
-
-	invalidResponse := []byte(`{"completion": "Test completion", "invalid_json":]`)
-	_, err = response.ParseResponse(invalidResponse)
-	assert.Error(t, err)
-}
-
-func TestAI21Response_ParseResponse(t *testing.T) {
-	response := &AI21Response{}
-	rawResponse := []byte(`{"completions": [{"data": {"text": "AI21 test"}}], "id": "123"}`)
-
-	result, err := response.ParseResponse(rawResponse)
-	assert.NoError(t, err)
-	assert.Equal(t, "AI21 test", result)
-
-	invalidResponse := []byte(`{"completions": [{"data": {"text": "AI21 test"}}, "invalid_json":]`)
-	_, err = response.ParseResponse(invalidResponse)
-	assert.Error(t, err)
-}
-
-func TestAmazonResponse_ParseResponse(t *testing.T) {
-	response := &AmazonResponse{}
-	rawResponse := []byte(`{"inputTextTokenCount": 10, "results": [{"tokenCount": 20, "outputText": "Amazon test", "completionReason": "stop"}]}`)
-
-	result, err := response.ParseResponse(rawResponse)
-	assert.NoError(t, err)
-	assert.Equal(t, "Amazon test", result)
-
-	invalidResponse := []byte(`{"inputTextTokenCount": 10, "results": [{"tokenCount": 20, "outputText": "Amazon test", "invalid_json":]`)
-	_, err = response.ParseResponse(invalidResponse)
-	assert.Error(t, err)
-}
-
-func TestNovaResponse_ParseResponse(t *testing.T) {
-	response := &NovaResponse{}
-	rawResponse := []byte(`{"output": {"message": {"content": [{"text": "Nova test"}]}}, "stopReason": "stop", "usage": {"inputTokens": 10, "outputTokens": 20, "totalTokens": 30, "cacheReadInputTokenCount": 5}}`)
-
-	result, err := response.ParseResponse(rawResponse)
-	assert.NoError(t, err)
-	assert.Equal(t, "Nova test", result)
-
-	rawResponseEmptyContent := []byte(`{"output": {"message": {"content": []}}, "stopReason": "stop", "usage": {"inputTokens": 10, "outputTokens": 20, "totalTokens": 30, "cacheReadInputTokenCount": 5}}`)
-
-	resultEmptyContent, errEmptyContent := response.ParseResponse(rawResponseEmptyContent)
-	assert.NoError(t, errEmptyContent)
-	assert.Equal(t, "", resultEmptyContent)
-
-	invalidResponse := []byte(`{"output": {"message": {"content": [{"text": "Nova test"}}, "invalid_json":]`)
-	_, err = response.ParseResponse(invalidResponse)
-	assert.Error(t, err)
-}

pkg/ai/cohere.go

@@ -1,80 +0,0 @@
-/*
-Copyright 2023 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package ai
-
-import (
-	"context"
-	"errors"
-
-	api "github.com/cohere-ai/cohere-go/v2"
-	cohere "github.com/cohere-ai/cohere-go/v2/client"
-	"github.com/cohere-ai/cohere-go/v2/option"
-)
-
-const cohereAIClientName = "cohere"
-
-type CohereClient struct {
-	nopCloser
-
-	client      *cohere.Client
-	model       string
-	temperature float32
-	maxTokens   int
-}
-
-func (c *CohereClient) Configure(config IAIConfig) error {
-	token := config.GetPassword()
-
-	opts := []option.RequestOption{
-		cohere.WithToken(token),
-	}
-
-	baseURL := config.GetBaseURL()
-	if baseURL != "" {
-		opts = append(opts, cohere.WithBaseURL(baseURL))
-	}
-
-	client := cohere.NewClient(opts...)
-	if client == nil {
-		return errors.New("error creating Cohere client")
-	}
-
-	c.client = client
-	c.model = config.GetModel()
-	c.temperature = config.GetTemperature()
-	c.maxTokens = config.GetMaxTokens()
-
-	return nil
-}
-
-func (c *CohereClient) GetCompletion(ctx context.Context, prompt string) (string, error) {
-	// Create a completion request
-	response, err := c.client.Chat(ctx, &api.ChatRequest{
-		Message:      prompt,
-		Model:        &c.model,
-		K:            api.Int(0),
-		Preamble:     api.String(""),
-		Temperature:  api.Float64(float64(c.temperature)),
-		RawPrompting: api.Bool(false),
-		MaxTokens:    api.Int(c.maxTokens),
-	})
-	if err != nil {
-		return "", err
-	}
-	return response.Text, nil
-}
-
-func (c *CohereClient) GetName() string {
-	return cohereAIClientName
-}

pkg/ai/customrest.go

@@ -1,147 +0,0 @@
-package ai
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"strings"
-	"time"
-)
-
-const CustomRestClientName = "customrest"
-
-type CustomRestClient struct {
-	nopCloser
-	client      *http.Client
-	base        *url.URL
-	token       string
-	model       string
-	temperature float32
-	topP        float32
-	topK        int32
-}
-
-type CustomRestRequest struct {
-	Model string `json:"model"`
-
-	// Prompt is the textual prompt to send to the model.
-	Prompt string `json:"prompt"`
-
-	// Options lists model-specific options. For example, temperature can be
-	// set through this field, if the model supports it.
-	Options map[string]interface{} `json:"options"`
-}
-
-type CustomRestResponse struct {
-	// Model is the model name that generated the response.
-	Model string `json:"model"`
-
-	// CreatedAt is the timestamp of the response.
-	CreatedAt time.Time `json:"created_at"`
-
-	// Response is the textual response itself.
-	Response string `json:"response"`
-}
-
-func (c *CustomRestClient) Configure(config IAIConfig) error {
-	baseURL := config.GetBaseURL()
-	if baseURL == "" {
-		baseURL = defaultBaseURL
-	}
-	c.token = config.GetPassword()
-	baseClientURL, err := url.Parse(baseURL)
-	if err != nil {
-		return err
-	}
-	c.base = baseClientURL
-
-	proxyEndpoint := config.GetProxyEndpoint()
-	c.client = http.DefaultClient
-	if proxyEndpoint != "" {
-		proxyUrl, err := url.Parse(proxyEndpoint)
-		if err != nil {
-			return err
-		}
-		transport := &http.Transport{
-			Proxy: http.ProxyURL(proxyUrl),
-		}
-
-		c.client = &http.Client{
-			Transport: transport,
-		}
-	}
-
-	c.model = config.GetModel()
-	if c.model == "" {
-		c.model = defaultModel
-	}
-	c.temperature = config.GetTemperature()
-	c.topP = config.GetTopP()
-	c.topK = config.GetTopK()
-	return nil
-}
-
-func (c *CustomRestClient) GetCompletion(ctx context.Context, prompt string) (string, error) {
-	var promptDetail struct {
-		Language string `json:"language,omitempty"`
-		Message  string `json:"message"`
-		Prompt   string `json:"prompt,omitempty"`
-	}
-	prompt = strings.NewReplacer("\n", "\\n", "\t", "\\t").Replace(prompt)
-	if err := json.Unmarshal([]byte(prompt), &promptDetail); err != nil {
-		return "", err
-	}
-	generateRequest := &CustomRestRequest{
-		Model:  c.model,
-		Prompt: promptDetail.Prompt,
-		Options: map[string]interface{}{
-			"temperature": c.temperature,
-			"top_p":       c.topP,
-			"top_k":       c.topK,
-			"message":     promptDetail.Message,
-			"language":    promptDetail.Language,
-		},
-	}
-	requestBody, err := json.Marshal(generateRequest)
-	if err != nil {
-		return "", err
-	}
-	request, err := http.NewRequestWithContext(ctx, http.MethodPost, c.base.String(), bytes.NewBuffer(requestBody))
-	if err != nil {
-		return "", err
-	}
-	if c.token != "" {
-		request.Header.Set("Authorization", "Bearer "+c.token)
-	}
-	request.Header.Set("Content-Type", "application/json")
-	request.Header.Set("Accept", "application/x-ndjson")
-
-	response, err := c.client.Do(request)
-	if err != nil {
-		return "", err
-	}
-	defer response.Body.Close()
-
-	responseBody, err := io.ReadAll(response.Body)
-	if err != nil {
-		return "", fmt.Errorf("could not read response body: %w", err)
-	}
-
-	if response.StatusCode >= http.StatusBadRequest {
-		return "", fmt.Errorf("Request Error, StatusCode: %d, ErrorMessage: %s", response.StatusCode, responseBody)
-	}
-
-	var result CustomRestResponse
-	if err := json.Unmarshal(responseBody, &result); err != nil {
-		return "", err
-	}
-	return result.Response, nil
-}
-
-func (c *CustomRestClient) GetName() string {
-	return CustomRestClientName
-}

pkg/ai/googlegenai.go

@@ -1,122 +0,0 @@
-/*
-Copyright 2023 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package ai
-
-import (
-	"context"
-	"errors"
-	"fmt"
-
-	"github.com/fatih/color"
-	"github.com/google/generative-ai-go/genai"
-	"google.golang.org/api/option"
-)
-
-const googleAIClientName = "google"
-
-type GoogleGenAIClient struct {
-	client *genai.Client
-
-	model       string
-	temperature float32
-	topP        float32
-	topK        int32
-	maxTokens   int
-}
-
-func (c *GoogleGenAIClient) Configure(config IAIConfig) error {
-	ctx := context.Background()
-
-	// Access your API key as an environment variable (see "Set up your API key" above)
-	token := config.GetPassword()
-	authOption := option.WithAPIKey(token)
-	if token[0] == '{' {
-		authOption = option.WithCredentialsJSON([]byte(token))
-	}
-
-	client, err := genai.NewClient(ctx, authOption)
-	if err != nil {
-		return fmt.Errorf("creating genai Google SDK client: %w", err)
-	}
-
-	c.client = client
-	c.model = config.GetModel()
-	c.temperature = config.GetTemperature()
-	c.topP = config.GetTopP()
-	c.topK = config.GetTopK()
-	c.maxTokens = config.GetMaxTokens()
-	return nil
-}
-
-func (c *GoogleGenAIClient) GetCompletion(ctx context.Context, prompt string) (string, error) {
-	// Available models are at https://ai.google.dev/models e.g.gemini-pro.
-	model := c.client.GenerativeModel(c.model)
-	model.SetTemperature(c.temperature)
-	model.SetTopP(c.topP)
-	model.SetTopK(c.topK)
-	model.SetMaxOutputTokens(int32(c.maxTokens))
-
-	// Google AI SDK is capable of different inputs than just text, for now set explicit text prompt type.
-	// Similarly, we could stream the response. For now k8sgpt does not support streaming.
-	resp, err := model.GenerateContent(ctx, genai.Text(prompt))
-	if err != nil {
-		return "", err
-	}
-
-	if len(resp.Candidates) == 0 {
-		if resp.PromptFeedback.BlockReason == genai.BlockReasonSafety {
-			for _, r := range resp.PromptFeedback.SafetyRatings {
-				if !r.Blocked {
-					continue
-				}
-				return "", fmt.Errorf("completion blocked due to %v with probability %v", r.Category.String(), r.Probability.String())
-			}
-		}
-		return "", errors.New("no completion returned; unknown reason")
-	}
-
-	// Format output.
-	// TODO(bwplotka): Provider richer output in certain cases e.g. suddenly finished
-	// completion based on finish reasons or safety rankings.
-	got := resp.Candidates[0]
-	var output string
-	for _, part := range got.Content.Parts {
-		switch o := part.(type) {
-		case genai.Text:
-			output += string(o)
-			output += "\n"
-		default:
-			color.Yellow("found unsupported AI response part of type %T; ignoring", part)
-		}
-	}
-
-	if got.CitationMetadata != nil && len(got.CitationMetadata.CitationSources) > 0 {
-		output += "Citations:\n"
-		for _, source := range got.CitationMetadata.CitationSources {
-			// TODO(bwplotka): Give details around what exactly words could be attributed to the citation.
-			output += fmt.Sprintf("* %s, %s\n", *source.URI, source.License)
-		}
-	}
-	return output, nil
-}
-
-func (c *GoogleGenAIClient) GetName() string {
-	return googleAIClientName
-}
-
-func (c *GoogleGenAIClient) Close() {
-	if err := c.client.Close(); err != nil {
-		color.Red("googleai client close error: %v", err)
-	}
-}

pkg/ai/googlevertexai.go

@@ -1,181 +0,0 @@
-/*
-Copyright 2023 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package ai
-
-import (
-	"context"
-	"errors"
-	"fmt"
-
-	"cloud.google.com/go/vertexai/genai"
-	"github.com/fatih/color"
-)
-
-const googleVertexAIClientName = "googlevertexai"
-
-type GoogleVertexAIClient struct {
-	client *genai.Client
-
-	model       string
-	temperature float32
-	topP        float32
-	topK        int32
-	maxTokens   int
-}
-
-// Vertex AI Gemini supported Regions
-// https://cloud.google.com/vertex-ai/docs/generative-ai/model-reference/gemini
-const VERTEXAI_DEFAULT_REGION = "us-central1" // default use us-east-1 region
-
-const (
-	US_Central_1             = "us-central1"
-	US_West_4                = "us-west4"
-	North_America_Northeast1 = "northamerica-northeast1"
-	US_East_4                = "us-east4"
-	US_West_1                = "us-west1"
-	Asia_Northeast_3         = "asia-northeast3"
-	Asia_Southeast_1         = "asia-southeast1"
-	Asia_Northeast_1         = "asia-northeast1"
-)
-
-var VERTEXAI_SUPPORTED_REGION = []string{
-	US_Central_1,
-	US_West_4,
-	North_America_Northeast1,
-	US_East_4,
-	US_West_1,
-	Asia_Northeast_3,
-	Asia_Southeast_1,
-	Asia_Northeast_1,
-}
-
-const (
-	ModelGeminiProV1 = "gemini-1.0-pro-001"
-)
-
-var VERTEXAI_MODELS = []string{
-	ModelGeminiProV1,
-}
-
-// GetModelOrDefault check config model
-func GetVertexAIModelOrDefault(model string) string {
-
-	// Check if the provided model is in the list
-	for _, m := range VERTEXAI_MODELS {
-		if m == model {
-			return model // Return the provided model
-		}
-	}
-
-	// Return the default model if the provided model is not in the list
-	return VERTEXAI_MODELS[0]
-}
-
-// GetModelOrDefault check config region
-func GetVertexAIRegionOrDefault(region string) string {
-
-	// Check if the provided model is in the list
-	for _, m := range VERTEXAI_SUPPORTED_REGION {
-		if m == region {
-			return region // Return the provided model
-		}
-	}
-
-	// Return the default model if the provided model is not in the list
-	return VERTEXAI_DEFAULT_REGION
-}
-
-func (g *GoogleVertexAIClient) Configure(config IAIConfig) error {
-	ctx := context.Background()
-
-	// Currently you can access VertexAI either by being authenticated via OAuth or Bearer token so we need to consider both
-	projectId := config.GetProviderId()
-	region := GetVertexAIRegionOrDefault(config.GetProviderRegion())
-
-	client, err := genai.NewClient(ctx, projectId, region)
-	if err != nil {
-		return fmt.Errorf("creating genai Google SDK client: %w", err)
-	}
-
-	g.client = client
-	g.model = GetVertexAIModelOrDefault(config.GetModel())
-	g.temperature = config.GetTemperature()
-	g.topP = config.GetTopP()
-	g.topK = config.GetTopK()
-	g.maxTokens = config.GetMaxTokens()
-
-	return nil
-}
-
-func (g *GoogleVertexAIClient) GetCompletion(ctx context.Context, prompt string) (string, error) {
-
-	model := g.client.GenerativeModel(g.model)
-	model.SetTemperature(g.temperature)
-	model.SetTopP(g.topP)
-	model.SetTopK(g.topK)
-	model.SetMaxOutputTokens(int32(g.maxTokens))
-
-	// Google AI SDK is capable of different inputs than just text, for now set explicit text prompt type.
-	// Similarly, we could stream the response. For now k8sgpt does not support streaming.
-	resp, err := model.GenerateContent(ctx, genai.Text(prompt))
-	if err != nil {
-		return "", err
-	}
-
-	if len(resp.Candidates) == 0 {
-		if resp.PromptFeedback.BlockReason > 0 {
-			for _, r := range resp.PromptFeedback.SafetyRatings {
-				if !r.Blocked {
-					continue
-				}
-				return "", fmt.Errorf("completion blocked due to %v with probability %v", r.Category.String(), r.Probability.String())
-			}
-		}
-		return "", errors.New("no completion returned; unknown reason")
-	}
-
-	// Format output.
-	// TODO(bwplotka): Provider richer output in certain cases e.g. suddenly finished
-	// completion based on finish reasons or safety rankings.
-	got := resp.Candidates[0]
-	var output string
-	for _, part := range got.Content.Parts {
-		switch o := part.(type) {
-		case genai.Text:
-			output += string(o)
-			output += "\n"
-		default:
-			color.Yellow("found unsupported AI response part of type %T; ignoring", part)
-		}
-	}
-
-	if got.CitationMetadata != nil && len(got.CitationMetadata.Citations) > 0 {
-		output += "Citations:\n"
-		for _, source := range got.CitationMetadata.Citations {
-			// TODO(bwplotka): Give details around what exactly words could be attributed to the citation.
-			output += fmt.Sprintf("* %s, %s\n", source.URI, source.License)
-		}
-	}
-	return output, nil
-}
-
-func (g *GoogleVertexAIClient) GetName() string {
-	return googleVertexAIClientName
-}
-
-func (g *GoogleVertexAIClient) Close() {
-	if err := g.client.Close(); err != nil {
-		color.Red("googleai client close error: %v", err)
-	}
-}

pkg/ai/huggingface.go

@@ -1,63 +0,0 @@
-package ai
-
-import (
-	"context"
-
-	"github.com/hupe1980/go-huggingface"
-	"k8s.io/utils/ptr"
-)
-
-const huggingfaceAIClientName = "huggingface"
-
-type HuggingfaceClient struct {
-	nopCloser
-
-	client      *huggingface.InferenceClient
-	model       string
-	topP        float32
-	topK        int32
-	temperature float32
-	maxTokens   int
-}
-
-func (c *HuggingfaceClient) Configure(config IAIConfig) error {
-	token := config.GetPassword()
-
-	client := huggingface.NewInferenceClient(token)
-
-	c.client = client
-	c.model = config.GetModel()
-	c.topP = config.GetTopP()
-	c.topK = config.GetTopK()
-	c.temperature = config.GetTemperature()
-	if config.GetMaxTokens() > 500 {
-		c.maxTokens = 500
-	} else {
-		c.maxTokens = config.GetMaxTokens()
-	}
-	return nil
-}
-
-func (c *HuggingfaceClient) GetCompletion(ctx context.Context, prompt string) (string, error) {
-	resp, err := c.client.Conversational(ctx, &huggingface.ConversationalRequest{
-		Inputs: huggingface.ConverstationalInputs{
-			Text: prompt,
-		},
-		Model: c.model,
-		Parameters: huggingface.ConversationalParameters{
-			TopP:        ptr.To[float64](float64(c.topP)),
-			TopK:        ptr.To[int](int(c.topK)),
-			Temperature: ptr.To[float64](float64(c.temperature)),
-			MaxLength:   &c.maxTokens,
-		},
-		Options: huggingface.Options{
-			WaitForModel: ptr.To[bool](true),
-		},
-	})
-	if err != nil {
-		return "", err
-	}
-	return resp.GeneratedText, nil
-}
-
-func (c *HuggingfaceClient) GetName() string { return huggingfaceAIClientName }

pkg/ai/iai.go

@@ -15,139 +15,51 @@ package ai
 
 import (
 	"context"
-	"net/http"
+
+	"github.com/k8sgpt-ai/k8sgpt/pkg/cache"
 )
 
-var (
-	clients = []IAI{
-		&OpenAIClient{},
-		&AzureAIClient{},
-		&LocalAIClient{},
-		&OllamaClient{},
-		&NoOpAIClient{},
-		&CohereClient{},
-		&AmazonBedRockClient{},
-		&SageMakerAIClient{},
-		&GoogleGenAIClient{},
-		&HuggingfaceClient{},
-		&GoogleVertexAIClient{},
-		&OCIGenAIClient{},
-		&CustomRestClient{},
-		&IBMWatsonxAIClient{},
-	}
-	Backends = []string{
-		openAIClientName,
-		localAIClientName,
-		ollamaClientName,
-		azureAIClientName,
-		cohereAIClientName,
-		amazonbedrockAIClientName,
-		amazonsagemakerAIClientName,
-		googleAIClientName,
-		noopAIClientName,
-		huggingfaceAIClientName,
-		googleVertexAIClientName,
-		ociClientName,
-		CustomRestClientName,
-		ibmWatsonxAIClientName,
-	}
-)
-
-// IAI is an interface all clients (representing backends) share.
 type IAI interface {
-	// Configure sets up client for given configuration. This is expected to be
-	// executed once per client life-time (e.g. analysis CLI command invocation).
-	Configure(config IAIConfig) error
-	// GetCompletion generates text based on prompt.
+	Configure(config IAIConfig, language string) error
 	GetCompletion(ctx context.Context, prompt string) (string, error)
-	// GetName returns name of the backend/client.
+	Parse(ctx context.Context, prompt []string, cache cache.ICache) (string, error)
 	GetName() string
-	// Close cleans all the resources. No other methods should be used on the
-	// objects after this method is invoked.
-	Close()
 }
 
-type nopCloser struct{}
-
-func (nopCloser) Close() {}
-
 type IAIConfig interface {
 	GetPassword() string
 	GetModel() string
 	GetBaseURL() string
-	GetProxyEndpoint() string
-	GetEndpointName() string
-	GetEngine() string
-	GetTemperature() float32
-	GetProviderRegion() string
-	GetTopP() float32
-	GetTopK() int32
-	GetMaxTokens() int
-	GetProviderId() string
-	GetCompartmentId() string
-	GetOrganizationId() string
-	GetCustomHeaders() []http.Header
 }
 
 func NewClient(provider string) IAI {
-	for _, c := range clients {
-		if provider == c.GetName() {
-			return c
-		}
+	switch provider {
+	case "openai":
+		return &OpenAIClient{}
+	case "localai":
+		return &LocalAIClient{}
+	case "noopai":
+		return &NoOpAIClient{}
+	default:
+		return &OpenAIClient{}
 	}
-	// default client
-	return &OpenAIClient{}
 }
 
 type AIConfiguration struct {
-	Providers       []AIProvider `mapstructure:"providers"`
-	DefaultProvider string       `mapstructure:"defaultprovider"`
+	Providers []AIProvider `mapstructure:"providers"`
 }
 
 type AIProvider struct {
-	Name           string        `mapstructure:"name"`
-	Model          string        `mapstructure:"model"`
-	Password       string        `mapstructure:"password" yaml:"password,omitempty"`
-	BaseURL        string        `mapstructure:"baseurl" yaml:"baseurl,omitempty"`
-	ProxyEndpoint  string        `mapstructure:"proxyEndpoint" yaml:"proxyEndpoint,omitempty"`
-	ProxyPort      string        `mapstructure:"proxyPort" yaml:"proxyPort,omitempty"`
-	EndpointName   string        `mapstructure:"endpointname" yaml:"endpointname,omitempty"`
-	Engine         string        `mapstructure:"engine" yaml:"engine,omitempty"`
-	Temperature    float32       `mapstructure:"temperature" yaml:"temperature,omitempty"`
-	ProviderRegion string        `mapstructure:"providerregion" yaml:"providerregion,omitempty"`
-	ProviderId     string        `mapstructure:"providerid" yaml:"providerid,omitempty"`
-	CompartmentId  string        `mapstructure:"compartmentid" yaml:"compartmentid,omitempty"`
-	TopP           float32       `mapstructure:"topp" yaml:"topp,omitempty"`
-	TopK           int32         `mapstructure:"topk" yaml:"topk,omitempty"`
-	MaxTokens      int           `mapstructure:"maxtokens" yaml:"maxtokens,omitempty"`
-	OrganizationId string        `mapstructure:"organizationid" yaml:"organizationid,omitempty"`
-	CustomHeaders  []http.Header `mapstructure:"customHeaders"`
+	Name     string `mapstructure:"name"`
+	Model    string `mapstructure:"model"`
+	Password string `mapstructure:"password"`
+	BaseURL  string `mapstructure:"baseurl"`
 }
 
 func (p *AIProvider) GetBaseURL() string {
 	return p.BaseURL
 }
 
-func (p *AIProvider) GetProxyEndpoint() string {
-	return p.ProxyEndpoint
-}
-
-func (p *AIProvider) GetEndpointName() string {
-	return p.EndpointName
-}
-
-func (p *AIProvider) GetTopP() float32 {
-	return p.TopP
-}
-
-func (p *AIProvider) GetTopK() int32 {
-	return p.TopK
-}
-
-func (p *AIProvider) GetMaxTokens() int {
-	return p.MaxTokens
-}
-
 func (p *AIProvider) GetPassword() string {
 	return p.Password
 }
@@ -156,40 +68,6 @@ func (p *AIProvider) GetModel() string {
 	return p.Model
 }
 
-func (p *AIProvider) GetEngine() string {
-	return p.Engine
-}
-func (p *AIProvider) GetTemperature() float32 {
-	return p.Temperature
-}
-
-func (p *AIProvider) GetProviderRegion() string {
-	return p.ProviderRegion
-}
-
-func (p *AIProvider) GetProviderId() string {
-	return p.ProviderId
-}
-
-func (p *AIProvider) GetCompartmentId() string {
-	return p.CompartmentId
-}
-
-func (p *AIProvider) GetOrganizationId() string {
-	return p.OrganizationId
-}
-
-func (p *AIProvider) GetCustomHeaders() []http.Header {
-	return p.CustomHeaders
-}
-
-var passwordlessProviders = []string{"localai", "ollama", "amazonsagemaker", "amazonbedrock", "googlevertexai", "oci", "customrest"}
-
 func NeedPassword(backend string) bool {
-	for _, b := range passwordlessProviders {
-		if b == backend {
-			return false
-		}
-	}
-	return true
+	return backend != "localai"
 }

pkg/ai/interactive/interactive.go

@@ -1,67 +0,0 @@
-package interactive
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/fatih/color"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/analysis"
-	"github.com/pterm/pterm"
-)
-
-type INTERACTIVE_STATE int
-
-const (
-	prompt = "Given the following context: "
-)
-
-const (
-	E_RUNNING INTERACTIVE_STATE = iota
-	E_EXITED                    = iota
-)
-
-type InteractionRunner struct {
-	config        *analysis.Analysis
-	State         chan INTERACTIVE_STATE
-	contextWindow []byte
-}
-
-func NewInteractionRunner(config *analysis.Analysis, contextWindow []byte) *InteractionRunner {
-	return &InteractionRunner{
-		config:        config,
-		contextWindow: contextWindow,
-		State:         make(chan INTERACTIVE_STATE),
-	}
-}
-
-func (a *InteractionRunner) StartInteraction() {
-	a.State <- E_RUNNING
-	pterm.Println("Interactive mode enabled [type exit to close.]")
-	for {
-
-		query := pterm.DefaultInteractiveTextInput.WithMultiLine(false)
-		queryString, err := query.Show()
-		if err != nil {
-			fmt.Println(err)
-		}
-		if queryString == "" {
-			continue
-		}
-		if strings.Contains(queryString, "exit") {
-			a.State <- E_EXITED
-			continue
-		}
-		pterm.Println()
-		contextWindow := fmt.Sprintf("%s %s %s", prompt, string(a.contextWindow),
-			queryString)
-
-		response, err := a.config.AIClient.GetCompletion(a.config.Context,
-			contextWindow)
-		if err != nil {
-			color.Red("Error: %v", err)
-			a.State <- E_EXITED
-			continue
-		}
-		pterm.Println(response)
-	}
-}

pkg/ai/localai.go

@@ -1,11 +1,9 @@
 package ai
 
-const localAIClientName = "localai"
-
 type LocalAIClient struct {
 	OpenAIClient
 }
 
 func (a *LocalAIClient) GetName() string {
-	return localAIClientName
+	return "localai"
 }

pkg/ai/noopai.go

@@ -15,23 +15,58 @@ package ai
 
 import (
 	"context"
+	"encoding/base64"
+	"fmt"
+	"strings"
+
+	"github.com/fatih/color"
+	"github.com/k8sgpt-ai/k8sgpt/pkg/cache"
+	"github.com/k8sgpt-ai/k8sgpt/pkg/util"
 )
 
-const noopAIClientName = "noopai"
-
 type NoOpAIClient struct {
-	nopCloser
+	client   string
+	language string
+	model    string
 }
 
-func (c *NoOpAIClient) Configure(_ IAIConfig) error {
+func (c *NoOpAIClient) Configure(config IAIConfig, language string) error {
+	token := config.GetPassword()
+	c.language = language
+	c.client = fmt.Sprintf("I am a noop client with the token %s ", token)
+	c.model = config.GetModel()
 	return nil
 }
 
-func (c *NoOpAIClient) GetCompletion(_ context.Context, prompt string) (string, error) {
+func (c *NoOpAIClient) GetCompletion(ctx context.Context, prompt string) (string, error) {
+	// Create a completion request
 	response := "I am a noop response to the prompt " + prompt
 	return response, nil
 }
 
-func (c *NoOpAIClient) GetName() string {
-	return noopAIClientName
+func (a *NoOpAIClient) Parse(ctx context.Context, prompt []string, cache cache.ICache) (string, error) {
+	// parse the text with the AI backend
+	inputKey := strings.Join(prompt, " ")
+	// Check for cached data
+	sEnc := base64.StdEncoding.EncodeToString([]byte(inputKey))
+	cacheKey := util.GetCacheKey(a.GetName(), a.language, sEnc)
+
+	response, err := a.GetCompletion(ctx, inputKey)
+	if err != nil {
+		color.Red("error getting completion: %v", err)
+		return "", err
+	}
+
+  err = cache.Store(cacheKey, base64.StdEncoding.EncodeToString([]byte(response)))
+
+	if err != nil {
+		color.Red("error storing value to cache: %v", err)
+		return "", nil
+	}
+
+	return response, nil
+}
+
+func (a *NoOpAIClient) GetName() string {
+	return "noopai"
 }

pkg/ai/ocigenai.go

@@ -1,97 +0,0 @@
-/*
-Copyright 2024 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package ai
-
-import (
-	"context"
-	"errors"
-	"github.com/oracle/oci-go-sdk/v65/common"
-	"github.com/oracle/oci-go-sdk/v65/generativeaiinference"
-	"strings"
-)
-
-const ociClientName = "oci"
-
-type OCIGenAIClient struct {
-	nopCloser
-
-	client        *generativeaiinference.GenerativeAiInferenceClient
-	model         string
-	compartmentId string
-	temperature   float32
-	topP          float32
-	maxTokens     int
-}
-
-func (c *OCIGenAIClient) GetName() string {
-	return ociClientName
-}
-
-func (c *OCIGenAIClient) Configure(config IAIConfig) error {
-	config.GetEndpointName()
-	c.model = config.GetModel()
-	c.temperature = config.GetTemperature()
-	c.topP = config.GetTopP()
-	c.maxTokens = config.GetMaxTokens()
-	c.compartmentId = config.GetCompartmentId()
-	provider := common.DefaultConfigProvider()
-	client, err := generativeaiinference.NewGenerativeAiInferenceClientWithConfigurationProvider(provider)
-	if err != nil {
-		return err
-	}
-	c.client = &client
-	return nil
-}
-
-func (c *OCIGenAIClient) GetCompletion(ctx context.Context, prompt string) (string, error) {
-	generateTextRequest := c.newGenerateTextRequest(prompt)
-	generateTextResponse, err := c.client.GenerateText(ctx, generateTextRequest)
-	if err != nil {
-		return "", err
-	}
-	return extractGeneratedText(generateTextResponse.InferenceResponse)
-}
-
-func (c *OCIGenAIClient) newGenerateTextRequest(prompt string) generativeaiinference.GenerateTextRequest {
-	temperatureF64 := float64(c.temperature)
-	topPF64 := float64(c.topP)
-	return generativeaiinference.GenerateTextRequest{
-		GenerateTextDetails: generativeaiinference.GenerateTextDetails{
-			CompartmentId: &c.compartmentId,
-			ServingMode: generativeaiinference.OnDemandServingMode{
-				ModelId: &c.model,
-			},
-			InferenceRequest: generativeaiinference.CohereLlmInferenceRequest{
-				Prompt:      &prompt,
-				MaxTokens:   &c.maxTokens,
-				Temperature: &temperatureF64,
-				TopP:        &topPF64,
-			},
-		},
-	}
-}
-
-func extractGeneratedText(llmInferenceResponse generativeaiinference.LlmInferenceResponse) (string, error) {
-	response, ok := llmInferenceResponse.(generativeaiinference.CohereLlmInferenceResponse)
-	if !ok {
-		return "", errors.New("failed to extract generated text from backed response")
-	}
-	sb := strings.Builder{}
-	for _, text := range response.GeneratedTexts {
-		if text.Text != nil {
-			sb.WriteString(*text.Text)
-		}
-	}
-	return sb.String(), nil
-}

pkg/ai/ollama.go

@@ -1,102 +0,0 @@
-/*
-Copyright 2023 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package ai
-
-import (
-	"context"
-	"errors"
-	"net/http"
-	"net/url"
-
-	ollama "github.com/ollama/ollama/api"
-)
-
-const ollamaClientName = "ollama"
-
-type OllamaClient struct {
-	nopCloser
-
-	client      *ollama.Client
-	model       string
-	temperature float32
-	topP        float32
-}
-
-const (
-	defaultBaseURL = "http://localhost:11434"
-	defaultModel   = "llama3"
-)
-
-func (c *OllamaClient) Configure(config IAIConfig) error {
-	baseURL := config.GetBaseURL()
-	if baseURL == "" {
-		baseURL = defaultBaseURL
-	}
-	baseClientURL, err := url.Parse(baseURL)
-	if err != nil {
-		return err
-	}
-
-	proxyEndpoint := config.GetProxyEndpoint()
-	httpClient := http.DefaultClient
-	if proxyEndpoint != "" {
-		proxyUrl, err := url.Parse(proxyEndpoint)
-		if err != nil {
-			return err
-		}
-		transport := &http.Transport{
-			Proxy: http.ProxyURL(proxyUrl),
-		}
-
-		httpClient = &http.Client{
-			Transport: transport,
-		}
-	}
-
-	c.client = ollama.NewClient(baseClientURL, httpClient)
-	if c.client == nil {
-		return errors.New("error creating Ollama client")
-	}
-	c.model = config.GetModel()
-	if c.model == "" {
-		c.model = defaultModel
-	}
-	c.temperature = config.GetTemperature()
-	c.topP = config.GetTopP()
-	return nil
-}
-func (c *OllamaClient) GetCompletion(ctx context.Context, prompt string) (string, error) {
-	req := &ollama.GenerateRequest{
-		Model:  c.model,
-		Prompt: prompt,
-		Stream: new(bool),
-		Options: map[string]interface{}{
-			"temperature": c.temperature,
-			"top_p":       c.topP,
-		},
-	}
-	completion := ""
-	respFunc := func(resp ollama.GenerateResponse) error {
-		completion = resp.Response
-		return nil
-	}
-	err := c.client.Generate(ctx, req, respFunc)
-	if err != nil {
-		return "", err
-	}
-	return completion, nil
-}
-func (a *OllamaClient) GetName() string {
-	return ollamaClientName
-}

pkg/ai/openai.go

@@ -15,72 +15,41 @@ package ai
 
 import (
 	"context"
+	"encoding/base64"
 	"errors"
-	"net/http"
-	"net/url"
+	"fmt"
+	"strings"
+
+	"github.com/k8sgpt-ai/k8sgpt/pkg/cache"
+	"github.com/k8sgpt-ai/k8sgpt/pkg/util"
 
 	"github.com/sashabaranov/go-openai"
-)
 
-const openAIClientName = "openai"
+	"github.com/fatih/color"
+)
 
 type OpenAIClient struct {
-	nopCloser
-
-	client      *openai.Client
-	model       string
-	temperature float32
-	topP        float32
-	// organizationId string
+	client   *openai.Client
+	language string
+	model    string
 }
 
-const (
-	// OpenAI completion parameters
-	maxToken         = 2048
-	presencePenalty  = 0.0
-	frequencyPenalty = 0.0
-)
-
-func (c *OpenAIClient) Configure(config IAIConfig) error {
+func (c *OpenAIClient) Configure(config IAIConfig, language string) error {
 	token := config.GetPassword()
 	defaultConfig := openai.DefaultConfig(token)
-	orgId := config.GetOrganizationId()
-	proxyEndpoint := config.GetProxyEndpoint()
 
 	baseURL := config.GetBaseURL()
 	if baseURL != "" {
 		defaultConfig.BaseURL = baseURL
 	}
 
-	transport := &http.Transport{}
-	if proxyEndpoint != "" {
-		proxyUrl, err := url.Parse(proxyEndpoint)
-		if err != nil {
-			return err
-		}
-		transport.Proxy = http.ProxyURL(proxyUrl)
-	}
-
-	if orgId != "" {
-		defaultConfig.OrgID = orgId
-	}
-
-	customHeaders := config.GetCustomHeaders()
-	defaultConfig.HTTPClient = &http.Client{
-		Transport: &OpenAIHeaderTransport{
-			Origin:  transport,
-			Headers: customHeaders,
-		},
-	}
-
 	client := openai.NewClientWithConfig(defaultConfig)
 	if client == nil {
 		return errors.New("error creating OpenAI client")
 	}
+	c.language = language
 	c.client = client
 	c.model = config.GetModel()
-	c.temperature = config.GetTemperature()
-	c.topP = config.GetTopP()
 	return nil
 }
 
@@ -91,14 +60,9 @@ func (c *OpenAIClient) GetCompletion(ctx context.Context, prompt string) (string
 		Messages: []openai.ChatCompletionMessage{
 			{
 				Role:    "user",
-				Content: prompt,
+				Content: fmt.Sprintf(default_prompt, c.language, prompt),
 			},
 		},
-		Temperature:      c.temperature,
-		MaxTokens:        maxToken,
-		PresencePenalty:  presencePenalty,
-		FrequencyPenalty: frequencyPenalty,
-		TopP:             c.topP,
 	})
 	if err != nil {
 		return "", err
@@ -106,28 +70,42 @@ func (c *OpenAIClient) GetCompletion(ctx context.Context, prompt string) (string
 	return resp.Choices[0].Message.Content, nil
 }
 
-func (c *OpenAIClient) GetName() string {
-	return openAIClientName
-}
+func (a *OpenAIClient) Parse(ctx context.Context, prompt []string, cache cache.ICache) (string, error) {
+	inputKey := strings.Join(prompt, " ")
+	// Check for cached data
+	cacheKey := util.GetCacheKey(a.GetName(), a.language, inputKey)
 
-// OpenAIHeaderTransport is an http.RoundTripper that adds the given headers to each request.
-type OpenAIHeaderTransport struct {
-	Origin  http.RoundTripper
-	Headers []http.Header
-}
+	if !cache.IsCacheDisabled() && cache.Exists(cacheKey) {
+		response, err := cache.Load(cacheKey)
+		if err != nil {
+			return "", err
+		}
 
-// RoundTrip implements the http.RoundTripper interface.
-func (t *OpenAIHeaderTransport) RoundTrip(req *http.Request) (*http.Response, error) {
-	// Clone the request to avoid modifying the original request
-	clonedReq := req.Clone(req.Context())
-	for _, header := range t.Headers {
-		for key, values := range header {
-			// Possible values per header:  RFC 2616
-			for _, value := range values {
-				clonedReq.Header.Add(key, value)
+		if response != "" {
+			output, err := base64.StdEncoding.DecodeString(response)
+			if err != nil {
+				color.Red("error decoding cached data: %v", err)
+				return "", nil
 			}
+			return string(output), nil
 		}
 	}
 
-	return t.Origin.RoundTrip(clonedReq)
+	response, err := a.GetCompletion(ctx, inputKey)
+	if err != nil {
+		return "", err
+	}
+
+	err = cache.Store(cacheKey, base64.StdEncoding.EncodeToString([]byte(response)))
+
+	if err != nil {
+		color.Red("error storing value to cache: %v", err)
+		return "", nil
+	}
+
+	return response, nil
+}
+
+func (a *OpenAIClient) GetName() string {
+	return "openai"
 }

pkg/ai/openai_header_transport_test.go

@@ -1,106 +0,0 @@
-package ai
-
-import (
-	"context"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-// Mock configuration
-type mockConfig struct {
-	baseURL string
-}
-
-func (m *mockConfig) GetPassword() string {
-	return ""
-}
-
-func (m *mockConfig) GetOrganizationId() string {
-	return ""
-}
-
-func (m *mockConfig) GetProxyEndpoint() string {
-	return ""
-}
-
-func (m *mockConfig) GetBaseURL() string {
-	return m.baseURL
-}
-
-func (m *mockConfig) GetCustomHeaders() []http.Header {
-	return []http.Header{
-		{"X-Custom-Header-1": []string{"Value1"}},
-		{"X-Custom-Header-2": []string{"Value2"}},
-		{"X-Custom-Header-2": []string{"Value3"}}, // Testing multiple values for the same header
-	}
-}
-
-func (m *mockConfig) GetModel() string {
-	return ""
-}
-
-func (m *mockConfig) GetTemperature() float32 {
-	return 0.0
-}
-
-func (m *mockConfig) GetTopP() float32 {
-	return 0.0
-}
-func (m *mockConfig) GetCompartmentId() string {
-	return ""
-}
-
-func (m *mockConfig) GetTopK() int32 {
-	return 0.0
-}
-
-func (m *mockConfig) GetMaxTokens() int {
-	return 0
-}
-
-func (m *mockConfig) GetEndpointName() string {
-	return ""
-}
-func (m *mockConfig) GetEngine() string {
-	return ""
-}
-
-func (m *mockConfig) GetProviderId() string {
-	return ""
-}
-
-func (m *mockConfig) GetProviderRegion() string {
-	return ""
-}
-
-func TestOpenAIClient_CustomHeaders(t *testing.T) {
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		assert.Equal(t, "Value1", r.Header.Get("X-Custom-Header-1"))
-		assert.ElementsMatch(t, []string{"Value2", "Value3"}, r.Header["X-Custom-Header-2"])
-		w.WriteHeader(http.StatusOK)
-		// Mock response for openai completion
-		mockResponse := `{"choices": [{"message": {"content": "test"}}]}`
-		n, err := w.Write([]byte(mockResponse))
-		if err != nil {
-			t.Fatalf("error writing response: %v", err)
-		}
-		if n != len(mockResponse) {
-			t.Fatalf("expected to write %d bytes but wrote %d bytes", len(mockResponse), n)
-		}
-	}))
-	defer server.Close()
-
-	config := &mockConfig{baseURL: server.URL}
-
-	client := &OpenAIClient{}
-	err := client.Configure(config)
-	assert.NoError(t, err)
-
-	// Make a completion request to trigger the headers
-	ctx := context.Background()
-	_, err = client.GetCompletion(ctx, "foo prompt")
-	assert.NoError(t, err)
-}

pkg/ai/prompts.go

@@ -1,69 +1,5 @@
 package ai
 
 const (
-	default_prompt = `Simplify the following Kubernetes error message delimited by triple dashes written in --- %s --- language; --- %s ---.
-	Provide the most possible solution in a step by step style in no more than 280 characters. Write the output in the following format:
-	Error: {Explain error here}
-	Solution: {Step by step solution here}
-	`
-
-	prom_conf_prompt = `Simplify the following Prometheus error message delimited by triple dashes written in --- %s --- language; --- %s ---.
-	This error came when validating the Prometheus configuration file.
-	Provide step by step instructions to fix, with suggestions, referencing Prometheus documentation if relevant.
-	Write the output in the following format in no more than 300 characters:
-	Error: {Explain error here}
-	Solution: {Step by step solution here}
-	`
-
-	prom_relabel_prompt = `
-	Return your prompt in this language: %s, beginning with
-	The following is a list of the form:
-	job_name:
-	{Prometheus job_name}
-	relabel_configs:
-	{Prometheus relabel_configs}
-	kubernetes_sd_configs:
-	{Prometheus service discovery config}
-	---
-	%s
-	---
-	For each job_name, describe the Kubernetes service and pod labels,
-	namespaces, ports, and containers they match.
-	Return the message:
-	Discovered and parsed Prometheus scrape configurations.
-	For targets to be scraped by Prometheus, ensure they are running with
-	at least one of the following label sets:
-	Then for each job, write this format:
-	- Job: {job_name}
-	  - Service Labels:
-	    - {list of service labels}
-	  - Pod Labels:
-	    - {list of pod labels}
-	  - Namespaces:
-	    - {list of namespaces}
-	  - Ports:
-	    - {list of ports}
-	  - Containers:
-	    - {list of container names}
-	`
-
-	kyverno_prompt = `Simplify the following Kyverno warnings message delimited by triple dashes written in --- %s --- language; --- %s ---.
-	Provide the most probable solution as a kubectl command. 
-
-	Write the output in the following format, for the solution, only show the kubectl command:
-	
-	Error: {Explain error here}
-
-	Solution: {kubectl command}
-	`
-	raw_promt = `{"language": "%s","message": "%s","prompt": "%s"}`
+	default_prompt = "Simplify the following Kubernetes error message and provide a solution in %s: %s"
 )
-
-var PromptMap = map[string]string{
-	"raw":                           raw_promt,
-	"default":                       default_prompt,
-	"PrometheusConfigValidate":      prom_conf_prompt,
-	"PrometheusConfigRelabelReport": prom_relabel_prompt,
-	"PolicyReport":                  kyverno_prompt,
-	"ClusterPolicyReport":           kyverno_prompt,
-}

pkg/ai/watsonxai.go

@@ -1,86 +0,0 @@
-package ai
-
-import (
-	"context"
-	"errors"
-	"fmt"
-
-	wx "github.com/IBM/watsonx-go/pkg/models"
-)
-
-const ibmWatsonxAIClientName = "ibmwatsonxai"
-
-type IBMWatsonxAIClient struct {
-	nopCloser
-
-	client       *wx.Client
-	model        string
-	temperature  float32
-	topP         float32
-	topK         int32
-	maxNewTokens int
-}
-
-const (
-	modelMetallama = "ibm/granite-13b-chat-v2"
-	maxTokens      = 2048
-)
-
-func (c *IBMWatsonxAIClient) Configure(config IAIConfig) error {
-	if config.GetModel() == "" {
-		c.model = modelMetallama
-	} else {
-		c.model = config.GetModel()
-	}
-	if config.GetMaxTokens() == 0 {
-		c.maxNewTokens = maxTokens
-	} else {
-		c.maxNewTokens = config.GetMaxTokens()
-	}
-	c.temperature = config.GetTemperature()
-	c.topP = config.GetTopP()
-	c.topK = config.GetTopK()
-
-	apiKey := config.GetPassword()
-	if apiKey == "" {
-		return errors.New("No watsonx API key provided")
-	}
-
-	projectId := config.GetProviderId()
-	if projectId == "" {
-		return errors.New("No watsonx project ID provided")
-	}
-
-	client, err := wx.NewClient(
-		wx.WithWatsonxAPIKey(apiKey),
-		wx.WithWatsonxProjectID(projectId),
-	)
-	if err != nil {
-		return fmt.Errorf("Failed to create client for testing. Error: %v", err)
-	}
-	c.client = client
-
-	return nil
-}
-
-func (c *IBMWatsonxAIClient) GetCompletion(ctx context.Context, prompt string) (string, error) {
-	result, err := c.client.GenerateText(
-		c.model,
-		prompt,
-		wx.WithTemperature((float64)(c.temperature)),
-		wx.WithTopP((float64)(c.topP)),
-		wx.WithTopK((uint)(c.topK)),
-		wx.WithMaxNewTokens((uint)(c.maxNewTokens)),
-	)
-	if err != nil {
-		return "", fmt.Errorf("Expected no error, but got an error: %v", err)
-	}
-	if result.Text == "" {
-		return "", errors.New("Expected a result, but got an empty string")
-	}
-	return result.Text, nil
-}
-
-func (c *IBMWatsonxAIClient) GetName() string {
-	return ibmWatsonxAIClientName
-}

pkg/analysis/analysis.go

@@ -15,20 +15,18 @@ package analysis
 
 import (
 	"context"
-	"encoding/base64"
 	"errors"
 	"fmt"
+	"os"
+	"reflect"
 	"strings"
 	"sync"
-	"time"
 
 	"github.com/fatih/color"
-	openapi_v2 "github.com/google/gnostic/openapiv2"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/ai"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/analyzer"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/cache"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/custom"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/util"
 	"github.com/schollz/progressbar/v3"
@@ -36,28 +34,18 @@ import (
 )
 
 type Analysis struct {
-	Context            context.Context
-	Filters            []string
-	Client             *kubernetes.Client
-	Language           string
-	AIClient           ai.IAI
-	Results            []common.Result
-	Errors             []string
-	Namespace          string
-	LabelSelector      string
-	Cache              cache.ICache
-	Explain            bool
-	MaxConcurrency     int
-	AnalysisAIProvider string // The name of the AI Provider used for this analysis
-	WithDoc            bool
-	WithStats          bool
-	Stats              []common.AnalysisStats
+	Context        context.Context
+	Filters        []string
+	Client         *kubernetes.Client
+	AIClient       ai.IAI
+	Results        []common.Result
+	Namespace      string
+	Cache          cache.ICache
+	Explain        bool
+	MaxConcurrency int
 }
 
-type (
-	AnalysisStatus string
-	AnalysisErrors []string
-)
+type AnalysisStatus string
 
 const (
 	StateOK              AnalysisStatus = "OK"
@@ -65,80 +53,22 @@ const (
 )
 
 type JsonOutput struct {
-	Provider string          `json:"provider"`
-	Errors   AnalysisErrors  `json:"errors"`
 	Status   AnalysisStatus  `json:"status"`
 	Problems int             `json:"problems"`
 	Results  []common.Result `json:"results"`
 }
 
-func NewAnalysis(
-	backend string,
-	language string,
-	filters []string,
-	namespace string,
-	labelSelector string,
-	noCache bool,
-	explain bool,
-	maxConcurrency int,
-	withDoc bool,
-	interactiveMode bool,
-	httpHeaders []string,
-	withStats bool,
-) (*Analysis, error) {
-	// Get kubernetes client from viper.
-	kubecontext := viper.GetString("kubecontext")
-	kubeconfig := viper.GetString("kubeconfig")
-	client, err := kubernetes.NewClient(kubecontext, kubeconfig)
-	if err != nil {
-		return nil, fmt.Errorf("initialising kubernetes client: %w", err)
-	}
-
-	// Load remote cache if it is configured.
-	cache, err := cache.GetCacheConfiguration()
-	if err != nil {
-		return nil, err
-	}
-
-	if noCache {
-		cache.DisableCache()
-	}
-
-	a := &Analysis{
-		Context:        context.Background(),
-		Filters:        filters,
-		Client:         client,
-		Language:       language,
-		Namespace:      namespace,
-		LabelSelector:  labelSelector,
-		Cache:          cache,
-		Explain:        explain,
-		MaxConcurrency: maxConcurrency,
-		WithDoc:        withDoc,
-		WithStats:      withStats,
-	}
-	if !explain {
-		// Return early if AI use was not requested.
-		return a, nil
-	}
-
+func NewAnalysis(backend string, language string, filters []string, namespace string, noCache bool, explain bool, maxConcurrency int) (*Analysis, error) {
 	var configAI ai.AIConfiguration
-	if err := viper.UnmarshalKey("ai", &configAI); err != nil {
-		return nil, err
+	err := viper.UnmarshalKey("ai", &configAI)
+	if err != nil {
+		color.Red("Error: %v", err)
+		os.Exit(1)
 	}
 
-	if len(configAI.Providers) == 0 {
-		return nil, errors.New("AI provider not specified in configuration. Please run k8sgpt auth")
-	}
-
-	// Backend string will have high priority than a default provider
-	// Hence, use the default provider only if the backend is not specified by the user.
-	if configAI.DefaultProvider != "" && backend == "" {
-		backend = configAI.DefaultProvider
-	}
-
-	if backend == "" {
-		backend = "openai"
+	if len(configAI.Providers) == 0 && explain {
+		color.Red("Error: AI provider not specified in configuration. Please run k8sgpt auth")
+		os.Exit(1)
 	}
 
 	var aiProvider ai.AIProvider
@@ -150,178 +80,133 @@ func NewAnalysis(
 	}
 
 	if aiProvider.Name == "" {
-		return nil, fmt.Errorf("AI provider %s not specified in configuration. Please run k8sgpt auth", backend)
+		color.Red("Error: AI provider %s not specified in configuration. Please run k8sgpt auth", backend)
+		return nil, errors.New("AI provider not specified in configuration")
 	}
 
 	aiClient := ai.NewClient(aiProvider.Name)
-	customHeaders := util.NewHeaders(httpHeaders)
-	aiProvider.CustomHeaders = customHeaders
-	if err := aiClient.Configure(&aiProvider); err != nil {
+	if err := aiClient.Configure(&aiProvider, language); err != nil {
+		color.Red("Error: %v", err)
 		return nil, err
 	}
-	a.AIClient = aiClient
-	a.AnalysisAIProvider = aiProvider.Name
-	return a, nil
-}
 
-func (a *Analysis) CustomAnalyzersAreAvailable() bool {
-	var customAnalyzers []custom.CustomAnalyzer
-	if err := viper.UnmarshalKey("custom_analyzers", &customAnalyzers); err != nil {
-		return false
-	}
-	return len(customAnalyzers) > 0
-}
+	ctx := context.Background()
+	// Get kubernetes client from viper
 
-func (a *Analysis) RunCustomAnalysis() {
-	var customAnalyzers []custom.CustomAnalyzer
-	if err := viper.UnmarshalKey("custom_analyzers", &customAnalyzers); err != nil {
-		a.Errors = append(a.Errors, err.Error())
-		return
+	kubecontext := viper.GetString("kubecontext")
+	kubeconfig := viper.GetString("kubeconfig")
+	client, err := kubernetes.NewClient(kubecontext, kubeconfig)
+	if err != nil {
+		color.Red("Error initialising kubernetes client: %v", err)
+		return nil, err
 	}
 
-	semaphore := make(chan struct{}, a.MaxConcurrency)
-	var wg sync.WaitGroup
-	var mutex sync.Mutex
-	for _, cAnalyzer := range customAnalyzers {
-		wg.Add(1)
-		semaphore <- struct{}{}
-		go func(analyzer custom.CustomAnalyzer, wg *sync.WaitGroup, semaphore chan struct{}) {
-			defer wg.Done()
-			canClient, err := custom.NewClient(cAnalyzer.Connection)
-			if err != nil {
-				mutex.Lock()
-				a.Errors = append(a.Errors, fmt.Sprintf("Client creation error for %s analyzer", cAnalyzer.Name))
-				mutex.Unlock()
-				return
-			}
-
-			result, err := canClient.Run()
-			if result.Kind == "" {
-				// for custom analyzer name, we must use a lowercase RFC 1123 subdomain must consist of lower case alphanumeric characters, '-' or '.',
-				//and must start and end with an alphanumeric character (e.g. 'example.com',
-				//regex used for validation is '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*')
-				result.Kind = cAnalyzer.Name
-			}
-			if err != nil {
-				mutex.Lock()
-				a.Errors = append(a.Errors, fmt.Sprintf("[%s] %s", cAnalyzer.Name, err))
-				mutex.Unlock()
-			} else {
-				mutex.Lock()
-				a.Results = append(a.Results, result)
-				mutex.Unlock()
-			}
-			<-semaphore
-		}(cAnalyzer, &wg, semaphore)
-	}
-	wg.Wait()
+	return &Analysis{
+		Context:        ctx,
+		Filters:        filters,
+		Client:         client,
+		AIClient:       aiClient,
+		Namespace:      namespace,
+		Cache:          cache.New(noCache),
+		Explain:        explain,
+		MaxConcurrency: maxConcurrency,
+	}, nil
 }
 
-func (a *Analysis) RunAnalysis() {
+func (a *Analysis) RunAnalysis() []error {
 	activeFilters := viper.GetStringSlice("active_filters")
 
-	coreAnalyzerMap, analyzerMap := analyzer.GetAnalyzerMap()
-
-	// we get the openapi schema from the server only if required by the flag "with-doc"
-	openapiSchema := &openapi_v2.Document{}
-	if a.WithDoc {
-		var openApiErr error
-
-		openapiSchema, openApiErr = a.Client.Client.Discovery().OpenAPISchema()
-		if openApiErr != nil {
-			a.Errors = append(a.Errors, fmt.Sprintf("[KubernetesDoc] %s", openApiErr))
-		}
-	}
+	analyzerMap := analyzer.GetAnalyzerMap()
 
 	analyzerConfig := common.Analyzer{
-		Client:        a.Client,
-		Context:       a.Context,
-		Namespace:     a.Namespace,
-		LabelSelector: a.LabelSelector,
-		AIClient:      a.AIClient,
-		OpenapiSchema: openapiSchema,
+		Client:    a.Client,
+		Context:   a.Context,
+		Namespace: a.Namespace,
+		AIClient:  a.AIClient,
 	}
 
+	var errorList []error
 	semaphore := make(chan struct{}, a.MaxConcurrency)
-	var wg sync.WaitGroup
-	var mutex sync.Mutex
-	// if there are no filters selected and no active_filters then run coreAnalyzer
+	// if there are no filters selected and no active_filters then run all of them
 	if len(a.Filters) == 0 && len(activeFilters) == 0 {
-		for name, analyzer := range coreAnalyzerMap {
+		var wg sync.WaitGroup
+		var mutex sync.Mutex
+		for _, analyzer := range analyzerMap {
 			wg.Add(1)
 			semaphore <- struct{}{}
-			go a.executeAnalyzer(analyzer, name, analyzerConfig, semaphore, &wg, &mutex)
+			go func(analyzer common.IAnalyzer, wg *sync.WaitGroup, semaphore chan struct{}) {
+				defer wg.Done()
+				results, err := analyzer.Analyze(analyzerConfig)
+				if err != nil {
+					mutex.Lock()
+					errorList = append(errorList, fmt.Errorf(fmt.Sprintf("[%s] %s", reflect.TypeOf(analyzer).Name(), err)))
+					mutex.Unlock()
+				}
+				mutex.Lock()
+				a.Results = append(a.Results, results...)
+				mutex.Unlock()
+				<-semaphore
+			}(analyzer, &wg, semaphore)
 
 		}
 		wg.Wait()
-		return
+		return errorList
 	}
+	semaphore = make(chan struct{}, a.MaxConcurrency)
 	// if the filters flag is specified
 	if len(a.Filters) != 0 {
+		var wg sync.WaitGroup
+		var mutex sync.Mutex
 		for _, filter := range a.Filters {
 			if analyzer, ok := analyzerMap[filter]; ok {
 				semaphore <- struct{}{}
 				wg.Add(1)
-				go a.executeAnalyzer(analyzer, filter, analyzerConfig, semaphore, &wg, &mutex)
+				go func(analyzer common.IAnalyzer, filter string) {
+					defer wg.Done()
+					results, err := analyzer.Analyze(analyzerConfig)
+					if err != nil {
+						mutex.Lock()
+						errorList = append(errorList, fmt.Errorf(fmt.Sprintf("[%s] %s", filter, err)))
+						mutex.Unlock()
+					}
+					mutex.Lock()
+					a.Results = append(a.Results, results...)
+					mutex.Unlock()
+					<-semaphore
+				}(analyzer, filter)
 			} else {
-				a.Errors = append(a.Errors, fmt.Sprintf("\"%s\" filter does not exist. Please run k8sgpt filters list.", filter))
+				errorList = append(errorList, fmt.Errorf(fmt.Sprintf("\"%s\" filter does not exist. Please run k8sgpt filters list.", filter)))
 			}
 		}
 		wg.Wait()
-		return
+		return errorList
 	}
 
+	var wg sync.WaitGroup
+	var mutex sync.Mutex
+	semaphore = make(chan struct{}, a.MaxConcurrency)
 	// use active_filters
 	for _, filter := range activeFilters {
 		if analyzer, ok := analyzerMap[filter]; ok {
 			semaphore <- struct{}{}
 			wg.Add(1)
-			go a.executeAnalyzer(analyzer, filter, analyzerConfig, semaphore, &wg, &mutex)
+			go func(analyzer common.IAnalyzer, filter string) {
+				defer wg.Done()
+				results, err := analyzer.Analyze(analyzerConfig)
+				if err != nil {
+					mutex.Lock()
+					errorList = append(errorList, fmt.Errorf("[%s] %s", filter, err))
+					mutex.Unlock()
+				}
+				mutex.Lock()
+				a.Results = append(a.Results, results...)
+				mutex.Unlock()
+				<-semaphore
+			}(analyzer, filter)
 		}
 	}
 	wg.Wait()
-}
-
-func (a *Analysis) executeAnalyzer(analyzer common.IAnalyzer, filter string, analyzerConfig common.Analyzer, semaphore chan struct{}, wg *sync.WaitGroup, mutex *sync.Mutex) {
-	defer wg.Done()
-
-	var startTime time.Time
-	var elapsedTime time.Duration
-
-	// Start the timer
-	if a.WithStats {
-		startTime = time.Now()
-	}
-
-	// Run the analyzer
-	results, err := analyzer.Analyze(analyzerConfig)
-	if err != nil {
-		fmt.Println(err)
-	}
-	// Measure the time taken
-	if a.WithStats {
-		elapsedTime = time.Since(startTime)
-	}
-	stat := common.AnalysisStats{
-		Analyzer:     filter,
-		DurationTime: elapsedTime,
-	}
-
-	mutex.Lock()
-	defer mutex.Unlock()
-
-	if err != nil {
-		if a.WithStats {
-			a.Stats = append(a.Stats, stat)
-		}
-		a.Errors = append(a.Errors, fmt.Sprintf("[%s] %s", filter, err))
-	} else {
-		if a.WithStats {
-			a.Stats = append(a.Stats, stat)
-		}
-		a.Results = append(a.Results, results...)
-	}
-	<-semaphore
+	return errorList
 }
 
 func (a *Analysis) GetAIResults(output string, anonymize bool) error {
@@ -345,85 +230,35 @@ func (a *Analysis) GetAIResults(output string, anonymize bool) error {
 			}
 			texts = append(texts, failure.Text)
 		}
-
-		promptTemplate := ai.PromptMap["default"]
-		// If the resource `Kind` comes from an "integration plugin",
-		// maybe a customized prompt template will be involved.
-		if prompt, ok := ai.PromptMap[analysis.Kind]; ok {
-			promptTemplate = prompt
-		}
-		result, err := a.getAIResultForSanitizedFailures(texts, promptTemplate)
+		parsedText, err := a.AIClient.Parse(a.Context, texts, a.Cache)
 		if err != nil {
 			// FIXME: can we avoid checking if output is json multiple times?
 			//   maybe implement the progress bar better?
 			if output != "json" {
-				_ = bar.Exit()
+				bar.Exit()
 			}
 
-			// Check for exhaustion.
+			// Check for exhaustion
 			if strings.Contains(err.Error(), "status code: 429") {
 				return fmt.Errorf("exhausted API quota for AI provider %s: %v", a.AIClient.GetName(), err)
+			} else {
+				return fmt.Errorf("failed while calling AI provider %s: %v", a.AIClient.GetName(), err)
 			}
-			return fmt.Errorf("failed while calling AI provider %s: %v", a.AIClient.GetName(), err)
 		}
 
 		if anonymize {
 			for _, failure := range analysis.Error {
 				for _, s := range failure.Sensitive {
-					result = strings.ReplaceAll(result, s.Masked, s.Unmasked)
+					parsedText = strings.ReplaceAll(parsedText, s.Masked, s.Unmasked)
 				}
 			}
 		}
 
-		analysis.Details = result
+		analysis.Details = parsedText
 		if output != "json" {
-			_ = bar.Add(1)
+			bar.Add(1)
 		}
 		a.Results[index] = analysis
 	}
 	return nil
 }
-
-func (a *Analysis) getAIResultForSanitizedFailures(texts []string, promptTmpl string) (string, error) {
-	inputKey := strings.Join(texts, " ")
-	// Check for cached data.
-	// TODO(bwplotka): This might depend on model too (or even other client configuration pieces), fix it in later PRs.
-	cacheKey := util.GetCacheKey(a.AIClient.GetName(), a.Language, inputKey)
-
-	if !a.Cache.IsCacheDisabled() && a.Cache.Exists(cacheKey) {
-		response, err := a.Cache.Load(cacheKey)
-		if err != nil {
-			return "", err
-		}
-
-		if response != "" {
-			output, err := base64.StdEncoding.DecodeString(response)
-			if err == nil {
-				return string(output), nil
-			}
-			color.Red("error decoding cached data; ignoring cache item: %v", err)
-		}
-	}
-
-	// Process template.
-	prompt := fmt.Sprintf(strings.TrimSpace(promptTmpl), a.Language, inputKey)
-	if a.AIClient.GetName() == ai.CustomRestClientName {
-		prompt = fmt.Sprintf(ai.PromptMap["raw"], a.Language, inputKey, prompt)
-	}
-	response, err := a.AIClient.GetCompletion(a.Context, prompt)
-	if err != nil {
-		return "", err
-	}
-
-	if err = a.Cache.Store(cacheKey, base64.StdEncoding.EncodeToString([]byte(response))); err != nil {
-		color.Red("error storing value to cache; value won't be cached: %v", err)
-	}
-	return response, nil
-}
-
-func (a *Analysis) Close() {
-	if a.AIClient == nil {
-		return
-	}
-	a.AIClient.Close()
-}

pkg/analysis/analysis_test.go

@@ -14,135 +14,14 @@ limitations under the License.
 package analysis
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
-	"strings"
 	"testing"
 
-	"github.com/k8sgpt-ai/k8sgpt/pkg/ai"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/cache"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
-	"github.com/magiconair/properties/assert"
-	"github.com/spf13/viper"
 	"github.com/stretchr/testify/require"
-	v1 "k8s.io/api/core/v1"
-	networkingv1 "k8s.io/api/networking/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/kubernetes/fake"
 )
 
-// sub-function
-func analysis_RunAnalysisFilterTester(t *testing.T, filterFlag string) []common.Result {
-	clientset := fake.NewSimpleClientset(
-		&v1.Pod{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "example",
-				Namespace: "default",
-			},
-			Status: v1.PodStatus{
-				Phase: v1.PodPending,
-				Conditions: []v1.PodCondition{
-					{
-						Type:    v1.PodScheduled,
-						Reason:  "Unschedulable",
-						Message: "0/1 nodes are available: 1 node(s) had taint {node-role.kubernetes.io/master: }, that the pod didn't tolerate.",
-					},
-				},
-			},
-		},
-		&v1.Endpoints{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:        "example",
-				Namespace:   "default",
-				Annotations: map[string]string{},
-			},
-		},
-		&v1.Service{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:        "example",
-				Namespace:   "default",
-				Annotations: map[string]string{},
-			},
-			Spec: v1.ServiceSpec{
-				Selector: map[string]string{
-					"app": "example",
-				},
-			},
-		},
-		&networkingv1.Ingress{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:        "example",
-				Namespace:   "default",
-				Annotations: map[string]string{},
-			},
-		},
-	)
-
-	analysis := Analysis{
-		Context:        context.Background(),
-		Results:        []common.Result{},
-		Namespace:      "default",
-		MaxConcurrency: 1,
-		Client: &kubernetes.Client{
-			Client: clientset,
-		},
-		WithDoc: true,
-	}
-	if len(filterFlag) > 0 {
-		// `--filter` is explicitly given
-		analysis.Filters = strings.Split(filterFlag, ",")
-	}
-	analysis.RunAnalysis()
-	return analysis.Results
-
-}
-
-// Test: Filter logic with running different Analyzers
-func TestAnalysis_RunAnalysisWithFilter(t *testing.T) {
-	var results []common.Result
-	var filterFlag string
-
-	//1. Neither --filter flag Nor active filter is specified, only the "core analyzers"
-	results = analysis_RunAnalysisFilterTester(t, "")
-	assert.Equal(t, len(results), 3) // all built-in resource will be analyzed
-
-	//2. When the --filter flag is specified
-
-	filterFlag = "Pod" // --filter=Pod
-	results = analysis_RunAnalysisFilterTester(t, filterFlag)
-	assert.Equal(t, len(results), 1)
-	assert.Equal(t, results[0].Kind, filterFlag)
-
-	filterFlag = "Ingress,Pod" // --filter=Ingress,Pod
-	results = analysis_RunAnalysisFilterTester(t, filterFlag)
-	assert.Equal(t, len(results), 2)
-}
-
-// Test:  Filter logic with Active Filter
-func TestAnalysis_RunAnalysisActiveFilter(t *testing.T) {
-
-	//When the --filter flag is not specified but has actived filter in config
-	var results []common.Result
-
-	viper.SetDefault("active_filters", "Ingress")
-	results = analysis_RunAnalysisFilterTester(t, "")
-	assert.Equal(t, len(results), 1)
-
-	viper.SetDefault("active_filters", []string{"Ingress", "Service"})
-	results = analysis_RunAnalysisFilterTester(t, "")
-	assert.Equal(t, len(results), 2)
-
-	viper.SetDefault("active_filters", []string{"Ingress", "Service", "Pod"})
-	results = analysis_RunAnalysisFilterTester(t, "")
-	assert.Equal(t, len(results), 3)
-
-	// Invalid filter
-	results = analysis_RunAnalysisFilterTester(t, "invalid")
-	assert.Equal(t, len(results), 0)
-}
-
 func TestAnalysis_NoProblemJsonOutput(t *testing.T) {
 
 	analysis := Analysis{
@@ -171,7 +50,6 @@ func TestAnalysis_NoProblemJsonOutput(t *testing.T) {
 	fmt.Println(expected)
 
 	require.Equal(t, got, expected)
-
 }
 
 func TestAnalysis_ProblemJsonOutput(t *testing.T) {
@@ -287,120 +165,3 @@ func TestAnalysis_MultipleProblemJsonOutput(t *testing.T) {
 
 	require.Equal(t, got, expected)
 }
-
-func TestNewAnalysis(t *testing.T) {
-	disabledCache := cache.New("disabled-cache")
-	disabledCache.DisableCache()
-	aiClient := &ai.NoOpAIClient{}
-	results := []common.Result{
-		{
-			Kind: "VulnerabilityReport",
-			Error: []common.Failure{
-				{
-					Text:          "This is a custom failure",
-					KubernetesDoc: "test-kubernetes-doc",
-					Sensitive: []common.Sensitive{
-						{
-							Masked:   "masked-error",
-							Unmasked: "unmasked-error",
-						},
-					},
-				},
-			},
-		},
-	}
-
-	tests := []struct {
-		name        string
-		a           Analysis
-		output      string
-		anonymize   bool
-		expectedErr string
-	}{
-		{
-			name: "Empty results",
-			a:    Analysis{},
-		},
-		{
-			name: "cache disabled",
-			a: Analysis{
-				AIClient: aiClient,
-				Cache:    disabledCache,
-				Results:  results,
-			},
-		},
-		{
-			name: "output and anonymize both set",
-			a: Analysis{
-				AIClient: aiClient,
-				Cache:    cache.New("test-cache"),
-				Results:  results,
-			},
-			output:    "test-output",
-			anonymize: true,
-		},
-	}
-
-	for _, tt := range tests {
-		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			err := tt.a.GetAIResults(tt.output, tt.anonymize)
-			if tt.expectedErr == "" {
-				require.NoError(t, err)
-			} else {
-				require.ErrorContains(t, err, tt.expectedErr)
-			}
-		})
-	}
-}
-
-func TestGetAIResultForSanitizedFailures(t *testing.T) {
-	enabledCache := cache.New("enabled-cache")
-	disabledCache := cache.New("disabled-cache")
-	disabledCache.DisableCache()
-	aiClient := &ai.NoOpAIClient{}
-
-	tests := []struct {
-		name           string
-		a              Analysis
-		texts          []string
-		promptTmpl     string
-		expectedOutput string
-		expectedErr    string
-	}{
-		{
-			name: "Cache enabled",
-			a: Analysis{
-				AIClient: aiClient,
-				Cache:    enabledCache,
-			},
-			texts:          []string{"some-data"},
-			expectedOutput: "I am a noop response to the prompt %!(EXTRA string=, string=some-data)",
-		},
-		{
-			name: "cache disabled",
-			a: Analysis{
-				AIClient: aiClient,
-				Cache:    disabledCache,
-				Language: "English",
-			},
-			texts:          []string{"test input"},
-			promptTmpl:     "Response in %s: %s",
-			expectedOutput: "I am a noop response to the prompt Response in English: test input",
-		},
-	}
-
-	for _, tt := range tests {
-		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			output, err := tt.a.getAIResultForSanitizedFailures(tt.texts, tt.promptTmpl)
-			if tt.expectedErr == "" {
-				require.NoError(t, err)
-				require.Equal(t, tt.expectedOutput, output)
-			} else {
-				require.ErrorContains(t, err, tt.expectedErr)
-				require.Empty(t, output)
-			}
-		})
-	}
-}

pkg/analysis/output.go

@@ -42,10 +42,8 @@ func (a *Analysis) jsonOutput() ([]byte, error) {
 	}
 
 	result := JsonOutput{
-		Provider: a.AnalysisAIProvider,
 		Problems: problems,
 		Results:  a.Results,
-		Errors:   a.Errors,
 		Status:   status,
 	}
 	output, err := json.MarshalIndent(result, "", "  ")
@@ -55,50 +53,18 @@ func (a *Analysis) jsonOutput() ([]byte, error) {
 	return output, nil
 }
 
-func (a *Analysis) PrintStats() []byte {
-	var output strings.Builder
-
-	output.WriteString(color.YellowString("The stats mode allows for debugging and understanding the time taken by an analysis by displaying the statistics of each analyzer.\n"))
-
-	for _, stat := range a.Stats {
-		output.WriteString(fmt.Sprintf("- Analyzer %s took %s \n", color.YellowString(stat.Analyzer), stat.DurationTime))
-	}
-
-	return []byte(output.String())
-}
-
 func (a *Analysis) textOutput() ([]byte, error) {
 	var output strings.Builder
-
-	// Print the AI provider used for this analysis (if explain was enabled).
-	if a.Explain {
-		output.WriteString(fmt.Sprintf("AI Provider: %s\n", color.YellowString(a.AnalysisAIProvider)))
-	} else {
-		output.WriteString(fmt.Sprintf("AI Provider: %s\n", color.YellowString("AI not used; --explain not set")))
-	}
-
-	if len(a.Errors) != 0 {
-		output.WriteString("\n")
-		output.WriteString(color.YellowString("Warnings : \n"))
-		for _, aerror := range a.Errors {
-			output.WriteString(fmt.Sprintf("- %s\n", color.YellowString(aerror)))
-		}
-	}
 	output.WriteString("\n")
 	if len(a.Results) == 0 {
 		output.WriteString(color.GreenString("No problems detected\n"))
 		return []byte(output.String()), nil
 	}
 	for n, result := range a.Results {
-		output.WriteString(fmt.Sprintf("%s: %s %s(%s)\n", color.CyanString("%d", n),
-			color.HiYellowString(result.Kind),
-			color.YellowString(result.Name),
-			color.CyanString(result.ParentObject)))
+		output.WriteString(fmt.Sprintf("%s %s(%s)\n", color.CyanString("%d", n),
+			color.YellowString(result.Name), color.CyanString(result.ParentObject)))
 		for _, err := range result.Error {
 			output.WriteString(fmt.Sprintf("- %s %s\n", color.RedString("Error:"), color.RedString(err.Text)))
-			if err.KubernetesDoc != "" {
-				output.WriteString(fmt.Sprintf("  %s %s\n", color.RedString("Kubernetes Doc:"), color.RedString(err.KubernetesDoc)))
-			}
 		}
 		output.WriteString(color.GreenString(result.Details + "\n"))
 	}

pkg/analysis/output_test.go

@@ -1,64 +0,0 @@
-/*
-Copyright 2024 The K8sGPT Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package analysis
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestPrintOutput(t *testing.T) {
-	require.NotEmpty(t, getOutputFormats())
-
-	tests := []struct {
-		name           string
-		a              *Analysis
-		format         string
-		expectedOutput string
-		expectedErr    string
-	}{
-		{
-			name:           "json format",
-			a:              &Analysis{},
-			format:         "json",
-			expectedOutput: "{\n  \"provider\": \"\",\n  \"errors\": null,\n  \"status\": \"OK\",\n  \"problems\": 0,\n  \"results\": null\n}",
-		},
-		{
-			name:           "text format",
-			a:              &Analysis{},
-			format:         "text",
-			expectedOutput: "AI Provider: AI not used; --explain not set\n\nNo problems detected\n",
-		},
-		{
-			name:        "unsupported format",
-			a:           &Analysis{},
-			format:      "unsupported",
-			expectedErr: "unsupported output format: unsupported. Available format",
-		},
-	}
-	for _, tt := range tests {
-		tt := tt
-		t.Run(tt.name, func(t *testing.T) {
-			output, err := tt.a.PrintOutput(tt.format)
-			if tt.expectedErr == "" {
-				require.NoError(t, err)
-				require.Contains(t, string(output), tt.expectedOutput)
-			} else {
-				require.ErrorContains(t, err, tt.expectedErr)
-				require.Nil(t, output)
-			}
-		})
-	}
-}

pkg/analyzer/analyzer.go

@@ -32,27 +32,21 @@ var (
 )
 
 var coreAnalyzerMap = map[string]common.IAnalyzer{
-	"Pod":                            PodAnalyzer{},
-	"Deployment":                     DeploymentAnalyzer{},
-	"ReplicaSet":                     ReplicaSetAnalyzer{},
-	"PersistentVolumeClaim":          PvcAnalyzer{},
-	"Service":                        ServiceAnalyzer{},
-	"Ingress":                        IngressAnalyzer{},
-	"StatefulSet":                    StatefulSetAnalyzer{},
-	"CronJob":                        CronJobAnalyzer{},
-	"Node":                           NodeAnalyzer{},
-	"ValidatingWebhookConfiguration": ValidatingWebhookAnalyzer{},
-	"MutatingWebhookConfiguration":   MutatingWebhookAnalyzer{},
+	"Pod":                   PodAnalyzer{},
+	"Deployment":            DeploymentAnalyzer{},
+	"ReplicaSet":            ReplicaSetAnalyzer{},
+	"PersistentVolumeClaim": PvcAnalyzer{},
+	"Service":               ServiceAnalyzer{},
+	"Ingress":               IngressAnalyzer{},
+	"StatefulSet":           StatefulSetAnalyzer{},
+	"CronJob":               CronJobAnalyzer{},
+	"Node":                  NodeAnalyzer{},
 }
 
 var additionalAnalyzerMap = map[string]common.IAnalyzer{
 	"HorizontalPodAutoScaler": HpaAnalyzer{},
 	"PodDisruptionBudget":     PdbAnalyzer{},
 	"NetworkPolicy":           NetworkPolicyAnalyzer{},
-	"Log":                     LogAnalyzer{},
-	"GatewayClass":            GatewayClassAnalyzer{},
-	"Gateway":                 GatewayAnalyzer{},
-	"HTTPRoute":               HTTPRouteAnalyzer{},
 }
 
 func ListFilters() ([]string, []string, []string) {
@@ -77,27 +71,25 @@ func ListFilters() ([]string, []string, []string) {
 				fmt.Println(color.RedString(err.Error()))
 				os.Exit(1)
 			}
-			integrationAnalyzers = append(integrationAnalyzers, in.GetAnalyzerName()...)
+			integrationAnalyzers = append(integrationAnalyzers, in.GetAnalyzerName())
 		}
 	}
 
 	return coreKeys, additionalKeys, integrationAnalyzers
 }
 
-func GetAnalyzerMap() (map[string]common.IAnalyzer, map[string]common.IAnalyzer) {
+func GetAnalyzerMap() map[string]common.IAnalyzer {
 
-	coreAnalyzer := make(map[string]common.IAnalyzer)
-	mergedAnalyzerMap := make(map[string]common.IAnalyzer)
+	mergedMap := make(map[string]common.IAnalyzer)
 
 	// add core analyzer
 	for key, value := range coreAnalyzerMap {
-		coreAnalyzer[key] = value
-		mergedAnalyzerMap[key] = value
+		mergedMap[key] = value
 	}
 
 	// add additional analyzer
 	for key, value := range additionalAnalyzerMap {
-		mergedAnalyzerMap[key] = value
+		mergedMap[key] = value
 	}
 
 	integrationProvider := integration.NewIntegration()
@@ -114,9 +106,9 @@ func GetAnalyzerMap() (map[string]common.IAnalyzer, map[string]common.IAnalyzer)
 				fmt.Println(color.RedString(err.Error()))
 				os.Exit(1)
 			}
-			in.AddAnalyzer(&mergedAnalyzerMap)
+			in.AddAnalyzer(&mergedMap)
 		}
 	}
 
-	return coreAnalyzer, mergedAnalyzerMap
+	return mergedMap
 }

pkg/analyzer/cronjob.go

@@ -18,11 +18,9 @@ import (
 	"time"
 
 	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/util"
 	cron "github.com/robfig/cron/v3"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 type CronJobAnalyzer struct{}
@@ -30,20 +28,12 @@ type CronJobAnalyzer struct{}
 func (analyzer CronJobAnalyzer) Analyze(a common.Analyzer) ([]common.Result, error) {
 
 	kind := "CronJob"
-	apiDoc := kubernetes.K8sApiReference{
-		Kind: kind,
-		ApiVersion: schema.GroupVersion{
-			Group:   "batch",
-			Version: "v1",
-		},
-		OpenapiSchema: a.OpenapiSchema,
-	}
 
 	AnalyzerErrorsMetric.DeletePartialMatch(map[string]string{
 		"analyzer_name": kind,
 	})
 
-	cronJobList, err := a.Client.GetClient().BatchV1().CronJobs(a.Namespace).List(a.Context, v1.ListOptions{LabelSelector: a.LabelSelector})
+	cronJobList, err := a.Client.GetClient().BatchV1().CronJobs(a.Namespace).List(a.Context, v1.ListOptions{})
 	if err != nil {
 		return nil, err
 	}
@@ -53,11 +43,8 @@ func (analyzer CronJobAnalyzer) Analyze(a common.Analyzer) ([]common.Result, err
 	for _, cronJob := range cronJobList.Items {
 		var failures []common.Failure
 		if cronJob.Spec.Suspend != nil && *cronJob.Spec.Suspend {
-			doc := apiDoc.GetApiDocV2("spec.suspend")
-
 			failures = append(failures, common.Failure{
-				Text:          fmt.Sprintf("CronJob %s is suspended", cronJob.Name),
-				KubernetesDoc: doc,
+				Text: fmt.Sprintf("CronJob %s is suspended", cronJob.Name),
 				Sensitive: []common.Sensitive{
 					{
 						Unmasked: cronJob.Namespace,
@@ -72,11 +59,8 @@ func (analyzer CronJobAnalyzer) Analyze(a common.Analyzer) ([]common.Result, err
 		} else {
 			// check the schedule format
 			if _, err := CheckCronScheduleIsValid(cronJob.Spec.Schedule); err != nil {
-				doc := apiDoc.GetApiDocV2("spec.schedule")
-
 				failures = append(failures, common.Failure{
-					Text:          fmt.Sprintf("CronJob %s has an invalid schedule: %s", cronJob.Name, err.Error()),
-					KubernetesDoc: doc,
+					Text: fmt.Sprintf("CronJob %s has an invalid schedule: %s", cronJob.Name, err.Error()),
 					Sensitive: []common.Sensitive{
 						{
 							Unmasked: cronJob.Namespace,
@@ -94,11 +78,9 @@ func (analyzer CronJobAnalyzer) Analyze(a common.Analyzer) ([]common.Result, err
 			if cronJob.Spec.StartingDeadlineSeconds != nil {
 				deadline := time.Duration(*cronJob.Spec.StartingDeadlineSeconds) * time.Second
 				if deadline < 0 {
-					doc := apiDoc.GetApiDocV2("spec.startingDeadlineSeconds")
 
 					failures = append(failures, common.Failure{
-						Text:          fmt.Sprintf("CronJob %s has a negative starting deadline", cronJob.Name),
-						KubernetesDoc: doc,
+						Text: fmt.Sprintf("CronJob %s has a negative starting deadline", cronJob.Name),
 						Sensitive: []common.Sensitive{
 							{
 								Unmasked: cronJob.Namespace,
@@ -123,15 +105,15 @@ func (analyzer CronJobAnalyzer) Analyze(a common.Analyzer) ([]common.Result, err
 			AnalyzerErrorsMetric.WithLabelValues(kind, cronJob.Name, cronJob.Namespace).Set(float64(len(failures)))
 
 		}
-	}
 
-	for key, value := range preAnalysis {
-		currentAnalysis := common.Result{
-			Kind:  kind,
-			Name:  key,
-			Error: value.FailureDetails,
+		for key, value := range preAnalysis {
+			currentAnalysis := common.Result{
+				Kind:  kind,
+				Name:  key,
+				Error: value.FailureDetails,
+			}
+			a.Results = append(a.Results, currentAnalysis)
 		}
-		a.Results = append(a.Results, currentAnalysis)
 	}
 
 	return a.Results, nil

pkg/analyzer/cronjob_test.go

@@ -15,186 +15,219 @@ package analyzer
 
 import (
 	"context"
-	"sort"
 	"testing"
 
 	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
-	"github.com/stretchr/testify/require"
+	"github.com/magiconair/properties/assert"
 	batchv1 "k8s.io/api/batch/v1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/fake"
 )
 
-func TestCronJobAnalyzer(t *testing.T) {
-	suspend := new(bool)
-	*suspend = true
-
-	invalidStartingDeadline := new(int64)
-	*invalidStartingDeadline = -7
-
-	validStartingDeadline := new(int64)
-	*validStartingDeadline = 7
+func TestCronJobSuccess(t *testing.T) {
+	clientset := fake.NewSimpleClientset(&batchv1.CronJob{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "example-cronjob",
+			Namespace: "default",
+			Annotations: map[string]string{
+				"analysisDate": "2022-04-01",
+			},
+			Labels: map[string]string{
+				"app": "example-app",
+			},
+		},
+		Spec: batchv1.CronJobSpec{
+			Schedule:          "*/1 * * * *",
+			ConcurrencyPolicy: "Allow",
+			JobTemplate: batchv1.JobTemplateSpec{
+				ObjectMeta: metav1.ObjectMeta{
+					Labels: map[string]string{
+						"app": "example-app",
+					},
+				},
+				Spec: batchv1.JobSpec{
+					Template: v1.PodTemplateSpec{
+						Spec: v1.PodSpec{
+							Containers: []v1.Container{
+								{
+									Name:  "example-container",
+									Image: "nginx",
+								},
+							},
+							RestartPolicy: v1.RestartPolicyOnFailure,
+						},
+					},
+				},
+			},
+		},
+	})
 
 	config := common.Analyzer{
 		Client: &kubernetes.Client{
-			Client: fake.NewSimpleClientset(
-				&batchv1.CronJob{
-					ObjectMeta: metav1.ObjectMeta{
-						Name: "CJ1",
-						// This CronJob won't be list because of namespace filtering.
-						Namespace: "test",
-					},
-				},
-				&batchv1.CronJob{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "CJ2",
-						Namespace: "default",
-					},
-					// A suspended CronJob will contribute to failures.
-					Spec: batchv1.CronJobSpec{
-						Suspend: suspend,
-					},
-				},
-				&batchv1.CronJob{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "CJ3",
-						Namespace: "default",
-					},
-					Spec: batchv1.CronJobSpec{
-						// Valid schedule
-						Schedule: "*/1 * * * *",
-
-						// Negative starting deadline
-						StartingDeadlineSeconds: invalidStartingDeadline,
-					},
-				},
-				&batchv1.CronJob{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "CJ4",
-						Namespace: "default",
-					},
-					Spec: batchv1.CronJobSpec{
-						// Invalid schedule
-						Schedule: "*** * * * *",
-					},
-				},
-				&batchv1.CronJob{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "CJ5",
-						Namespace: "default",
-					},
-					Spec: batchv1.CronJobSpec{
-						// Valid schedule
-						Schedule: "*/1 * * * *",
-
-						// Positive starting deadline shouldn't be any problem.
-						StartingDeadlineSeconds: validStartingDeadline,
-					},
-				},
-				&batchv1.CronJob{
-					// This cronjob shouldn't contribute to any failures.
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "successful-cronjob",
-						Namespace: "default",
-						Annotations: map[string]string{
-							"analysisDate": "2022-04-01",
-						},
-						Labels: map[string]string{
-							"app": "example-app",
-						},
-					},
-					Spec: batchv1.CronJobSpec{
-						Schedule:          "*/1 * * * *",
-						ConcurrencyPolicy: "Allow",
-						JobTemplate: batchv1.JobTemplateSpec{
-							ObjectMeta: metav1.ObjectMeta{
-								Labels: map[string]string{
-									"app": "example-app",
-								},
-							},
-							Spec: batchv1.JobSpec{
-								Template: v1.PodTemplateSpec{
-									Spec: v1.PodSpec{
-										Containers: []v1.Container{
-											{
-												Name:  "example-container",
-												Image: "nginx",
-											},
-										},
-										RestartPolicy: v1.RestartPolicyOnFailure,
-									},
-								},
-							},
-						},
-					},
-				},
-			),
+			Client: clientset,
 		},
 		Context:   context.Background(),
 		Namespace: "default",
 	}
 
-	cjAnalyzer := CronJobAnalyzer{}
-	results, err := cjAnalyzer.Analyze(config)
-	require.NoError(t, err)
-
-	sort.Slice(results, func(i, j int) bool {
-		return results[i].Name < results[j].Name
-	})
-
-	expectations := []string{
-		"default/CJ2",
-		"default/CJ3",
-		"default/CJ4",
+	analyzer := CronJobAnalyzer{}
+	analysisResults, err := analyzer.Analyze(config)
+	if err != nil {
+		t.Error(err)
 	}
 
-	require.Equal(t, len(expectations), len(results))
-
-	for i, result := range results {
-		require.Equal(t, expectations[i], result.Name)
-	}
+	assert.Equal(t, len(analysisResults), 0)
 }
 
-func TestCronJobAnalyzerLabelSelectorFiltering(t *testing.T) {
-	suspend := new(bool)
-	*suspend = true
-
-	invalidStartingDeadline := new(int64)
-	*invalidStartingDeadline = -7
-
-	validStartingDeadline := new(int64)
-	*validStartingDeadline = 7
-
-	config := common.Analyzer{
-		Client: &kubernetes.Client{
-			Client: fake.NewSimpleClientset(
-				&batchv1.CronJob{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "CJ1",
-						Namespace: "default",
-						Labels: map[string]string{
-							"app": "cronjob",
+func TestCronJobBroken(t *testing.T) {
+	clientset := fake.NewSimpleClientset(&batchv1.CronJob{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "example-cronjob",
+			Namespace: "default",
+			Annotations: map[string]string{
+				"analysisDate": "2022-04-01",
+			},
+			Labels: map[string]string{
+				"app": "example-app",
+			},
+		},
+		Spec: batchv1.CronJobSpec{
+			Schedule:          "*** * * * *",
+			ConcurrencyPolicy: "Allow",
+			JobTemplate: batchv1.JobTemplateSpec{
+				ObjectMeta: metav1.ObjectMeta{
+					Labels: map[string]string{
+						"app": "example-app",
+					},
+				},
+				Spec: batchv1.JobSpec{
+					Template: v1.PodTemplateSpec{
+						Spec: v1.PodSpec{
+							Containers: []v1.Container{
+								{
+									Name:  "example-container",
+									Image: "nginx",
+								},
+							},
+							RestartPolicy: v1.RestartPolicyOnFailure,
 						},
 					},
 				},
-				&batchv1.CronJob{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "CJ2",
-						Namespace: "default",
-					},
-				},
-			),
+			},
 		},
-		Context:       context.Background(),
-		Namespace:     "default",
-		LabelSelector: "app=cronjob",
+	})
+
+	config := common.Analyzer{
+		Client: &kubernetes.Client{
+			Client: clientset,
+		},
+		Context:   context.Background(),
+		Namespace: "default",
 	}
 
-	cjAnalyzer := CronJobAnalyzer{}
-	results, err := cjAnalyzer.Analyze(config)
-	require.NoError(t, err)
-	require.Equal(t, 1, len(results))
-	require.Equal(t, "default/CJ1", results[0].Name)
+	analyzer := CronJobAnalyzer{}
+	analysisResults, err := analyzer.Analyze(config)
+	if err != nil {
+		t.Error(err)
+	}
+
+	assert.Equal(t, len(analysisResults), 1)
+	assert.Equal(t, analysisResults[0].Name, "default/example-cronjob")
+	assert.Equal(t, analysisResults[0].Kind, "CronJob")
+}
+
+func TestCronJobBrokenMultipleNamespaceFiltering(t *testing.T) {
+	clientset := fake.NewSimpleClientset(
+		&batchv1.CronJob{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "example-cronjob",
+				Namespace: "default",
+				Annotations: map[string]string{
+					"analysisDate": "2022-04-01",
+				},
+				Labels: map[string]string{
+					"app": "example-app",
+				},
+			},
+			Spec: batchv1.CronJobSpec{
+				Schedule:          "*** * * * *",
+				ConcurrencyPolicy: "Allow",
+				JobTemplate: batchv1.JobTemplateSpec{
+					ObjectMeta: metav1.ObjectMeta{
+						Labels: map[string]string{
+							"app": "example-app",
+						},
+					},
+					Spec: batchv1.JobSpec{
+						Template: v1.PodTemplateSpec{
+							Spec: v1.PodSpec{
+								Containers: []v1.Container{
+									{
+										Name:  "example-container",
+										Image: "nginx",
+									},
+								},
+								RestartPolicy: v1.RestartPolicyOnFailure,
+							},
+						},
+					},
+				},
+			},
+		},
+		&batchv1.CronJob{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "example-cronjob",
+				Namespace: "other-namespace",
+				Annotations: map[string]string{
+					"analysisDate": "2022-04-01",
+				},
+				Labels: map[string]string{
+					"app": "example-app",
+				},
+			},
+			Spec: batchv1.CronJobSpec{
+				Schedule:          "*** * * * *",
+				ConcurrencyPolicy: "Allow",
+				JobTemplate: batchv1.JobTemplateSpec{
+					ObjectMeta: metav1.ObjectMeta{
+						Labels: map[string]string{
+							"app": "example-app",
+						},
+					},
+					Spec: batchv1.JobSpec{
+						Template: v1.PodTemplateSpec{
+							Spec: v1.PodSpec{
+								Containers: []v1.Container{
+									{
+										Name:  "example-container",
+										Image: "nginx",
+									},
+								},
+								RestartPolicy: v1.RestartPolicyOnFailure,
+							},
+						},
+					},
+				},
+			},
+		})
+
+	config := common.Analyzer{
+		Client: &kubernetes.Client{
+			Client: clientset,
+		},
+		Context:   context.Background(),
+		Namespace: "default",
+	}
+
+	analyzer := CronJobAnalyzer{}
+	analysisResults, err := analyzer.Analyze(config)
+	if err != nil {
+		t.Error(err)
+	}
+
+	assert.Equal(t, len(analysisResults), 1)
+	assert.Equal(t, analysisResults[0].Name, "default/example-cronjob")
+	assert.Equal(t, analysisResults[0].Kind, "CronJob")
 }

pkg/analyzer/deployment.go

@@ -18,10 +18,8 @@ import (
 	"fmt"
 
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/util"
 )
 
@@ -33,20 +31,12 @@ type DeploymentAnalyzer struct {
 func (d DeploymentAnalyzer) Analyze(a common.Analyzer) ([]common.Result, error) {
 
 	kind := "Deployment"
-	apiDoc := kubernetes.K8sApiReference{
-		Kind: kind,
-		ApiVersion: schema.GroupVersion{
-			Group:   "apps",
-			Version: "v1",
-		},
-		OpenapiSchema: a.OpenapiSchema,
-	}
 
 	AnalyzerErrorsMetric.DeletePartialMatch(map[string]string{
 		"analyzer_name": kind,
 	})
 
-	deployments, err := a.Client.GetClient().AppsV1().Deployments(a.Namespace).List(context.Background(), v1.ListOptions{LabelSelector: a.LabelSelector})
+	deployments, err := a.Client.GetClient().AppsV1().Deployments(a.Namespace).List(context.Background(), v1.ListOptions{})
 	if err != nil {
 		return nil, err
 	}
@@ -55,11 +45,8 @@ func (d DeploymentAnalyzer) Analyze(a common.Analyzer) ([]common.Result, error)
 	for _, deployment := range deployments.Items {
 		var failures []common.Failure
 		if *deployment.Spec.Replicas != deployment.Status.Replicas {
-			doc := apiDoc.GetApiDocV2("spec.replicas")
-
 			failures = append(failures, common.Failure{
-				Text:          fmt.Sprintf("Deployment %s/%s has %d replicas but %d are available", deployment.Namespace, deployment.Name, *deployment.Spec.Replicas, deployment.Status.Replicas),
-				KubernetesDoc: doc,
+				Text: fmt.Sprintf("Deployment %s/%s has %d replicas but %d are available", deployment.Namespace, deployment.Name, *deployment.Spec.Replicas, deployment.Status.Replicas),
 				Sensitive: []common.Sensitive{
 					{
 						Unmasked: deployment.Namespace,

pkg/analyzer/deployment_test.go

@@ -151,55 +151,3 @@ func TestDeploymentAnalyzerNamespaceFiltering(t *testing.T) {
 	assert.Equal(t, analysisResults[0].Kind, "Deployment")
 	assert.Equal(t, analysisResults[0].Name, "default/example")
 }
-
-func TestDeploymentAnalyzerLabelSelectorFiltering(t *testing.T) {
-	clientset := fake.NewSimpleClientset(
-		&appsv1.Deployment{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "example",
-				Namespace: "default",
-				Labels: map[string]string{
-					"app": "deployment",
-				},
-			},
-			Spec: appsv1.DeploymentSpec{
-				Replicas: func() *int32 { i := int32(3); return &i }(),
-				Template: v1.PodTemplateSpec{
-					Spec: v1.PodSpec{
-						Containers: []v1.Container{},
-					},
-				},
-			},
-		},
-		&appsv1.Deployment{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "example2",
-				Namespace: "default",
-			},
-			Spec: appsv1.DeploymentSpec{
-				Replicas: func() *int32 { i := int32(3); return &i }(),
-				Template: v1.PodTemplateSpec{
-					Spec: v1.PodSpec{
-						Containers: []v1.Container{},
-					},
-				},
-			},
-		},
-	)
-
-	config := common.Analyzer{
-		Client: &kubernetes.Client{
-			Client: clientset,
-		},
-		Context:       context.Background(),
-		Namespace:     "default",
-		LabelSelector: "app=deployment",
-	}
-
-	deploymentAnalyzer := DeploymentAnalyzer{}
-	analysisResults, err := deploymentAnalyzer.Analyze(config)
-	if err != nil {
-		t.Error(err)
-	}
-	assert.Equal(t, len(analysisResults), 1)
-}

pkg/analyzer/events.go

@@ -0,0 +1,50 @@
+/*
+Copyright 2023 The K8sGPT Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package analyzer
+
+import (
+	"context"
+
+	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
+	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func FetchLatestEvent(ctx context.Context, kubernetesClient *kubernetes.Client, namespace string, name string) (*v1.Event, error) {
+
+	// get the list of events
+	events, err := kubernetesClient.GetClient().CoreV1().Events(namespace).List(ctx,
+		metav1.ListOptions{
+			FieldSelector: "involvedObject.name=" + name,
+		})
+
+	if err != nil {
+		return nil, err
+	}
+	// find most recent event
+	var latestEvent *v1.Event
+	for _, event := range events.Items {
+		if latestEvent == nil {
+			// this is required, as a pointer to a loop variable would always yield the latest value in the range
+			e := event
+			latestEvent = &e
+		}
+		if event.LastTimestamp.After(latestEvent.LastTimestamp.Time) {
+			// this is required, as a pointer to a loop variable would always yield the latest value in the range
+			e := event
+			latestEvent = &e
+		}
+	}
+	return latestEvent, nil
+}

pkg/analyzer/events_test.go

@@ -1,137 +0,0 @@
-package analyzer_test
-
-import (
-	"context"
-	"errors"
-	"testing"
-	"time"
-
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/kubernetes/fake"
-)
-
-func FetchLatestEvent(ctx context.Context, client kubernetes.Interface, namespace, eventName string) (*v1.Event, error) {
-	// List events in the specified namespace
-	events, err := client.CoreV1().Events(namespace).List(ctx, metav1.ListOptions{})
-	if err != nil {
-		return nil, err
-	}
-
-	var latestEvent *v1.Event
-	for _, event := range events.Items {
-		// Check if the event name matches the requested name (partial match)
-		if eventName == "" || event.Name == eventName {
-			if latestEvent == nil || event.LastTimestamp.Time.After(latestEvent.LastTimestamp.Time) {
-				latestEvent = &event
-			}
-		}
-	}
-
-	// If no matching event is found, return an error
-	if latestEvent == nil {
-		return nil, errors.New("no matching events found")
-	}
-	return latestEvent, nil
-}
-func TestFetchLatestEvent(t *testing.T) {
-	fakeClient := fake.NewSimpleClientset()
-
-	// Simulating events with different timestamps
-	event1 := &v1.Event{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "test-event-1",
-			Namespace: "default",
-		},
-		LastTimestamp: metav1.Time{Time: time.Now()},
-	}
-	event2 := &v1.Event{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "test-event-2",
-			Namespace: "default",
-		},
-		LastTimestamp: metav1.Time{Time: time.Now().Add(-time.Hour)}, // event1 should be fetched as it's newer
-	}
-
-	// ✅ Explicitly ensure namespace exists
-	_, err := fakeClient.CoreV1().Namespaces().Create(context.TODO(), &v1.Namespace{
-		ObjectMeta: metav1.ObjectMeta{Name: "default"},
-	}, metav1.CreateOptions{})
-	if err != nil {
-		t.Fatalf("Failed to create namespace: %v", err)
-	}
-
-	// ✅ Ensure events are properly created and stored in the fake client
-	_, err = fakeClient.CoreV1().Events("default").Create(context.TODO(), event1, metav1.CreateOptions{})
-	if err != nil {
-		t.Fatalf("Failed to create event1: %v", err)
-	}
-
-	_, err = fakeClient.CoreV1().Events("default").Create(context.TODO(), event2, metav1.CreateOptions{})
-	if err != nil {
-		t.Fatalf("Failed to create event2: %v", err)
-	}
-
-	// 🔍 Debug: Check if events exist before running FetchLatestEvent
-	storedEvents, _ := fakeClient.CoreV1().Events("default").List(context.TODO(), metav1.ListOptions{})
-	if len(storedEvents.Items) == 0 {
-		t.Fatal("No events were found in the fake client. Ensure event creation is working correctly.")
-	}
-
-	// Test cases
-	tests := []struct {
-		name       string
-		namespace  string
-		nameToFind string
-		expected   *v1.Event
-		shouldFail bool
-	}{
-		{
-			name:       "Valid case - fetch the latest event",
-			namespace:  "default",
-			nameToFind: "test-event-1", // Match exact event name
-			expected:   event1,         // event1 has the latest timestamp
-			shouldFail: false,
-		},
-		{
-			name:       "Nonexistent event",
-			namespace:  "default",
-			nameToFind: "nonexistent-event", // Should not exist
-			expected:   nil,
-			shouldFail: true,
-		},
-		{
-			name:       "Nonexistent namespace",
-			namespace:  "nonexistent-namespace", // Namespace doesn't exist
-			nameToFind: "test-event",
-			expected:   nil,
-			shouldFail: true,
-		},
-	}
-
-	// Run tests
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Call the function to fetch the latest event
-			event, err := FetchLatestEvent(context.TODO(), fakeClient, tt.namespace, tt.nameToFind)
-
-			// Handle the expected outcomes based on the test case
-			if tt.shouldFail {
-				if err == nil {
-					t.Error("Expected an error, but got nil")
-				}
-				if event != nil {
-					t.Errorf("Expected nil event, but got event: %s", event.Name)
-				}
-			} else {
-				if err != nil {
-					t.Errorf("Expected no error, but got %v", err)
-				}
-				if event != nil && event.Name != tt.expected.Name {
-					t.Errorf("Expected event name %s, got %s", tt.expected.Name, event.Name)
-				}
-			}
-		})
-	}
-}