chore(main): release 0.4.11 (#1451)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

.github/workflows/build_container.yaml

@@ -8,13 +8,16 @@ on:
   pull_request:
     branches:
       - 'main'
+      - fix/build-branch
       - '[0-9]+.[1-9][0-9]*.x'
     paths-ignore:
       - "**.md"
 
 env:
-  GO_VERSION: "~1.22"
+  GO_VERSION: "~1.23"
   IMAGE_NAME: "k8sgpt"
+  REGISTRY_IMAGE: ghcr.io/k8sgpt-ai/k8sgpt
+
 defaults:
   run:
     shell: bash
@@ -51,97 +54,61 @@ jobs:
         id: get_run_type
         run: |
           NON_FORKED_AND_NON_ROBOT_RUN=${{ ( github.actor != 'renovate[bot]' && github.actor != 'dependabot[bot]' ) && ( github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository ) }}
-          echo "github.actor != 'renovate[bot]' = ${{ github.actor != 'renovate[bot]' }}"
-          echo "github.actor != 'dependabot[bot]' = ${{ github.actor != 'dependabot[bot]' }}"
-          echo "github.event_name == 'push' = ${{ github.event_name == 'push' }}"
-          echo "github.event.pull_request.head.repo.full_name == github.repository = ${{ github.event.pull_request.head.repo.full_name == github.repository }}"
-          echo "NON_FORKED_AND_NON_ROBOT_RUN = $NON_FORKED_AND_NON_ROBOT_RUN"
           echo "NON_FORKED_AND_NON_ROBOT_RUN=$NON_FORKED_AND_NON_ROBOT_RUN" >> "$GITHUB_OUTPUT"
 
-  build_image:
-    name: Build Container Image
+  build-and-push:
+    name: Build and Push Multi-arch Image
     needs: prepare_ci_run
     runs-on: ubuntu-latest
+    if: ${{ needs.prepare_ci_run.outputs.NON_FORKED_AND_NON_ROBOT_RUN == 'true' }}
     env:
-      BRANCH: ${{ needs.prepare_ci_run.outputs.BRANCH }}
       DATETIME: ${{ needs.prepare_ci_run.outputs.DATETIME }}
       BUILD_TIME: ${{ needs.prepare_ci_run.outputs.BUILD_TIME }}
       GIT_SHA: ${{ needs.prepare_ci_run.outputs.GIT_SHA }}
-      RELEASE_REGISTRY: "localhost:5000/k8sgpt"
+
     steps:
       - name: Check out code
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3
-
-      - name: Build Docker Image
-        uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5
         with:
-          context: .
-          platforms: linux/amd64
-          file: ./container/Dockerfile
-          target: production
+          images: ${{ env.REGISTRY_IMAGE }}
           tags: |
-            ${{ env.RELEASE_REGISTRY }}/${{ env.IMAGE_NAME }}:dev-${{ env.DATETIME }}
-          build-args: |
-            GIT_HASH=${{ env.GIT_SHA }}
-            RELEASE_VERSION=dev-${{ env.DATETIME }}
-            BUILD_TIME=${{ env.BUILD_TIME }}
-          builder: ${{ steps.buildx.outputs.name }}
-          push: false
-          cache-from: type=gha,scope=${{ github.ref_name }}-${{ env.IMAGE_NAME }}
-          cache-to: type=gha,scope=${{ github.ref_name }}-${{ env.IMAGE_NAME }}
-          outputs: type=docker,dest=/tmp/${{ env.IMAGE_NAME }}-image.tar
-
-      - name: Upload image as artifact
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
-        with:
-          name: ${{ env.IMAGE_NAME }}-image.tar
-          path: /tmp/${{ env.IMAGE_NAME }}-image.tar
-
-  upload_images:
-    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
-    env:
-      DATETIME: ${{ needs.prepare_ci_run.outputs.DATETIME }}
-      BUILD_TIME: ${{ needs.prepare_ci_run.outputs.BUILD_TIME }}
-      GIT_SHA: ${{ needs.prepare_ci_run.outputs.GIT_SHA }}
-    permissions:
-      packages: write # Needed for pushing images to the registry
-      contents: read # Needed for checking out the repository
-    steps:
-      - name: Check out code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=raw,value=dev-${{ env.DATETIME }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
         with:
-          registry: "ghcr.io"
+          registry: ghcr.io
           username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ secrets.K8SGPT_BOT_SECRET }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3
 
       - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3
+        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3
 
-      - name: Build Docker Image
-        uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5
+      - name: Build and push multi-arch image
+        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6
         with:
           context: .
           file: ./container/Dockerfile
           platforms: linux/amd64,linux/arm64
+          push: true
           target: production
-          tags: |
-            ghcr.io/k8sgpt-ai/${{ env.IMAGE_NAME }}:dev-${{ env.DATETIME }}
           build-args: |
             GIT_HASH=${{ env.GIT_SHA }}
             RELEASE_VERSION=dev-${{ env.DATETIME }}
             BUILD_TIME=${{ env.BUILD_TIME }}
-          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 }}
+          tags: |
+            ${{ env.REGISTRY_IMAGE }}:${{ env.DATETIME }}
+          labels: ${{ steps.meta.outputs.labels }}
+          secrets: |
+            GIT_AUTH_TOKEN=${{ secrets.K8SGPT_BOT_SECRET }}

.github/workflows/golangci_lint.yaml

@@ -12,9 +12,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
       - name: golangci-lint
-        uses: reviewdog/action-golangci-lint@7708105983c614f7a2725e2172908b7709d1c3e4 # v2
+        uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # v7
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          reporter: github-pr-check
-          golangci_lint_flags: "--timeout=240s"
-          level: warning
+          version: v2.0
+          only-new-issues: true

.github/workflows/release.yaml

@@ -59,13 +59,13 @@ jobs:
         with:
           fetch-depth: 0
       - name: Set up Go
-        uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5
+        uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
         with:
           go-version: '1.22'
       - name: Download Syft
-        uses: anchore/sbom-action/download-syft@fc46e51fd3cb168ffb36c6d1915723c47db58abb # v0.17.7
+        uses: anchore/sbom-action/download-syft@55dc4ee22412511ee8c3142cbea40418e6cec693 # v0.17.8
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6
+        uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6
         with:
           # either 'goreleaser' (default) or 'goreleaser-pro'
           distribution: goreleaser
@@ -73,8 +73,8 @@ jobs:
           args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.K8SGPT_BOT_SECRET }}
-      - name: Update new version in krew-index
-        uses: rajatjindal/krew-release-bot@df3eb197549e3568be8b4767eec31c5e8e8e6ad8 # v0.0.46
+#      - 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'
@@ -96,17 +96,17 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3
+        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
         with:
           registry: "ghcr.io"
           username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ secrets.K8SGPT_BOT_SECRET }}
 
       - name: Build Docker Image
-        uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5
+        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6
         with:
           context: .
           file: ./container/Dockerfile
@@ -120,14 +120,14 @@ jobs:
           cache-to: type=gha,scope=${{ github.ref_name }}-${{ env.IMAGE_TAG }}
 
       - name: Generate SBOM
-        uses: anchore/sbom-action@fc46e51fd3cb168ffb36c6d1915723c47db58abb # v0.17.7
+        uses: anchore/sbom-action@55dc4ee22412511ee8c3142cbea40418e6cec693 # v0.17.8
         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@e7a8f85e1c67a31e6ed99a94b41bd0b71bbee6b8 # v2
+        uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2
         with:
           tag_name: ${{ needs.release-please.outputs.tag_name }}
           files: ./sbom-${{ env.IMAGE_NAME }}.spdx.json

.github/workflows/test.yaml

@@ -18,13 +18,13 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
       - name: Set up Go
-        uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5
+        uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
         with:
           go-version: ${{ env.GO_VERSION }}
 
       - name: Run test
         run: go test ./... -coverprofile=coverage.txt
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4
+        uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.release-please-manifest.json

@@ -1 +1 @@
-{".":"0.3.46"}
+{".":"0.4.11"}

CHANGELOG.md

@@ -1,5 +1,244 @@
 # Changelog
 
+## [0.4.11](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.10...v0.4.11) (2025-04-15)
+
+
+### Features
+
+* add verbose flag to enable detailed output ([#1420](https://github.com/k8sgpt-ai/k8sgpt/issues/1420)) ([a79224e](https://github.com/k8sgpt-ai/k8sgpt/commit/a79224e2bf96f458dbc96404c8f4847970e8d2ef))
+* call bedrock with inference profile ([#1449](https://github.com/k8sgpt-ai/k8sgpt/issues/1449)) ([91d423b](https://github.com/k8sgpt-ai/k8sgpt/commit/91d423b147ca18cda7d54ff19349938a894ecb85))
+* improved test coverage ([#1455](https://github.com/k8sgpt-ai/k8sgpt/issues/1455)) ([80904e3](https://github.com/k8sgpt-ai/k8sgpt/commit/80904e3063b00b0536171b7b62b938938b20825a))
+
+
+### Bug Fixes
+
+* config ai provider in query ([#1457](https://github.com/k8sgpt-ai/k8sgpt/issues/1457)) ([df17e3e](https://github.com/k8sgpt-ai/k8sgpt/commit/df17e3e728591e974703527dff86de882af17790))
+* **deps:** update module gopkg.in/yaml.v2 to v3 ([#1447](https://github.com/k8sgpt-ai/k8sgpt/issues/1447)) ([969fe99](https://github.com/k8sgpt-ai/k8sgpt/commit/969fe99b3320c313f1c97133cdffb668a00d5fb5))
+* **deps:** update module gopkg.in/yaml.v2 to v3 ([#1453](https://github.com/k8sgpt-ai/k8sgpt/issues/1453)) ([cf6f928](https://github.com/k8sgpt-ai/k8sgpt/commit/cf6f9289e13ee729c24968fd771c901f412e8db7))
+
+
+### Docs
+
+* fix the slack invite link ([#1450](https://github.com/k8sgpt-ai/k8sgpt/issues/1450)) ([9ce3346](https://github.com/k8sgpt-ai/k8sgpt/commit/9ce33469d85aa0829e995e4b404ae85734124fb4))
+
+## [0.4.10](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.9...v0.4.10) (2025-04-10)
+
+
+### Features
+
+* add a naive support of bedrock inference profile ([#1446](https://github.com/k8sgpt-ai/k8sgpt/issues/1446)) ([78ffa59](https://github.com/k8sgpt-ai/k8sgpt/commit/78ffa5904addf71caf04554966437b14351f21e5))
+
+
+### Bug Fixes
+
+* **deps:** update module gopkg.in/yaml.v2 to v3 ([#1417](https://github.com/k8sgpt-ai/k8sgpt/issues/1417)) ([ce4b3c2](https://github.com/k8sgpt-ai/k8sgpt/commit/ce4b3c2e7d0762093506d9010eceb47a2dcdf5bc))
+* **deps:** update module helm.sh/helm/v3 to v3.17.3 [security] ([#1448](https://github.com/k8sgpt-ai/k8sgpt/issues/1448)) ([060a3b2](https://github.com/k8sgpt-ai/k8sgpt/commit/060a3b2a26f117827090697eb599cd51a44125e6))
+* pod analyzer catches errors when containers are in Terminated state ([#1438](https://github.com/k8sgpt-ai/k8sgpt/issues/1438)) ([dceda9a](https://github.com/k8sgpt-ai/k8sgpt/commit/dceda9a6a16a914b916c478ecd0b4c8ed0e19c40))
+
+## [0.4.9](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.8...v0.4.9) (2025-04-08)
+
+
+### Other
+
+* **deps:** pin dependencies ([#1440](https://github.com/k8sgpt-ai/k8sgpt/issues/1440)) ([a5574ee](https://github.com/k8sgpt-ai/k8sgpt/commit/a5574ee49d530960a515c419f4875cf02cb36fb3))
+* fixing ([#1437](https://github.com/k8sgpt-ai/k8sgpt/issues/1437)) ([f68ff0e](https://github.com/k8sgpt-ai/k8sgpt/commit/f68ff0efee9bad5f8368c83800611fa9acbc53d7))
+
+## [0.4.8](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.7...v0.4.8) (2025-04-07)
+
+
+### Other
+
+* removed krew release ([#1434](https://github.com/k8sgpt-ai/k8sgpt/issues/1434)) ([39ae2aa](https://github.com/k8sgpt-ai/k8sgpt/commit/39ae2aa6351d6a77e0b45ad15b0d10b86a33f3be))
+
+## [0.4.7](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.6...v0.4.7) (2025-04-07)
+
+
+### Other
+
+* **deps:** update actions/upload-artifact digest to ea165f8 ([#1425](https://github.com/k8sgpt-ai/k8sgpt/issues/1425)) ([9bffc7c](https://github.com/k8sgpt-ai/k8sgpt/commit/9bffc7cff776733f6d05669e6c02f594ee2db261))
+* fixing build ([#1431](https://github.com/k8sgpt-ai/k8sgpt/issues/1431)) ([c5fe2c6](https://github.com/k8sgpt-ai/k8sgpt/commit/c5fe2c68d18d4fd713b3e638066327ad586d1871))
+
+## [0.4.6](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.5...v0.4.6) (2025-04-07)
+
+
+### Other
+
+* **deps:** pin docker/build-push-action action to 471d1dc ([#1428](https://github.com/k8sgpt-ai/k8sgpt/issues/1428)) ([5086ccd](https://github.com/k8sgpt-ai/k8sgpt/commit/5086ccd65942ebb9a37bd2c3a48d16c4be99e8c1))
+* fixing docker build push action ([#1426](https://github.com/k8sgpt-ai/k8sgpt/issues/1426)) ([1681aad](https://github.com/k8sgpt-ai/k8sgpt/commit/1681aadac106c608de9774ebfd7ea9df20eed482))
+* updated actor for login ([#1430](https://github.com/k8sgpt-ai/k8sgpt/issues/1430)) ([b626102](https://github.com/k8sgpt-ai/k8sgpt/commit/b6261026f8b41e505359a52c18bebec7ef5079f9))
+
+## [0.4.5](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.4...v0.4.5) (2025-04-07)
+
+
+### Other
+
+* fix workflows ([#1423](https://github.com/k8sgpt-ai/k8sgpt/issues/1423)) ([3dbc9e1](https://github.com/k8sgpt-ai/k8sgpt/commit/3dbc9e1a20a3a55971733d990ecd39e798a804e9))
+
+## [0.4.4](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.3...v0.4.4) (2025-04-06)
+
+
+### Other
+
+* **deps:** update docker/setup-buildx-action digest to b5ca514 ([#1371](https://github.com/k8sgpt-ai/k8sgpt/issues/1371)) ([d4de5d9](https://github.com/k8sgpt-ai/k8sgpt/commit/d4de5d9e3fdd1cc4c7d6fc067a7426fef1d32c1d))
+* **deps:** update module github.com/docker/docker to v28 ([#1376](https://github.com/k8sgpt-ai/k8sgpt/issues/1376)) ([68ddac0](https://github.com/k8sgpt-ai/k8sgpt/commit/68ddac008955933ffa27c2c4e46d286d9a26e100))
+* updating deps ([#1422](https://github.com/k8sgpt-ai/k8sgpt/issues/1422)) ([5b7fb7e](https://github.com/k8sgpt-ai/k8sgpt/commit/5b7fb7e6199635e109c1bf7355bc11ff6f60071b))
+
+## [0.4.3](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.2...v0.4.3) (2025-04-04)
+
+
+### Bug Fixes
+
+* **deps:** update module gopkg.in/yaml.v2 to v3 ([#1363](https://github.com/k8sgpt-ai/k8sgpt/issues/1363)) ([e4861e9](https://github.com/k8sgpt-ai/k8sgpt/commit/e4861e9e2d631652b82768567afb9ba174114134))
+* prometheus UTF8Validation ([#1404](https://github.com/k8sgpt-ai/k8sgpt/issues/1404)) ([3c353b0](https://github.com/k8sgpt-ai/k8sgpt/commit/3c353b0e931028f3be3b229518cf86d24422a29d))
+
+
+### Other
+
+* added new AmazonBedrock model  ([#1390](https://github.com/k8sgpt-ai/k8sgpt/issues/1390)) ([ad2c90a](https://github.com/k8sgpt-ai/k8sgpt/commit/ad2c90a129074a13dac4fdd8e918d8e26159c7a1))
+* **deps:** pin golangci/golangci-lint-action action to 1481404 ([#1415](https://github.com/k8sgpt-ai/k8sgpt/issues/1415)) ([e231032](https://github.com/k8sgpt-ai/k8sgpt/commit/e231032e1bec1d2d25cb03b35e701aa86a61d5ee))
+* **deps:** update goreleaser/goreleaser-action digest to 9c156ee ([#1411](https://github.com/k8sgpt-ai/k8sgpt/issues/1411)) ([c823de1](https://github.com/k8sgpt-ai/k8sgpt/commit/c823de12e6b6efcf9f5639665aac602ed85ae31d))
+* linter ([#1414](https://github.com/k8sgpt-ai/k8sgpt/issues/1414)) ([f0b18cf](https://github.com/k8sgpt-ai/k8sgpt/commit/f0b18cfb1cd418b94b448d3b9de43f03841c92bb))
+
+
+### Docs
+
+* add table of contents and cleanup ([#1413](https://github.com/k8sgpt-ai/k8sgpt/issues/1413)) ([a31d07c](https://github.com/k8sgpt-ai/k8sgpt/commit/a31d07c802694d3455b665382ff12a2abc3e0ef7))
+* remove extra dollar sign in README.md ([#1410](https://github.com/k8sgpt-ai/k8sgpt/issues/1410)) ([a962741](https://github.com/k8sgpt-ai/k8sgpt/commit/a962741220bf98e159f14895d01cd596a7691f87))
+
+## [0.4.2](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.1...v0.4.2) (2025-03-28)
+
+
+### Features
+
+* old sonnet ([#1408](https://github.com/k8sgpt-ai/k8sgpt/issues/1408)) ([e5817f9](https://github.com/k8sgpt-ai/k8sgpt/commit/e5817f9e557f4f97b016a0a7b7674342c3a1773e))
+
+
+### Bug Fixes
+
+* **deps:** update k8s.io/utils digest to 1f6e0b7 ([#1405](https://github.com/k8sgpt-ai/k8sgpt/issues/1405)) ([f5eaf81](https://github.com/k8sgpt-ai/k8sgpt/commit/f5eaf817f0cf2b732013e67e94c758a225c35ba6))
+
+
+### Other
+
+* **deps:** update actions/setup-go digest to 0aaccfd ([#1401](https://github.com/k8sgpt-ai/k8sgpt/issues/1401)) ([81d4aaf](https://github.com/k8sgpt-ai/k8sgpt/commit/81d4aaf402647bf4bcbc618fd82f9518cf3a5b4d))
+* **deps:** update actions/upload-artifact digest to ea165f8 ([#1402](https://github.com/k8sgpt-ai/k8sgpt/issues/1402)) ([eb381b8](https://github.com/k8sgpt-ai/k8sgpt/commit/eb381b8087bbb3216d9bcdcc88a71fbad9e31e41))
+* **deps:** update docker/login-action digest to 74a5d14 ([#1397](https://github.com/k8sgpt-ai/k8sgpt/issues/1397)) ([fdf8e7a](https://github.com/k8sgpt-ai/k8sgpt/commit/fdf8e7a95a6667b782e1e347a3b1d2fb0f2aafde))
+* fix error ([#1403](https://github.com/k8sgpt-ai/k8sgpt/issues/1403)) ([288ca86](https://github.com/k8sgpt-ai/k8sgpt/commit/288ca862b3aaf942e58aa0dad0e15e2fda84780f))
+
+## [0.4.1](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.0...v0.4.1) (2025-03-17)
+
+
+### Features
+
+* add amazon bedrock nova pro and nova lite models ([#1383](https://github.com/k8sgpt-ai/k8sgpt/issues/1383)) ([aa1e237](https://github.com/k8sgpt-ai/k8sgpt/commit/aa1e237ebb8c816383561c9b3e6a1ca0ddea8f78))
+* add custom restful backend for complex scenarios (e.g, rag) ([#1228](https://github.com/k8sgpt-ai/k8sgpt/issues/1228)) ([7540e00](https://github.com/k8sgpt-ai/k8sgpt/commit/7540e0084e0c0c44fc52ed9a906b76f9f2e6a981))
+
+
+### Bug Fixes
+
+* **deps:** update default model to gpt-4o for improved performance and cost efficiency ([#1332](https://github.com/k8sgpt-ai/k8sgpt/issues/1332)) ([4e39cb6](https://github.com/k8sgpt-ai/k8sgpt/commit/4e39cb65b3a7fc0d1c057c647794346e072d3fd0))
+* **deps:** update module golang.org/x/net to v0.36.0 [security] ([#1395](https://github.com/k8sgpt-ai/k8sgpt/issues/1395)) ([eb7b36a](https://github.com/k8sgpt-ai/k8sgpt/commit/eb7b36aa2764bc460ffc29a0aee18abe3631c2ed))
+
+
+### Other
+
+* **deps:** update actions/setup-go digest to f111f33 ([#1364](https://github.com/k8sgpt-ai/k8sgpt/issues/1364)) ([f2fdfd8](https://github.com/k8sgpt-ai/k8sgpt/commit/f2fdfd8dcaae6f57378d50396c4746d738d38bf2))
+* **deps:** update goreleaser/goreleaser-action digest to 90a3faa ([#1308](https://github.com/k8sgpt-ai/k8sgpt/issues/1308)) ([d6d2e3b](https://github.com/k8sgpt-ai/k8sgpt/commit/d6d2e3bc4254877c8af61aba7386706e942e3fe9))
+* **deps:** update softprops/action-gh-release digest to c95fe14 ([#1359](https://github.com/k8sgpt-ai/k8sgpt/issues/1359)) ([db5e517](https://github.com/k8sgpt-ai/k8sgpt/commit/db5e517dbb23a4cb0f203427744f4007d6e9faa8))
+
+## [0.4.0](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.3.50...v0.4.0) (2025-03-06)
+
+
+### ⚠ BREAKING CHANGES
+
+* Removal of Trivy ([#1386](https://github.com/k8sgpt-ai/k8sgpt/issues/1386))
+
+### Features
+
+* Removal of Trivy ([#1386](https://github.com/k8sgpt-ai/k8sgpt/issues/1386)) ([d1b2227](https://github.com/k8sgpt-ai/k8sgpt/commit/d1b2227ff9a8ef42bf63c83e289fbd801706821e))
+
+
+### Bug Fixes
+
+* [Bug] Filter PolicyReport ignores namespace flag ([#1355](https://github.com/k8sgpt-ai/k8sgpt/issues/1355)) ([9dcb21e](https://github.com/k8sgpt-ai/k8sgpt/commit/9dcb21e160233eb120ccf50f9b9b80c145d0e01a))
+
+
+### Other
+
+* Adding region ([#1388](https://github.com/k8sgpt-ai/k8sgpt/issues/1388)) ([4f4f4f1](https://github.com/k8sgpt-ai/k8sgpt/commit/4f4f4f13a065ca7add283088c93777f78dcea228))
+* **deps:** update actions/upload-artifact digest to 4cec3d8 ([#1378](https://github.com/k8sgpt-ai/k8sgpt/issues/1378)) ([093975e](https://github.com/k8sgpt-ai/k8sgpt/commit/093975e50ddadeab70a7c4f544df8351ac9758a2))
+* **deps:** update codecov/codecov-action digest to 0565863 ([#1387](https://github.com/k8sgpt-ai/k8sgpt/issues/1387)) ([2a6f485](https://github.com/k8sgpt-ai/k8sgpt/commit/2a6f48500c4567519453fc51ea070f5e407d3cfb))
+* **deps:** update docker/build-push-action digest to 471d1dc ([#1358](https://github.com/k8sgpt-ai/k8sgpt/issues/1358)) ([f2e3b9a](https://github.com/k8sgpt-ai/k8sgpt/commit/f2e3b9a8a72c4df32713197e50756e37e1302ff9))
+* remediating security issue ([#1381](https://github.com/k8sgpt-ai/k8sgpt/issues/1381)) ([1f95358](https://github.com/k8sgpt-ai/k8sgpt/commit/1f953585c91f8a208db3b37440e4d458b8d821eb))
+
+## [0.3.50](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.3.49...v0.3.50) (2025-02-24)
+
+
+### Features
+
+* rework to how bedrock data models are structured and accessed ([#1369](https://github.com/k8sgpt-ai/k8sgpt/issues/1369)) ([7dadea2](https://github.com/k8sgpt-ai/k8sgpt/commit/7dadea257007df64148f1e47f7960d1d30df67b2))
+
+## [0.3.49](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.3.48...v0.3.49) (2025-02-20)
+
+
+### Bug Fixes
+
+* **deps:** update all non-major dependencies ([#1335](https://github.com/k8sgpt-ai/k8sgpt/issues/1335)) ([8cd3b29](https://github.com/k8sgpt-ai/k8sgpt/commit/8cd3b2985e4cd61711497fb0436e72b6b8aa3162))
+* **deps:** update k8s.io/utils digest to 24370be ([#1344](https://github.com/k8sgpt-ai/k8sgpt/issues/1344)) ([fcc8563](https://github.com/k8sgpt-ai/k8sgpt/commit/fcc8563e4eba9bf45d49901b7287d311b93372c2))
+* **deps:** update module golang.org/x/net to v0.33.0 [security] ([#1354](https://github.com/k8sgpt-ai/k8sgpt/issues/1354)) ([5de4f77](https://github.com/k8sgpt-ai/k8sgpt/commit/5de4f7704a856fd7db7b2f800bda40c5beb9333b))
+* **deps:** update module gopkg.in/yaml.v2 to v3 ([#1336](https://github.com/k8sgpt-ai/k8sgpt/issues/1336)) ([19abbef](https://github.com/k8sgpt-ai/k8sgpt/commit/19abbef9a3112ceb060ac3fd772e2e4f62f19f84))
+* prevent npe by handling checking error in NewAnalysis call ([#1365](https://github.com/k8sgpt-ai/k8sgpt/issues/1365)) ([83672fa](https://github.com/k8sgpt-ai/k8sgpt/commit/83672fa768887dd1c6f4dc12a92c3444f100c4f6))
+
+
+### Other
+
+* **deps:** update actions/setup-go digest to 3041bf5 ([#1347](https://github.com/k8sgpt-ai/k8sgpt/issues/1347)) ([939e067](https://github.com/k8sgpt-ai/k8sgpt/commit/939e0672aaaa5538cd58bb171f1e5d1c07831651))
+* **deps:** update actions/upload-artifact digest to 65c4c4a ([#1350](https://github.com/k8sgpt-ai/k8sgpt/issues/1350)) ([c506a4b](https://github.com/k8sgpt-ai/k8sgpt/commit/c506a4b441e24052398c00c93d96806cec1b9f75))
+* **deps:** update codecov/codecov-action digest to 13ce06b ([#1342](https://github.com/k8sgpt-ai/k8sgpt/issues/1342)) ([990d723](https://github.com/k8sgpt-ai/k8sgpt/commit/990d7239091b368178e06af60e4dc0e897fc8236))
+* **deps:** update docker/setup-buildx-action digest to 6524bf6 ([#1349](https://github.com/k8sgpt-ai/k8sgpt/issues/1349)) ([2918556](https://github.com/k8sgpt-ai/k8sgpt/commit/2918556793316ea4f5a319c9aa51c1fec12ede85))
+* fix typo in "completion" ([#1362](https://github.com/k8sgpt-ai/k8sgpt/issues/1362)) ([06b8f78](https://github.com/k8sgpt-ai/k8sgpt/commit/06b8f78150308c1f6023747fa34826e038d6bc3a))
+
+
+### Docs
+
+* fix broken schema link in README.md ([#1373](https://github.com/k8sgpt-ai/k8sgpt/issues/1373)) ([076ca2f](https://github.com/k8sgpt-ai/k8sgpt/commit/076ca2f14832cf83e43c465c377ef21825218b2f))
+
+## [0.3.48](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.3.47...v0.3.48) (2024-12-04)
+
+
+### Features
+
+* fixed missing cache params ([#1340](https://github.com/k8sgpt-ai/k8sgpt/issues/1340)) ([1363219](https://github.com/k8sgpt-ai/k8sgpt/commit/1363219b1b94e157ef03c53eba8838b7cef559b4))
+
+## [0.3.47](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.3.46...v0.3.47) (2024-12-02)
+
+
+### Features
+
+* add new AWS Bedrock model ids ([#1330](https://github.com/k8sgpt-ai/k8sgpt/issues/1330)) ([a12aa07](https://github.com/k8sgpt-ai/k8sgpt/commit/a12aa07b1a2e34c5106b7b930b29b0c97b172dc4))
+* adds interplex as a caching provider ([#1328](https://github.com/k8sgpt-ai/k8sgpt/issues/1328)) ([d6d80ee](https://github.com/k8sgpt-ai/k8sgpt/commit/d6d80ee86083643d9b91457791bfc77ef475e82e))
+* dump ([#1322](https://github.com/k8sgpt-ai/k8sgpt/issues/1322)) ([da266b3](https://github.com/k8sgpt-ai/k8sgpt/commit/da266b3c82ca8b3e96461be688a9f30e408568fe))
+
+
+### Bug Fixes
+
+* add maxTokens to serve mode ([#1280](https://github.com/k8sgpt-ai/k8sgpt/issues/1280)) ([a50375c](https://github.com/k8sgpt-ai/k8sgpt/commit/a50375c9605a87546a0fcbcacabe5482fdfa1c2c))
+* **deps:** update all non-major dependencies ([#1323](https://github.com/k8sgpt-ai/k8sgpt/issues/1323)) ([b3f60b2](https://github.com/k8sgpt-ai/k8sgpt/commit/b3f60b2d2018d4bede3918adcb3547ef2acf6688))
+* **deps:** update module gopkg.in/yaml.v2 to v3 ([#1303](https://github.com/k8sgpt-ai/k8sgpt/issues/1303)) ([2da0573](https://github.com/k8sgpt-ai/k8sgpt/commit/2da057360b378d34126e1480ade0686f104e3ace))
+* **deps:** update module gopkg.in/yaml.v2 to v3 ([#1321](https://github.com/k8sgpt-ai/k8sgpt/issues/1321)) ([69c67bd](https://github.com/k8sgpt-ai/k8sgpt/commit/69c67bd1d9d4404816a8b7a00c98499729f2185f))
+* **deps:** update module gopkg.in/yaml.v2 to v3 ([#1326](https://github.com/k8sgpt-ai/k8sgpt/issues/1326)) ([5514ebb](https://github.com/k8sgpt-ai/k8sgpt/commit/5514ebb53b79b5bac0fc861ffdebc9399fe87b62))
+* update OpenAI API key generation URL to reflect new platform link ([#1331](https://github.com/k8sgpt-ai/k8sgpt/issues/1331)) ([ec5e42b](https://github.com/k8sgpt-ai/k8sgpt/commit/ec5e42b8f43e90632bb62dd89cc6aa3665e0f60d))
+
+
+### Other
+
+* **deps:** update all non-major dependencies ([#1327](https://github.com/k8sgpt-ai/k8sgpt/issues/1327)) ([a841568](https://github.com/k8sgpt-ai/k8sgpt/commit/a841568a9c4c0012291cf8f4248250192b72a383))
+* **deps:** update codecov/codecov-action action to v5 ([#1324](https://github.com/k8sgpt-ai/k8sgpt/issues/1324)) ([cb1e1ff](https://github.com/k8sgpt-ai/k8sgpt/commit/cb1e1ffede1d3086d54157142c6803341e560ca8))
+* **deps:** update codecov/codecov-action digest to 015f24e ([#1325](https://github.com/k8sgpt-ai/k8sgpt/issues/1325)) ([4d7eb0f](https://github.com/k8sgpt-ai/k8sgpt/commit/4d7eb0f6226fc50f58b5c2fff7534dd16e2ca378))
+* **deps:** update docker/build-push-action action to v6 ([#1294](https://github.com/k8sgpt-ai/k8sgpt/issues/1294)) ([f37d923](https://github.com/k8sgpt-ai/k8sgpt/commit/f37d92391877819c6d26a993ab58bc0c49fb3b66))
+* **deps:** update docker/build-push-action digest to 48aba3b ([#1333](https://github.com/k8sgpt-ai/k8sgpt/issues/1333)) ([c21ba86](https://github.com/k8sgpt-ai/k8sgpt/commit/c21ba86237db651086c0a37abc3454db513e505b))
+* **deps:** update rajatjindal/krew-release-bot action to v0.0.47 ([#1317](https://github.com/k8sgpt-ai/k8sgpt/issues/1317)) ([896a53b](https://github.com/k8sgpt-ai/k8sgpt/commit/896a53be8394c490e2d34f151de44c3663dddf5b))
+
 ## [0.3.46](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.3.45...v0.3.46) (2024-11-10)
 
 

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.20`
+- Golang `1.23`
 - 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`

README.md

@@ -24,14 +24,27 @@ _Out of the box integration with OpenAI, Azure, Cohere, Amazon Bedrock, Google G
 <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>
 
 
-<img src="images/demo4.gif" width=650px; />
+<img src="images/demo4.gif" width="650px">
+
+# 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
+brew install k8sgpt
 ```
 
 or
@@ -49,7 +62,7 @@ brew install k8sgpt
   <!---x-release-please-start-version-->
 
   ```
-  sudo rpm -ivh https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.46/k8sgpt_386.rpm
+  sudo rpm -ivh https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.11/k8sgpt_386.rpm
   ```
   <!---x-release-please-end-->
 
@@ -57,7 +70,7 @@ brew install k8sgpt
 
   <!---x-release-please-start-version-->
   ```
-  sudo rpm -ivh https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.46/k8sgpt_amd64.rpm
+  sudo rpm -ivh https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.11/k8sgpt_amd64.rpm
   ```
   <!---x-release-please-end-->
 </details>
@@ -70,7 +83,7 @@ brew install k8sgpt
   <!---x-release-please-start-version-->
 
 ```
-curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.46/k8sgpt_386.deb
+curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.11/k8sgpt_386.deb
 sudo dpkg -i k8sgpt_386.deb
 ```
 
@@ -81,7 +94,7 @@ sudo dpkg -i k8sgpt_386.deb
   <!---x-release-please-start-version-->
 
 ```
-curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.46/k8sgpt_amd64.deb
+curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.11/k8sgpt_amd64.deb
 sudo dpkg -i k8sgpt_amd64.deb
 ```
 
@@ -96,7 +109,7 @@ sudo dpkg -i k8sgpt_amd64.deb
 
   <!---x-release-please-start-version-->
   ```
-  wget https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.46/k8sgpt_386.apk
+  wget https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.11/k8sgpt_386.apk
   apk add --allow-untrusted k8sgpt_386.apk
   ```
   <!---x-release-please-end-->
@@ -105,7 +118,7 @@ sudo dpkg -i k8sgpt_amd64.deb
 
   <!---x-release-please-start-version-->
   ```
-  wget https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.46/k8sgpt_amd64.apk
+  wget https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.11/k8sgpt_amd64.apk
   apk add --allow-untrusted k8sgpt_amd64.apk
   ```
   <!---x-release-please-end-->
@@ -133,7 +146,7 @@ If you install gcc as suggested, the problem will persist. Therefore, you need t
 
 - 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_ variable with the binary location
+- Extract the downloaded package to your desired location. Configure the system _PATH_ environment variable with the binary location
 
 ## Operator Installation
 
@@ -324,17 +337,24 @@ _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 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
+```
+
 </details>
 
 ## LLM AI Backends
@@ -359,6 +379,8 @@ Unused:
 > huggingface
 > noopai
 > googlevertexai
+> watsonxai
+> customrest
 > ibmwatsonxai
 ```
 
@@ -403,11 +425,9 @@ The Kubernetes system is trying to scale a StatefulSet named tGLcCRcHa1Ce5Rs usi
 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.
 ```
 
-Note: **Anonymization does not currently apply to events.**
-
 ### Further Details
 
-**Anonymization does not currently apply to events.**
+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**._
 
@@ -425,7 +445,7 @@ _In a few analysers like Pod, we feed to the AI backend the event messages which
 
 - The following is the list of analysers in which data is **not being masked**:-
 
-  - RepicaSet
+  - ReplicaSet
   - PersistentVolumeClaim
   - Pod
   - Log
@@ -476,7 +496,7 @@ 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 only configure and use only one remote cache at a time</em>
+<em>Note: You can configure and use only one remote cache at a time</em>
 
 _Adding a remote cache_
 
@@ -522,7 +542,7 @@ k8sgpt cache remove
 <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/analyzer.proto) and serving the analyzer for consumption.
+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:
 
@@ -572,7 +592,7 @@ 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-332vhyaxv-bfjJwHZLXWVCB3QaXafEYQ)
 
 <a href="https://github.com/k8sgpt-ai/k8sgpt/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=k8sgpt-ai/k8sgpt" />

cmd/analyze/analyze.go

@@ -23,6 +23,7 @@ import (
 	"github.com/k8sgpt-ai/k8sgpt/pkg/ai/interactive"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/analysis"
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 )
 
 var (
@@ -67,25 +68,45 @@ var AnalyzeCmd = &cobra.Command{
 			withStats,
 		)
 
+		verbose := viper.GetBool("verbose")
+		if verbose {
+			fmt.Println("Debug: Checking analysis configuration.")
+		}
 		if err != nil {
 			color.Red("Error: %v", err)
 			os.Exit(1)
 		}
+		if verbose {
+			fmt.Println("Debug: Analysis initialized.")
+		}
 		defer config.Close()
 
 		if customAnalysis {
 			config.RunCustomAnalysis()
+			if verbose {
+				fmt.Println("Debug: All custom analyzers completed.")
+			}
 		}
 		config.RunAnalysis()
+		if verbose {
+			fmt.Println("Debug: All core analyzers completed.")
+		}
 
 		if explain {
-			if err := config.GetAIResults(output, anonymize); err != nil {
+			err := config.GetAIResults(output, anonymize)
+			if verbose {
+				fmt.Println("Debug: Checking AI results.")
+			}
+			if err != nil {
 				color.Red("Error: %v", err)
 				os.Exit(1)
 			}
 		}
 		// print results
 		output_data, err := config.PrintOutput(output)
+		if verbose {
+			fmt.Println("Debug: Checking output.")
+		}
 		if err != nil {
 			color.Red("Error: %v", err)
 			os.Exit(1)

cmd/auth/add.go

@@ -28,7 +28,7 @@ import (
 
 const (
 	defaultBackend = "openai"
-	defaultModel   = "gpt-3.5-turbo"
+	defaultModel   = "gpt-4o"
 )
 
 var addCmd = &cobra.Command{

cmd/cache/add.go

@@ -17,6 +17,7 @@ package cache
 import (
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/fatih/color"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/cache"
@@ -40,9 +41,10 @@ var addCmd = &cobra.Command{
 	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
-	- Google Cloud storage
-	- S3`,
+	- 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")
@@ -50,7 +52,7 @@ var addCmd = &cobra.Command{
 		}
 		fmt.Println(color.YellowString("Adding remote based cache"))
 		cacheType := args[0]
-		remoteCache, err := cache.NewCacheProvider(cacheType, bucketName, region, endpoint, storageAccount, containerName, projectId, insecure)
+		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)

cmd/cache/get.go

@@ -0,0 +1,45 @@
+/*
+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/dump/dump.go

@@ -0,0 +1,113 @@
+/*
+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/generate/generate.go

@@ -45,7 +45,7 @@ var GenerateCmd = &cobra.Command{
 			backendType = backend
 		}
 		fmt.Println("")
-		openbrowser("https://beta.openai.com/account/api-keys")
+		openbrowser("https://platform.openai.com/api-keys")
 	},
 }
 
@@ -81,10 +81,10 @@ func openbrowser(url string) {
 func printInstructions(isGui bool, backendType string) {
 	fmt.Println("")
 	if isGui {
-		color.Green("Opening: https://beta.openai.com/account/api-keys to generate a key for %s", backendType)
+		color.Green("Opening: https://platform.openai.com/api-keys to generate a key for %s", backendType)
 		fmt.Println("")
 	} else {
-		color.Green("Please open: https://beta.openai.com/account/api-keys to generate a key for %s", backendType)
+		color.Green("Please open: https://platform.openai.com/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")

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 trivy`,
+	Long:  `For example e.g. k8sgpt integration deactivate prometheus`,
 	Run: func(cmd *cobra.Command, args []string) {
 		integrationName := args[0]
 

cmd/integration/integration.go

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

cmd/root.go

@@ -23,6 +23,7 @@ import (
 	"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"
@@ -36,6 +37,7 @@ var (
 	cfgFile     string
 	kubecontext string
 	kubeconfig  string
+	verbose     bool
 	Version     string
 	Commit      string
 	Date        string
@@ -57,6 +59,9 @@ 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)
 	err := rootCmd.Execute()
 	if err != nil {
 		os.Exit(1)
@@ -70,6 +75,7 @@ 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)
@@ -79,6 +85,7 @@ func init() {
 	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", fmt.Sprintf("Default config file (%s/k8sgpt/k8sgpt.yaml)", xdg.ConfigHome))
 	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.")
+	rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "Show detailed tool actions (e.g., API calls, checks).")
 }
 
 // initConfig reads in config file and ENV variables if set.
@@ -99,6 +106,7 @@ func initConfig() {
 
 	viper.Set("kubecontext", kubecontext)
 	viper.Set("kubeconfig", kubeconfig)
+	viper.Set("verbose", verbose)
 
 	viper.SetEnvPrefix("K8SGPT")
 	viper.AutomaticEnv() // read in environment variables that match

cmd/root_test.go

@@ -0,0 +1,30 @@
+/*
+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 cmd
+
+import (
+	"testing"
+
+	"github.com/spf13/viper"
+)
+
+// Test that verbose flag is correctly set in viper.
+func TestInitConfig_VerboseFlag(t *testing.T) {
+	verbose = true
+	viper.Reset()
+	initConfig()
+	if !viper.GetBool("verbose") {
+		t.Error("Expected verbose flag to be true")
+	}
+}

cmd/serve/serve.go

@@ -30,6 +30,7 @@ const (
 	defaultTemperature float32 = 0.7
 	defaultTopP        float32 = 1.0
 	defaultTopK        int32   = 50
+	defaultMaxTokens   int     = 2048
 )
 
 var (
@@ -102,6 +103,18 @@ var ServeCmd = &cobra.Command{
 				}
 				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")
@@ -125,6 +138,7 @@ var ServeCmd = &cobra.Command{
 					Temperature:   temperature(),
 					TopP:          topP(),
 					TopK:          topK(),
+					MaxTokens:     maxTokens(),
 				}
 
 				configAI.Providers = append(configAI.Providers, *aiProvider)

go.mod

@@ -3,195 +3,142 @@ module github.com/k8sgpt-ai/k8sgpt
 go 1.23.3
 
 require (
-	github.com/aquasecurity/trivy-operator v0.22.0
 	github.com/fatih/color v1.18.0
 	github.com/kedacore/keda/v2 v2.16.0
-	github.com/magiconair/properties v1.8.7
+	github.com/magiconair/properties v1.8.9
 	github.com/mittwald/go-helm-client v0.12.14
-	github.com/ollama/ollama v0.4.1
-	github.com/sashabaranov/go-openai v1.35.6
+	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.9.0
-	golang.org/x/term v0.26.0
-	helm.sh/helm/v3 v3.16.2
-	k8s.io/api v0.31.2
-	k8s.io/apimachinery v0.31.2
-	k8s.io/client-go v0.31.2
-	k8s.io/kubectl v0.31.1 // indirect
+	github.com/stretchr/testify v1.10.0
+	golang.org/x/term v0.30.0
+	helm.sh/helm/v3 v3.17.3
+	k8s.io/api v0.32.2
+	k8s.io/apimachinery v0.32.2
+	k8s.io/client-go v0.32.2
+	k8s.io/kubectl v0.32.2 // indirect
 
 )
 
 require github.com/adrg/xdg v0.5.3
 
 require (
-	buf.build/gen/go/k8sgpt-ai/k8sgpt/grpc-ecosystem/gateway/v2 v2.23.0-20240920204244-7a91c8620515.1
-	buf.build/gen/go/k8sgpt-ai/k8sgpt/grpc/go v1.5.1-20240920204244-7a91c8620515.1
-	buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go v1.35.1-20240920204244-7a91c8620515.1
-	cloud.google.com/go/storage v1.46.0
+	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.0
-	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.1
+	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.5
-	github.com/cohere-ai/cohere-go/v2 v2.12.0
+	github.com/agiledragon/gomonkey/v2 v2.13.0
+	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.18.0
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.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.78.0
-	github.com/prometheus/prometheus v0.55.1
-	github.com/pterm/pterm v0.12.79
-	google.golang.org/api v0.205.0
+	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.1
-	sigs.k8s.io/gateway-api v1.2.0
+	gopkg.in/yaml.v3 v3.0.1
+	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.16.1 // 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.68.0 // indirect
-	cloud.google.com/go/auth v0.10.1 // indirect
-	cloud.google.com/go/auth/oauth2adapt v0.2.5 // indirect
-	cloud.google.com/go/compute/metadata v0.5.2 // indirect
-	cloud.google.com/go/iam v1.2.1 // indirect
-	cloud.google.com/go/longrunning v0.6.1 // 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.16.0 // 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.2.3 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 // 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/go-winio v0.6.2 // indirect
 	github.com/Microsoft/hcsshim v0.12.4 // indirect
-	github.com/OneOfOne/xxhash v1.2.8 // indirect
-	github.com/ProtonMail/go-crypto v1.1.0-alpha.2 // indirect
-	github.com/agext/levenshtein v1.2.3 // indirect
-	github.com/agnivade/levenshtein v1.1.1 // indirect
-	github.com/alecthomas/chroma v0.10.0 // indirect
-	github.com/alecthomas/units v0.0.0-20240626203959-61d1e3462e30 // indirect
-	github.com/apparentlymart/go-cidr v1.1.0 // indirect
-	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
-	github.com/aquasecurity/go-version v0.0.0-20240603093900-cf8a8d29271d // indirect
-	github.com/aquasecurity/trivy-checks v0.13.0 // 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/aws-sdk-go-v2/service/s3 v1.55.1 // indirect
 	github.com/aws/smithy-go v1.22.0 // indirect
-	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
-	github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
 	github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
-	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
 	github.com/containerd/console v1.0.4 // indirect
-	github.com/containerd/errdefs v0.1.0 // 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/typeurl/v2 v2.1.1 // 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/dlclark/regexp2 v1.10.0 // indirect
-	github.com/docker/go-units v0.5.0 // indirect
-	github.com/emirpasic/gods v1.18.1 // indirect
-	github.com/envoyproxy/go-control-plane v0.13.0 // indirect
-	github.com/envoyproxy/protoc-gen-validate v1.1.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/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
-	github.com/go-git/go-billy/v5 v5.5.0 // indirect
-	github.com/go-git/go-git/v5 v5.12.0 // indirect
-	github.com/go-ini/ini v1.67.0 // indirect
-	github.com/go-kit/log v0.2.1 // indirect
-	github.com/go-logfmt/logfmt v0.6.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.8 // 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.13.0 // 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/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-getter v1.7.5 // indirect
-	github.com/hashicorp/go-safetemp v1.0.0 // indirect
-	github.com/hashicorp/go-uuid v1.0.3 // indirect
-	github.com/hashicorp/go-version v1.7.0 // indirect
-	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
-	github.com/hashicorp/hcl/v2 v2.20.1 // indirect
-	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/jpillora/backoff v1.0.0 // indirect
-	github.com/kevinburke/ssh_config v1.2.0 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
-	github.com/liamg/iamgo v0.0.9 // indirect
-	github.com/liamg/jfather v0.0.7 // indirect
-	github.com/liamg/memoryfs v1.6.0 // indirect
 	github.com/lithammer/fuzzysearch v1.1.8 // indirect
-	github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect
-	github.com/masahiro331/go-disk v0.0.0-20220919035250-c8da316f91ac // indirect
-	github.com/masahiro331/go-ext4-filesystem v0.0.0-20231208112839-4339555a0cd4 // indirect
-	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
-	github.com/moby/buildkit v0.13.2 // indirect
-	github.com/moby/docker-image-spec v1.3.1 // indirect
-	github.com/moby/sys/userns v0.1.0 // 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/open-policy-agent/opa v0.65.0 // indirect
-	github.com/owenrumney/squealer v1.2.2 // indirect
-	github.com/package-url/packageurl-go v0.1.3 // indirect
-	github.com/pjbgf/sha1cd v0.3.0 // 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/common/sigv4 v0.1.0 // indirect
-	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // 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/skeema/knownhosts v1.2.2 // indirect
 	github.com/sony/gobreaker v0.5.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
-	github.com/tchap/go-patricia/v2 v2.3.1 // indirect
-	github.com/ulikunitz/xz v0.5.11 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
-	github.com/yashtewari/glob-intersection v0.2.0 // indirect
-	github.com/zclconf/go-cty v1.14.4 // indirect
-	github.com/zclconf/go-cty-yaml v1.0.3 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/contrib/detectors/gcp v1.29.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.54.0 // indirect
-	go.opentelemetry.io/otel/metric v1.31.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.31.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v1.31.0 // indirect
-	golang.org/x/mod v0.21.0 // indirect
-	golang.org/x/tools v0.26.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-20241021214115-324edc3d5d38 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
-	google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a // 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/warnings.v0 v0.1.2 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 	knative.dev/pkg v0.0.0-20241026180704-25f6002b00f3 // indirect
-	mvdan.cc/sh/v3 v3.8.0 // indirect
 )
 
 require (
@@ -203,27 +150,23 @@ require (
 	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/aquasecurity/table v1.8.0 // indirect
-	github.com/aquasecurity/tml v0.6.1 // indirect
-	github.com/aquasecurity/trivy v0.53.0 // indirect
-	github.com/aquasecurity/trivy-db v0.0.0-20231020043206-3770774790ce // 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.18 // indirect
-	github.com/cyphar/filepath-securejoin v0.3.1 // indirect
+	github.com/containerd/containerd v1.7.24 // indirect
+	github.com/cyphar/filepath-securejoin v0.3.6 // 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.2.0+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/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/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/fsnotify/fsnotify v1.8.0 // indirect
 	github.com/go-errors/errors v1.5.1 // indirect
 	github.com/go-gorp/gorp/v3 v3.1.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
@@ -237,7 +180,6 @@ require (
 	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/go-containerregistry v0.19.2 // 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
@@ -248,18 +190,16 @@ require (
 	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/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jmoiron/sqlx v1.4.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.9 // indirect
+	github.com/klauspost/compress v1.17.11 // 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/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-20230608043311-a335f4599b70 // 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
@@ -269,7 +209,7 @@ require (
 	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/spdystream v0.5.0 // indirect
 	github.com/moby/term v0.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -281,15 +221,14 @@ require (
 	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.20.5
+	github.com/prometheus/client_golang v1.21.0-rc.0
 	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.60.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/robfig/cron/v3 v3.0.1
-	github.com/rubenv/sql-migrate v1.7.0 // indirect
+	github.com/rubenv/sql-migrate v1.7.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/samber/lo v1.39.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
@@ -300,39 +239,40 @@ require (
 	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.31.0 // indirect
-	go.opentelemetry.io/otel/trace v1.31.0 // indirect
+	go.opentelemetry.io/otel v1.34.0 // indirect
+	go.opentelemetry.io/otel/trace v1.34.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0
-	golang.org/x/crypto v0.29.0 // indirect
+	golang.org/x/crypto v0.36.0 // indirect
 	golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect
-	golang.org/x/net v0.31.0
-	golang.org/x/oauth2 v0.23.0 // indirect
-	golang.org/x/sync v0.9.0 // indirect
-	golang.org/x/sys v0.27.0 // indirect
-	golang.org/x/text v0.20.0 // indirect
-	golang.org/x/time v0.7.0 // indirect
-	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
-	google.golang.org/grpc v1.68.0
-	google.golang.org/protobuf v1.35.1 // indirect
+	golang.org/x/net v0.37.0
+	golang.org/x/oauth2 v0.25.0 // indirect
+	golang.org/x/sync v0.12.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
+	golang.org/x/text v0.23.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
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
-	k8s.io/apiextensions-apiserver v0.31.2
-	k8s.io/apiserver v0.31.2 // indirect
-	k8s.io/cli-runtime v0.31.1 // indirect
-	k8s.io/component-base v0.31.2 // indirect
+	k8s.io/apiextensions-apiserver v0.32.2
+	k8s.io/apiserver v0.32.2 // indirect
+	k8s.io/cli-runtime v0.32.2 // indirect
+	k8s.io/component-base v0.32.2 // 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-20241104163129-6fe5fd82f078
+	k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
+	k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e
 	oras.land/oras-go v1.2.5 // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // 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/structured-merge-diff/v4 v4.4.2 // indirect
 	sigs.k8s.io/yaml v1.4.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 v27.3.1+incompatible
+replace github.com/docker/docker => github.com/docker/docker v28.0.4+incompatible
+
+replace dario.cat/mergo => github.com/imdario/mergo v1.0.1

pkg/ai/amazonbedrock.go

@@ -2,9 +2,15 @@ package ai
 
 import (
 	"context"
-	"encoding/json"
+	"errors"
 	"fmt"
 	"os"
+	"regexp"
+	"strings"
+
+	"github.com/aws/aws-sdk-go/service/bedrockruntime/bedrockruntimeiface"
+
+	"github.com/k8sgpt-ai/k8sgpt/pkg/ai/bedrock_support"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
@@ -13,18 +19,19 @@ import (
 
 const amazonbedrockAIClientName = "amazonbedrock"
 
-// AmazonBedRockClient represents the client for interacting with the Amazon Bedrock service.
+// AmazonBedRockClient represents the client for interacting with the AmazonCompletion Bedrock service.
 type AmazonBedRockClient struct {
 	nopCloser
 
-	client      *bedrockruntime.BedrockRuntime
-	model       string
+	client      bedrockruntimeiface.BedrockRuntimeAPI
+	model       *bedrock_support.BedrockModel
 	temperature float32
-	topP		float32
-	maxTokens	int
+	topP        float32
+	maxTokens   int
+	models      []bedrock_support.BedrockModel
 }
 
-// Amazon BedRock support region list US East (N. Virginia),US West (Oregon),Asia Pacific (Singapore),Asia Pacific (Tokyo),Europe (Frankfurt)
+// 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
 
@@ -34,6 +41,7 @@ const (
 	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{
@@ -42,40 +50,202 @@ var BEDROCKER_SUPPORTED_REGION = []string{
 	AP_Southeast_1,
 	AP_Northeast_1,
 	EU_Central_1,
+	AP_South_1,
 }
 
-const (
-	ModelAnthropicClaudeV2        = "anthropic.claude-v2"
-	ModelAnthropicClaudeV1        = "anthropic.claude-v1"
-	ModelAnthropicClaudeInstantV1 = "anthropic.claude-instant-v1"
-	ModelA21J2UltraV1			  = "ai21.j2-ultra-v1"
-	ModelA21J2JumboInstruct		  = "ai21.j2-jumbo-instruct"
-	ModelAmazonTitanExpressV1	  = "amazon.titan-text-express-v1"
-)
-
-var BEDROCK_MODELS = []string{
-	ModelAnthropicClaudeV2,
-	ModelAnthropicClaudeV1,
-	ModelAnthropicClaudeInstantV1,
-	ModelA21J2UltraV1,
-	ModelA21J2JumboInstruct,
-	ModelAmazonTitanExpressV1,
+var defaultModels = []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.amazon.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,
+		},
+	},
 }
 
-//const TOPP = 0.9 moved to config
-
-// GetModelOrDefault check config model
-func GetModelOrDefault(model string) string {
-
-	// Check if the provided model is in the list
-	for _, m := range BEDROCK_MODELS {
-		if m == model {
-			return model // Return the provided model
-		}
+// NewAmazonBedRockClient creates a new AmazonBedRockClient with the given models
+func NewAmazonBedRockClient(models []bedrock_support.BedrockModel) *AmazonBedRockClient {
+	if models == nil {
+		models = defaultModels // Use default models if none provided
+	}
+	return &AmazonBedRockClient{
+		models: models,
 	}
-
-	// Return the default model if the provided model is not in the list
-	return BEDROCK_MODELS[0]
 }
 
 // GetModelOrDefault check config region
@@ -95,8 +265,58 @@ func GetRegionOrDefault(region string) string {
 	return BEDROCK_DEFAULT_REGION
 }
 
+// Get model from string
+func (a *AmazonBedRockClient) getModelFromString(model string) (*bedrock_support.BedrockModel, error) {
+	if model == "" {
+		return nil, errors.New("model name cannot be empty")
+	}
+
+	// Trim spaces from the model name
+	model = strings.TrimSpace(model)
+	modelLower := strings.ToLower(model)
+
+	// Try to find an exact match first
+	for i := range a.models {
+		if strings.EqualFold(model, a.models[i].Name) || strings.EqualFold(model, a.models[i].Config.ModelName) {
+			// Create a copy to avoid returning a pointer to a loop variable
+			modelCopy := a.models[i]
+			return &modelCopy, nil
+		}
+	}
+
+	// If no exact match, try partial match
+	for i := range a.models {
+		modelNameLower := strings.ToLower(a.models[i].Name)
+		modelConfigNameLower := strings.ToLower(a.models[i].Config.ModelName)
+
+		// Check if the input string contains the model name or vice versa
+		if strings.Contains(modelNameLower, modelLower) || strings.Contains(modelLower, modelNameLower) ||
+			strings.Contains(modelConfigNameLower, modelLower) || strings.Contains(modelLower, modelConfigNameLower) {
+			// Create a copy to avoid returning a pointer to a loop variable
+			modelCopy := a.models[i]
+			// for partial match, set the model name to the input string if it is a valid ARN
+			if validateModelArn(modelLower) {
+				modelCopy.Config.ModelName = modelLower
+			}
+
+			return &modelCopy, nil
+		}
+	}
+
+	return nil, fmt.Errorf("model '%s' not found in supported models", model)
+}
+
+func validateModelArn(model string) bool {
+	var re = regexp.MustCompile(`(?m)^arn:(?P<Partition>[^:\n]*):bedrock:(?P<Region>[^:\n]*):(?P<AccountID>[^:\n]*):(?P<Ignore>(?P<ResourceType>[^:\/\n]*)[:\/])?(?P<Resource>.*)$`)
+	return re.MatchString(model)
+}
+
 // Configure configures the AmazonBedRockClient with the provided configuration.
 func (a *AmazonBedRockClient) Configure(config IAIConfig) error {
+	// Initialize models if not already initialized
+	if a.models == nil {
+		a.models = defaultModels
+	}
 
 	// Create a new AWS session
 	providerRegion := GetRegionOrDefault(config.GetProviderRegion())
@@ -109,9 +329,15 @@ func (a *AmazonBedRockClient) Configure(config IAIConfig) error {
 		return err
 	}
 
+	foundModel, err := a.getModelFromString(config.GetModel())
+	if err != nil {
+		return err
+	}
+
 	// Create a new BedrockRuntime client
 	a.client = bedrockruntime.New(sess)
-	a.model = GetModelOrDefault(config.GetModel())
+	a.model = foundModel
+	a.model.Config.ModelName = foundModel.Name
 	a.temperature = config.GetTemperature()
 	a.topP = config.GetTopP()
 	a.maxTokens = config.GetMaxTokens()
@@ -122,46 +348,19 @@ func (a *AmazonBedRockClient) Configure(config IAIConfig) error {
 // 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) {
 
-	// Prepare the input data for the model invocation based on the model & the Response Body per model as well.
-	var request map[string]interface{}
-	switch a.model {
-    case ModelAnthropicClaudeV2, ModelAnthropicClaudeV1, ModelAnthropicClaudeInstantV1:
-        request = map[string]interface{}{
-            "prompt":               fmt.Sprintf("\n\nHuman: %s  \n\nAssistant:", prompt),
-            "max_tokens_to_sample": a.maxTokens,
-            "temperature":          a.temperature,
-            "top_p":                a.topP,
-        }
-	case ModelA21J2UltraV1, ModelA21J2JumboInstruct:
-        request = map[string]interface{}{
-            "prompt":    prompt,
-            "maxTokens": a.maxTokens,
-            "temperature": a.temperature,
-            "topP":       a.topP,
-        }
-	case ModelAmazonTitanExpressV1:
-        request = map[string]interface{}{
-            "inputText": fmt.Sprintf("\n\nUser: %s", prompt),
-            "textGenerationConfig": map[string]interface{}{
-                "maxTokenCount": a.maxTokens,
-                "temperature":   a.temperature,
-                "topP":          a.topP,
-            },
-		}
-	default:
-        return "", fmt.Errorf("model %s not supported", a.model)
-	}
+	// override config defaults
+	a.model.Config.MaxTokens = a.maxTokens
+	a.model.Config.Temperature = a.temperature
+	a.model.Config.TopP = a.topP
 
-
-	body, err := json.Marshal(request)
+	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),
+		ModelId:     aws.String(a.model.Name),
 		ContentType: aws.String("application/json"),
 		Accept:      aws.String("application/json"),
 	}
@@ -171,56 +370,12 @@ func (a *AmazonBedRockClient) GetCompletion(ctx context.Context, prompt string)
 	if err != nil {
 		return "", err
 	}
-	
-	// Response type changes as per model 
-	switch a.model {
-	case ModelAnthropicClaudeV2, ModelAnthropicClaudeV1, ModelAnthropicClaudeInstantV1:
-		type InvokeModelResponseBody struct {
-			Completion  string `json:"completion"`
-			Stop_reason string `json:"stop_reason"`
-		}
-		output := &InvokeModelResponseBody{}
-		err = json.Unmarshal(resp.Body, output)
-		if err != nil {
-			return "", err
-		}
-        return output.Completion, nil
-    case ModelA21J2UltraV1, ModelA21J2JumboInstruct:
-		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(resp.Body, output)
-		if err != nil {
-			return "", err
-		}
-        return output.Completions[0].Data.Text, nil
-    case ModelAmazonTitanExpressV1:
-		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(resp.Body, output)
-		if err != nil {
-			return "", err
-		}
-        return output.Results[0].OutputText, nil
-	default:
-        return "", fmt.Errorf("model %s not supported", a.model)
-    }
+
+	// 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/amazonbedrock_test.go

@@ -0,0 +1,139 @@
+package ai
+
+import (
+	"testing"
+
+	"github.com/k8sgpt-ai/k8sgpt/pkg/ai/bedrock_support"
+	"github.com/stretchr/testify/assert"
+)
+
+// Test models for unit testing
+var testModels = []bedrock_support.BedrockModel{
+	{
+		Name:       "anthropic.claude-3-5-sonnet-20240620-v1:0",
+		Completion: &bedrock_support.CohereMessagesCompletion{},
+		Response:   &bedrock_support.CohereMessagesResponse{},
+		Config: bedrock_support.BedrockModelConfig{
+			MaxTokens:   100,
+			Temperature: 0.5,
+			TopP:        0.9,
+			ModelName:   "anthropic.claude-3-5-sonnet-20240620-v1:0",
+		},
+	},
+	{
+		Name:       "anthropic.claude-3-5-sonnet-20241022-v2:0",
+		Completion: &bedrock_support.CohereCompletion{},
+		Response:   &bedrock_support.CohereResponse{},
+		Config: bedrock_support.BedrockModelConfig{
+			MaxTokens:   100,
+			Temperature: 0.5,
+			TopP:        0.9,
+			ModelName:   "anthropic.claude-3-5-sonnet-20241022-v2:0",
+		},
+	},
+}
+
+func TestBedrockModelConfig(t *testing.T) {
+	client := &AmazonBedRockClient{models: testModels}
+
+	foundModel, err := client.getModelFromString("arn:aws:bedrock:us-east-1:*:inference-policy/anthropic.claude-3-5-sonnet-20240620-v1:0")
+	assert.Nil(t, err, "Error should be nil")
+	assert.Equal(t, foundModel.Config.MaxTokens, 100)
+	assert.Equal(t, foundModel.Config.Temperature, float32(0.5))
+	assert.Equal(t, foundModel.Config.TopP, float32(0.9))
+	assert.Equal(t, foundModel.Config.ModelName, "arn:aws:bedrock:us-east-1:*:inference-policy/anthropic.claude-3-5-sonnet-20240620-v1:0")
+}
+
+func TestBedrockInvalidModel(t *testing.T) {
+	client := &AmazonBedRockClient{models: testModels}
+
+	foundModel, err := client.getModelFromString("arn:aws:s3:us-east-1:*:inference-policy/anthropic.claude-3-5-sonnet-20240620-v1:0")
+	assert.Nil(t, err, "Error should be nil")
+	assert.Equal(t, foundModel.Config.MaxTokens, 100)
+}
+
+func TestGetModelFromString(t *testing.T) {
+	client := &AmazonBedRockClient{models: testModels}
+
+	tests := []struct {
+		name      string
+		model     string
+		wantModel string
+		wantErr   bool
+	}{
+		{
+			name:      "exact model name match",
+			model:     "anthropic.claude-3-5-sonnet-20240620-v1:0",
+			wantModel: "anthropic.claude-3-5-sonnet-20240620-v1:0",
+			wantErr:   false,
+		},
+		{
+			name:      "partial model name match",
+			model:     "claude-3-5-sonnet",
+			wantModel: "anthropic.claude-3-5-sonnet-20240620-v1:0",
+			wantErr:   false,
+		},
+		{
+			name:      "model name with different version",
+			model:     "anthropic.claude-3-5-sonnet-20241022-v2:0",
+			wantModel: "anthropic.claude-3-5-sonnet-20241022-v2:0",
+			wantErr:   false,
+		},
+		{
+			name:      "non-existent model",
+			model:     "non-existent-model",
+			wantModel: "",
+			wantErr:   true,
+		},
+		{
+			name:      "empty model name",
+			model:     "",
+			wantModel: "",
+			wantErr:   true,
+		},
+		{
+			name:      "model name with extra spaces",
+			model:     "  anthropic.claude-3-5-sonnet-20240620-v1:0  ",
+			wantModel: "anthropic.claude-3-5-sonnet-20240620-v1:0",
+			wantErr:   false,
+		},
+		{
+			name:      "case insensitive match",
+			model:     "ANTHROPIC.CLAUDE-3-5-SONNET-20240620-V1:0",
+			wantModel: "anthropic.claude-3-5-sonnet-20240620-v1:0",
+			wantErr:   false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gotModel, err := client.getModelFromString(tt.model)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("getModelFromString() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !tt.wantErr && gotModel.Name != tt.wantModel {
+				t.Errorf("getModelFromString() = %v, want %v", gotModel.Name, tt.wantModel)
+			}
+		})
+	}
+}
+
+// TestDefaultModels tests that the client works with default models
+func TestDefaultModels(t *testing.T) {
+	client := &AmazonBedRockClient{}
+
+	// Configure should initialize default models
+	err := client.Configure(&AIProvider{
+		Model: "anthropic.claude-v2",
+	})
+
+	assert.NoError(t, err, "Configure should not return an error")
+	assert.NotNil(t, client.models, "Models should be initialized")
+	assert.NotEmpty(t, client.models, "Models should not be empty")
+
+	// Test finding a default model
+	model, err := client.getModelFromString("anthropic.claude-v2")
+	assert.NoError(t, err, "Should find the model")
+	assert.Equal(t, "anthropic.claude-v2", model.Name, "Should find the correct model")
+}

pkg/ai/azureopenai.go

@@ -14,9 +14,9 @@ const azureAIClientName = "azureopenai"
 type AzureAIClient struct {
 	nopCloser
 
-	client         *openai.Client
-	model          string
-	temperature    float32
+	client      *openai.Client
+	model       string
+	temperature float32
 	// organizationId string
 }
 

pkg/ai/bedrock_support/completions.go

@@ -0,0 +1,157 @@
+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-pro-v1:0",
+	"us.amazon.nova-pro-v1:0",
+	"amazon.nova-lite-v1:0",
+	"eu.amazon.nova-lite-v1:0",
+	"us.amazon.nova-lite-v1:0",
+	"anthropic.claude-3-haiku-20240307-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 strings.Contains(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

@@ -0,0 +1,179 @@
+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

@@ -0,0 +1,14 @@
+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

@@ -0,0 +1,59 @@
+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

@@ -0,0 +1,155 @@
+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

@@ -0,0 +1,65 @@
+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/customrest.go

@@ -0,0 +1,147 @@
+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/factory.go

@@ -0,0 +1,87 @@
+/*
+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 (
+	"github.com/spf13/viper"
+)
+
+// AIClientFactory is an interface for creating AI clients
+type AIClientFactory interface {
+	NewClient(provider string) IAI
+}
+
+// DefaultAIClientFactory is the default implementation of AIClientFactory
+type DefaultAIClientFactory struct{}
+
+// NewClient creates a new AI client using the default implementation
+func (f *DefaultAIClientFactory) NewClient(provider string) IAI {
+	return NewClient(provider)
+}
+
+// ConfigProvider is an interface for accessing configuration
+type ConfigProvider interface {
+	UnmarshalKey(key string, rawVal interface{}) error
+}
+
+// ViperConfigProvider is the default implementation of ConfigProvider using Viper
+type ViperConfigProvider struct{}
+
+// UnmarshalKey unmarshals a key from the configuration using Viper
+func (p *ViperConfigProvider) UnmarshalKey(key string, rawVal interface{}) error {
+	return viper.UnmarshalKey(key, rawVal)
+}
+
+// Default instances to be used
+var (
+	DefaultClientFactory = &DefaultAIClientFactory{}
+	DefaultConfigProvider = &ViperConfigProvider{}
+)
+
+// For testing - these variables can be overridden in tests
+var (
+	testAIClientFactory AIClientFactory = nil
+	testConfigProvider  ConfigProvider  = nil
+)
+
+// GetAIClientFactory returns the test factory if set, otherwise the default
+func GetAIClientFactory() AIClientFactory {
+	if testAIClientFactory != nil {
+		return testAIClientFactory
+	}
+	return DefaultClientFactory
+}
+
+// GetConfigProvider returns the test provider if set, otherwise the default
+func GetConfigProvider() ConfigProvider {
+	if testConfigProvider != nil {
+		return testConfigProvider
+	}
+	return DefaultConfigProvider
+}
+
+// For testing - set the test implementations
+func SetTestAIClientFactory(factory AIClientFactory) {
+	testAIClientFactory = factory
+}
+
+func SetTestConfigProvider(provider ConfigProvider) {
+	testConfigProvider = provider
+}
+
+// Reset test implementations
+func ResetTestImplementations() {
+	testAIClientFactory = nil
+	testConfigProvider = nil
+}

pkg/ai/googlegenai.go

@@ -80,10 +80,10 @@ func (c *GoogleGenAIClient) GetCompletion(ctx context.Context, prompt string) (s
 				if !r.Blocked {
 					continue
 				}
-				return "", fmt.Errorf("complection blocked due to %v with probability %v", r.Category.String(), r.Probability.String())
+				return "", fmt.Errorf("completion blocked due to %v with probability %v", r.Category.String(), r.Probability.String())
 			}
 		}
-		return "", errors.New("no complection returned; unknown reason")
+		return "", errors.New("no completion returned; unknown reason")
 	}
 
 	// Format output.

pkg/ai/googlevertexai.go

@@ -139,10 +139,10 @@ func (g *GoogleVertexAIClient) GetCompletion(ctx context.Context, prompt string)
 				if !r.Blocked {
 					continue
 				}
-				return "", fmt.Errorf("complection blocked due to %v with probability %v", r.Category.String(), r.Probability.String())
+				return "", fmt.Errorf("completion blocked due to %v with probability %v", r.Category.String(), r.Probability.String())
 			}
 		}
-		return "", errors.New("no complection returned; unknown reason")
+		return "", errors.New("no completion returned; unknown reason")
 	}
 
 	// Format output.

pkg/ai/iai.go

@@ -32,6 +32,7 @@ var (
 		&HuggingfaceClient{},
 		&GoogleVertexAIClient{},
 		&OCIGenAIClient{},
+		&CustomRestClient{},
 		&IBMWatsonxAIClient{},
 	}
 	Backends = []string{
@@ -47,6 +48,7 @@ var (
 		huggingfaceAIClientName,
 		googleVertexAIClientName,
 		ociClientName,
+		CustomRestClientName,
 		ibmWatsonxAIClientName,
 	}
 )
@@ -181,7 +183,7 @@ func (p *AIProvider) GetCustomHeaders() []http.Header {
 	return p.CustomHeaders
 }
 
-var passwordlessProviders = []string{"localai", "ollama", "amazonsagemaker", "amazonbedrock", "googlevertexai", "oci"}
+var passwordlessProviders = []string{"localai", "ollama", "amazonsagemaker", "amazonbedrock", "googlevertexai", "oci", "customrest"}
 
 func NeedPassword(backend string) bool {
 	for _, b := range passwordlessProviders {

pkg/ai/openai.go

@@ -27,10 +27,10 @@ const openAIClientName = "openai"
 type OpenAIClient struct {
 	nopCloser
 
-	client         *openai.Client
-	model          string
-	temperature    float32
-	topP           float32
+	client      *openai.Client
+	model       string
+	temperature float32
+	topP        float32
 	// organizationId string
 }
 

pkg/ai/prompts.go

@@ -6,8 +6,6 @@ const (
 	Error: {Explain error here}
 	Solution: {Step by step solution here}
 	`
-	trivy_vuln_prompt = "Explain the following trivy scan result and the detail risk or root cause of the CVE ID, then provide a solution. Response in %s: %s"
-	trivy_conf_prompt = "Explain the following trivy scan result and the detail risk or root cause of the security check, then provide a solution."
 
 	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.
@@ -58,12 +56,12 @@ const (
 
 	Solution: {kubectl command}
 	`
+	raw_promt = `{"language": "%s","message": "%s","prompt": "%s"}`
 )
 
 var PromptMap = map[string]string{
+	"raw":                           raw_promt,
 	"default":                       default_prompt,
-	"VulnerabilityReport":           trivy_vuln_prompt, // for Trivy integration, the key should match `Result.Kind` in pkg/common/types.go
-	"ConfigAuditReport":             trivy_conf_prompt,
 	"PrometheusConfigValidate":      prom_conf_prompt,
 	"PrometheusConfigRelabelReport": prom_relabel_prompt,
 	"PolicyReport":                  kyverno_prompt,

pkg/analysis/analysis.go

@@ -18,6 +18,7 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
+	"reflect"
 	"strings"
 	"sync"
 	"time"
@@ -89,19 +90,35 @@ func NewAnalysis(
 	// Get kubernetes client from viper.
 	kubecontext := viper.GetString("kubecontext")
 	kubeconfig := viper.GetString("kubeconfig")
+	verbose := viper.GetBool("verbose")
 	client, err := kubernetes.NewClient(kubecontext, kubeconfig)
+	if verbose {
+		fmt.Println("Debug: Checking kubernetes client initialization.")
+	}
 	if err != nil {
 		return nil, fmt.Errorf("initialising kubernetes client: %w", err)
 	}
+	if verbose {
+		fmt.Printf("Debug: Kubernetes client initialized, server=%s.\n", client.Config.Host)
+	}
 
 	// Load remote cache if it is configured.
 	cache, err := cache.GetCacheConfiguration()
+	if verbose {
+		fmt.Println("Debug: Checking cache configuration.")
+	}
 	if err != nil {
 		return nil, err
 	}
+	if verbose {
+		fmt.Printf("Debug: Cache configuration loaded, type=%s.\n", cache.GetName())
+	}
 
 	if noCache {
 		cache.DisableCache()
+		if verbose {
+			fmt.Println("Debug: Cache disabled.")
+		}
 	}
 
 	a := &Analysis{
@@ -117,12 +134,31 @@ func NewAnalysis(
 		WithDoc:        withDoc,
 		WithStats:      withStats,
 	}
+	if verbose {
+		fmt.Print("Debug: Analysis configuration loaded, ")
+		fmt.Printf("filters=%v, language=%s, ", filters, language)
+		if namespace == "" {
+			fmt.Printf("namespace=none, ")
+		} else {
+			fmt.Printf("namespace=%s, ", namespace)
+		}
+		if labelSelector == "" {
+			fmt.Printf("labelSelector=none, ")
+		} else {
+			fmt.Printf("labelSelector=%s, ", labelSelector)
+		}
+		fmt.Printf("explain=%t, maxConcurrency=%d, ", explain, maxConcurrency)
+		fmt.Printf("withDoc=%t, withStats=%t.\n", withDoc, withStats)
+	}
 	if !explain {
 		// Return early if AI use was not requested.
 		return a, nil
 	}
 
 	var configAI ai.AIConfiguration
+	if verbose {
+		fmt.Println("Debug: Checking AI configuration.")
+	}
 	if err := viper.UnmarshalKey("ai", &configAI); err != nil {
 		return nil, err
 	}
@@ -135,10 +171,16 @@ func NewAnalysis(
 	// Hence, use the default provider only if the backend is not specified by the user.
 	if configAI.DefaultProvider != "" && backend == "" {
 		backend = configAI.DefaultProvider
+		if verbose {
+			fmt.Printf("Debug: Using default AI provider %s.\n", backend)
+		}
 	}
 
 	if backend == "" {
 		backend = "openai"
+		if verbose {
+			fmt.Printf("Debug: Using default AI provider %s.\n", backend)
+		}
 	}
 
 	var aiProvider ai.AIProvider
@@ -153,12 +195,23 @@ func NewAnalysis(
 		return nil, fmt.Errorf("AI provider %s not specified in configuration. Please run k8sgpt auth", backend)
 	}
 
+	if verbose {
+		fmt.Printf("Debug: AI configuration loaded, provider=%s, ", backend)
+		fmt.Printf("baseUrl=%s, model=%s.\n", aiProvider.BaseURL, aiProvider.Model)
+	}
+
 	aiClient := ai.NewClient(aiProvider.Name)
 	customHeaders := util.NewHeaders(httpHeaders)
 	aiProvider.CustomHeaders = customHeaders
+	if verbose {
+		fmt.Println("Debug: Checking AI client initialization.")
+	}
 	if err := aiClient.Configure(&aiProvider); err != nil {
 		return nil, err
 	}
+	if verbose {
+		fmt.Println("Debug: AI client initialized.")
+	}
 	a.AIClient = aiClient
 	a.AnalysisAIProvider = aiProvider.Name
 	return a, nil
@@ -182,6 +235,18 @@ func (a *Analysis) RunCustomAnalysis() {
 	semaphore := make(chan struct{}, a.MaxConcurrency)
 	var wg sync.WaitGroup
 	var mutex sync.Mutex
+	verbose := viper.GetBool("verbose")
+	if verbose {
+		if len(customAnalyzers) == 0 {
+			fmt.Println("Debug: No custom analyzers found.")
+		} else {
+			cAnalyzerNames := make([]string, len(customAnalyzers))
+			for i, cAnalyzer := range customAnalyzers {
+				cAnalyzerNames[i] = cAnalyzer.Name
+			}
+			fmt.Printf("Debug: Found custom analyzers %v.\n", cAnalyzerNames)
+		}
+	}
 	for _, cAnalyzer := range customAnalyzers {
 		wg.Add(1)
 		semaphore <- struct{}{}
@@ -194,6 +259,9 @@ func (a *Analysis) RunCustomAnalysis() {
 				mutex.Unlock()
 				return
 			}
+			if verbose {
+				fmt.Printf("Debug: %s launched.\n", cAnalyzer.Name)
+			}
 
 			result, err := canClient.Run()
 			if result.Kind == "" {
@@ -206,10 +274,16 @@ func (a *Analysis) RunCustomAnalysis() {
 				mutex.Lock()
 				a.Errors = append(a.Errors, fmt.Sprintf("[%s] %s", cAnalyzer.Name, err))
 				mutex.Unlock()
+				if verbose {
+					fmt.Printf("Debug: %s completed with errors.\n", cAnalyzer.Name)
+				}
 			} else {
 				mutex.Lock()
 				a.Results = append(a.Results, result)
 				mutex.Unlock()
+				if verbose {
+					fmt.Printf("Debug: %s completed without errors.\n", cAnalyzer.Name)
+				}
 			}
 			<-semaphore
 		}(cAnalyzer, &wg, semaphore)
@@ -219,6 +293,7 @@ func (a *Analysis) RunCustomAnalysis() {
 
 func (a *Analysis) RunAnalysis() {
 	activeFilters := viper.GetStringSlice("active_filters")
+	verbose := viper.GetBool("verbose")
 
 	coreAnalyzerMap, analyzerMap := analyzer.GetAnalyzerMap()
 
@@ -227,7 +302,13 @@ func (a *Analysis) RunAnalysis() {
 	if a.WithDoc {
 		var openApiErr error
 
+		if verbose {
+			fmt.Println("Debug: Fetching Kubernetes docs.")
+		}
 		openapiSchema, openApiErr = a.Client.Client.Discovery().OpenAPISchema()
+		if verbose {
+			fmt.Println("Debug: Checking Kubernetes docs.")
+		}
 		if openApiErr != nil {
 			a.Errors = append(a.Errors, fmt.Sprintf("[KubernetesDoc] %s", openApiErr))
 		}
@@ -247,6 +328,9 @@ func (a *Analysis) RunAnalysis() {
 	var mutex sync.Mutex
 	// if there are no filters selected and no active_filters then run coreAnalyzer
 	if len(a.Filters) == 0 && len(activeFilters) == 0 {
+		if verbose {
+			fmt.Println("Debug: No filters selected and no active filters found, run all core analyzers.")
+		}
 		for name, analyzer := range coreAnalyzerMap {
 			wg.Add(1)
 			semaphore <- struct{}{}
@@ -258,6 +342,9 @@ func (a *Analysis) RunAnalysis() {
 	}
 	// if the filters flag is specified
 	if len(a.Filters) != 0 {
+		if verbose {
+			fmt.Printf("Debug: Filter flags %v specified, run selected core analyzers.\n", a.Filters)
+		}
 		for _, filter := range a.Filters {
 			if analyzer, ok := analyzerMap[filter]; ok {
 				semaphore <- struct{}{}
@@ -272,6 +359,9 @@ func (a *Analysis) RunAnalysis() {
 	}
 
 	// use active_filters
+	if len(activeFilters) > 0 && verbose {
+		fmt.Printf("Debug: Found active filters %v, run selected core analyzers.\n", activeFilters)
+	}
 	for _, filter := range activeFilters {
 		if analyzer, ok := analyzerMap[filter]; ok {
 			semaphore <- struct{}{}
@@ -294,8 +384,14 @@ func (a *Analysis) executeAnalyzer(analyzer common.IAnalyzer, filter string, ana
 	}
 
 	// Run the analyzer
+	verbose := viper.GetBool("verbose")
+	if verbose {
+		fmt.Printf("Debug: %s launched.\n", reflect.TypeOf(analyzer).Name())
+	}
 	results, err := analyzer.Analyze(analyzerConfig)
-
+	if err != nil {
+		fmt.Println(err)
+	}
 	// Measure the time taken
 	if a.WithStats {
 		elapsedTime = time.Since(startTime)
@@ -313,11 +409,17 @@ func (a *Analysis) executeAnalyzer(analyzer common.IAnalyzer, filter string, ana
 			a.Stats = append(a.Stats, stat)
 		}
 		a.Errors = append(a.Errors, fmt.Sprintf("[%s] %s", filter, err))
+		if verbose {
+			fmt.Printf("Debug: %s completed with errors.\n", reflect.TypeOf(analyzer).Name())
+		}
 	} else {
 		if a.WithStats {
 			a.Stats = append(a.Stats, stat)
 		}
 		a.Results = append(a.Results, results...)
+		if verbose {
+			fmt.Printf("Debug: %s completed without errors.\n", reflect.TypeOf(analyzer).Name())
+		}
 	}
 	<-semaphore
 }
@@ -327,6 +429,11 @@ func (a *Analysis) GetAIResults(output string, anonymize bool) error {
 		return nil
 	}
 
+	verbose := viper.GetBool("verbose")
+	if verbose {
+		fmt.Println("Debug: Generating AI analysis.")
+	}
+
 	var bar *progressbar.ProgressBar
 	if output != "json" {
 		bar = progressbar.Default(int64(len(a.Results)))
@@ -335,6 +442,10 @@ func (a *Analysis) GetAIResults(output string, anonymize bool) error {
 	for index, analysis := range a.Results {
 		var texts []string
 
+		if bar != nil && verbose {
+			bar.Describe(fmt.Sprintf("Analyzing %s", analysis.Kind))
+		}
+
 		for _, failure := range analysis.Error {
 			if anonymize {
 				for _, s := range failure.Sensitive {
@@ -405,6 +516,9 @@ func (a *Analysis) getAIResultForSanitizedFailures(texts []string, promptTmpl st
 
 	// 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

pkg/analysis/analysis_test.go

@@ -17,13 +17,17 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"reflect"
 	"strings"
 	"testing"
 
+	"github.com/agiledragon/gomonkey/v2"
 	"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/kubernetes"
+	"github.com/k8sgpt-ai/k8sgpt/pkg/util"
 	"github.com/magiconair/properties/assert"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/require"
@@ -31,9 +35,15 @@ import (
 	networkingv1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/fake"
+	"k8s.io/client-go/rest"
 )
 
-// sub-function
+// helper function: get type name of an analyzer
+func getTypeName(i interface{}) string {
+	return reflect.TypeOf(i).Name()
+}
+
+// helper function: run analysis with filter
 func analysis_RunAnalysisFilterTester(t *testing.T, filterFlag string) []common.Result {
 	clientset := fake.NewSimpleClientset(
 		&v1.Pod{
@@ -404,3 +414,252 @@ func TestGetAIResultForSanitizedFailures(t *testing.T) {
 		})
 	}
 }
+
+// Test: Verbose output in NewAnalysis with explain=false
+func TestVerbose_NewAnalysisWithoutExplain(t *testing.T) {
+	// Set viper config.
+	viper.Set("verbose", true)
+	viper.Set("kubecontext", "dummy")
+	viper.Set("kubeconfig", "dummy")
+
+	// Patch kubernetes.NewClient to return a dummy client.
+	patches := gomonkey.ApplyFunc(kubernetes.NewClient, func(kubecontext, kubeconfig string) (*kubernetes.Client, error) {
+		return &kubernetes.Client{
+			Config: &rest.Config{Host: "fake-server"},
+		}, nil
+	})
+	defer patches.Reset()
+
+	output := util.CaptureOutput(func() {
+		a, err := NewAnalysis(
+			"", "english", []string{"Pod"}, "default", "", true,
+			false, // explain
+			10, false, false, []string{}, false,
+		)
+		require.NoError(t, err)
+		a.Close()
+	})
+
+	expectedOutputs := []string{
+		"Debug: Checking kubernetes client initialization.",
+		"Debug: Kubernetes client initialized, server=fake-server.",
+		"Debug: Checking cache configuration.",
+		"Debug: Cache configuration loaded, type=file.",
+		"Debug: Cache disabled.",
+		"Debug: Analysis configuration loaded, filters=[Pod], language=english, namespace=default, labelSelector=none, explain=false, maxConcurrency=10, withDoc=false, withStats=false.",
+	}
+	for _, expected := range expectedOutputs {
+		if !util.Contains(output, expected) {
+			t.Errorf("Expected output to contain: '%s', but got output: '%s'", expected, output)
+		}
+	}
+}
+
+// Test: Verbose output in NewAnalysis with explain=true
+func TestVerbose_NewAnalysisWithExplain(t *testing.T) {
+	// Set viper config.
+	viper.Set("verbose", true)
+	viper.Set("kubecontext", "dummy")
+	viper.Set("kubeconfig", "dummy")
+	// Set a dummy AI configuration.
+	dummyAIConfig := map[string]interface{}{
+		"defaultProvider": "dummy",
+		"providers": []map[string]interface{}{
+			{
+				"name":          "dummy",
+				"baseUrl":       "http://dummy",
+				"model":         "dummy-model",
+				"customHeaders": map[string]string{},
+			},
+		},
+	}
+	viper.Set("ai", dummyAIConfig)
+
+	// Patch kubernetes.NewClient to return a dummy client.
+	patches := gomonkey.ApplyFunc(kubernetes.NewClient, func(kubecontext, kubeconfig string) (*kubernetes.Client, error) {
+		return &kubernetes.Client{
+			Config: &rest.Config{Host: "fake-server"},
+		}, nil
+	})
+	defer patches.Reset()
+
+	// Patch ai.NewClient to return a NoOp client.
+	patches2 := gomonkey.ApplyFunc(ai.NewClient, func(name string) ai.IAI {
+		return &ai.NoOpAIClient{}
+	})
+	defer patches2.Reset()
+
+	output := util.CaptureOutput(func() {
+		a, err := NewAnalysis(
+			"", "english", []string{"Pod"}, "default", "", true,
+			true, // explain
+			10, false, false, []string{}, false,
+		)
+		require.NoError(t, err)
+		a.Close()
+	})
+
+	expectedOutputs := []string{
+		"Debug: Checking AI configuration.",
+		"Debug: Using default AI provider dummy.",
+		"Debug: AI configuration loaded, provider=dummy, baseUrl=http://dummy, model=dummy-model.",
+		"Debug: Checking AI client initialization.",
+		"Debug: AI client initialized.",
+	}
+	for _, expected := range expectedOutputs {
+		if !util.Contains(output, expected) {
+			t.Errorf("Expected output to contain: '%s', but got output: '%s'", expected, output)
+		}
+	}
+}
+
+// Test: Verbose output in RunAnalysis with filter flag
+func TestVerbose_RunAnalysisWithFilter(t *testing.T) {
+	viper.Set("verbose", true)
+	// Run analysis with a filter flag ("Pod") to trigger debug output.
+	output := util.CaptureOutput(func() {
+		_ = analysis_RunAnalysisFilterTester(t, "Pod")
+	})
+
+	expectedOutputs := []string{
+		"Debug: Filter flags [Pod] specified, run selected core analyzers.",
+		"Debug: PodAnalyzer launched.",
+		"Debug: PodAnalyzer completed without errors.",
+	}
+
+	for _, expected := range expectedOutputs {
+		if !util.Contains(output, expected) {
+			t.Errorf("Expected output to contain: '%s', but got output: '%s'", expected, output)
+		}
+	}
+}
+
+// Test: Verbose output in RunAnalysis with active filter
+func TestVerbose_RunAnalysisWithActiveFilter(t *testing.T) {
+	viper.Set("verbose", true)
+	viper.SetDefault("active_filters", "Ingress")
+	output := util.CaptureOutput(func() {
+		_ = analysis_RunAnalysisFilterTester(t, "")
+	})
+
+	expectedOutputs := []string{
+		"Debug: Found active filters [Ingress], run selected core analyzers.",
+		"Debug: IngressAnalyzer launched.",
+		"Debug: IngressAnalyzer completed without errors.",
+	}
+
+	for _, expected := range expectedOutputs {
+		if !util.Contains(output, expected) {
+			t.Errorf("Expected output to contain: '%s', but got output: '%s'", expected, output)
+		}
+	}
+}
+
+// Test: Verbose output in RunAnalysis without any filter (run all core analyzers)
+func TestVerbose_RunAnalysisWithoutFilter(t *testing.T) {
+	viper.Set("verbose", true)
+	// Clear filter flag and active_filters to run all core analyzers.
+	viper.SetDefault("active_filters", []string{})
+	output := util.CaptureOutput(func() {
+		_ = analysis_RunAnalysisFilterTester(t, "")
+	})
+
+	// Check for debug message indicating no filters.
+	expectedNoFilter := "Debug: No filters selected and no active filters found, run all core analyzers."
+	if !util.Contains(output, expectedNoFilter) {
+		t.Errorf("Expected output to contain: '%s', but got output: '%s'", expectedNoFilter, output)
+	}
+
+	// Get all core analyzers from analyzer.GetAnalyzerMap()
+	coreAnalyzerMap, _ := analyzer.GetAnalyzerMap()
+	for _, analyzerInstance := range coreAnalyzerMap {
+		analyzerType := getTypeName(analyzerInstance)
+		expectedLaunched := fmt.Sprintf("Debug: %s launched.", analyzerType)
+		expectedCompleted := fmt.Sprintf("Debug: %s completed without errors.", analyzerType)
+		if !util.Contains(output, expectedLaunched) {
+			t.Errorf("Expected output to contain: '%s', but got output: '%s'", expectedLaunched, output)
+		}
+		if !util.Contains(output, expectedCompleted) {
+			t.Errorf("Expected output to contain: '%s', but got output: '%s'", expectedCompleted, output)
+		}
+	}
+}
+
+// Test: Verbose output in RunCustomAnalysis without custom analyzer
+func TestVerbose_RunCustomAnalysisWithoutCustomAnalyzer(t *testing.T) {
+	viper.Set("verbose", true)
+	// Set custom_analyzers to empty array to trigger "No custom analyzers" debug message.
+	viper.Set("custom_analyzers", []interface{}{})
+	analysisObj := &Analysis{
+		MaxConcurrency: 1,
+	}
+	output := util.CaptureOutput(func() {
+		analysisObj.RunCustomAnalysis()
+	})
+	expected := "Debug: No custom analyzers found."
+	if !util.Contains(output, "Debug: No custom analyzers found.") {
+		t.Errorf("Expected output to contain: '%s', but got output: '%s'", expected, output)
+	}
+}
+
+// Test: Verbose output in RunCustomAnalysis with custom analyzer
+func TestVerbose_RunCustomAnalysisWithCustomAnalyzer(t *testing.T) {
+	viper.Set("verbose", true)
+	// Set custom_analyzers with one custom analyzer using "fake" connection.
+	viper.Set("custom_analyzers", []map[string]interface{}{
+		{
+			"name":       "TestCustomAnalyzer",
+			"connection": map[string]interface{}{"url": "127.0.0.1", "port": "2333"},
+		},
+	})
+
+	analysisObj := &Analysis{
+		MaxConcurrency: 1,
+	}
+	output := util.CaptureOutput(func() {
+		analysisObj.RunCustomAnalysis()
+	})
+	assert.Equal(t, 1, len(analysisObj.Errors)) // connection error
+
+	expectedOutputs := []string{
+		"Debug: Found custom analyzers [TestCustomAnalyzer].",
+		"Debug: TestCustomAnalyzer launched.",
+		"Debug: TestCustomAnalyzer completed with errors.",
+	}
+
+	for _, expected := range expectedOutputs {
+		if !util.Contains(output, expected) {
+			t.Errorf("Expected output to contain: '%s', but got output: '%s'", expected, output)
+		}
+	}
+}
+
+// Test: Verbose output in GetAIResults
+func TestVerbose_GetAIResults(t *testing.T) {
+	viper.Set("verbose", true)
+	disabledCache := cache.New("disabled-cache")
+	disabledCache.DisableCache()
+	aiClient := &ai.NoOpAIClient{}
+	analysisObj := Analysis{
+		AIClient: aiClient,
+		Cache:    disabledCache,
+		Results: []common.Result{
+			{
+				Kind:         "Deployment",
+				Name:         "test-deployment",
+				Error:        []common.Failure{{Text: "test-problem", Sensitive: []common.Sensitive{}}},
+				Details:      "test-solution",
+				ParentObject: "parent-resource",
+			},
+		},
+		Namespace: "default",
+	}
+	output := util.CaptureOutput(func() {
+		_ = analysisObj.GetAIResults("json", false)
+	})
+
+	expected := "Debug: Generating AI analysis."
+	if !util.Contains(output, expected) {
+		t.Errorf("Expected output to contain: '%s', but got output: '%s'", expected, output)
+	}
+}

pkg/analyzer/cronjob_test.go

@@ -22,179 +22,283 @@ import (
 	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
 	"github.com/stretchr/testify/require"
 	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
-
-	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{
+	tests := []struct {
+		name         string
+		config       common.Analyzer
+		expectations []struct {
+			name          string
+			failuresCount int
+		}
+	}{
+		{
+			name: "Suspended CronJob",
+			config: common.Analyzer{
+				Client: &kubernetes.Client{
+					Client: fake.NewSimpleClientset(
+						&batchv1.CronJob{
 							ObjectMeta: metav1.ObjectMeta{
-								Labels: map[string]string{
-									"app": "example-app",
-								},
+								Name:      "suspended-job",
+								Namespace: "default",
 							},
-							Spec: batchv1.JobSpec{
-								Template: v1.PodTemplateSpec{
-									Spec: v1.PodSpec{
-										Containers: []v1.Container{
-											{
-												Name:  "example-container",
-												Image: "nginx",
-											},
-										},
-										RestartPolicy: v1.RestartPolicyOnFailure,
-									},
-								},
+							Spec: batchv1.CronJobSpec{
+								Schedule: "*/5 * * * *",
+								Suspend:  boolPtr(true),
 							},
 						},
-					},
+					),
 				},
-			),
+				Context:   context.Background(),
+				Namespace: "default",
+			},
+			expectations: []struct {
+				name          string
+				failuresCount int
+			}{
+				{
+					name:          "default/suspended-job",
+					failuresCount: 1, // One failure for being suspended
+				},
+			},
+		},
+		{
+			name: "Invalid schedule format",
+			config: common.Analyzer{
+				Client: &kubernetes.Client{
+					Client: fake.NewSimpleClientset(
+						&batchv1.CronJob{
+							ObjectMeta: metav1.ObjectMeta{
+								Name:      "invalid-schedule",
+								Namespace: "default",
+							},
+							Spec: batchv1.CronJobSpec{
+								Schedule: "invalid-cron", // Invalid cron format
+							},
+						},
+					),
+				},
+				Context:   context.Background(),
+				Namespace: "default",
+			},
+			expectations: []struct {
+				name          string
+				failuresCount int
+			}{
+				{
+					name:          "default/invalid-schedule",
+					failuresCount: 1, // One failure for invalid schedule
+				},
+			},
+		},
+		{
+			name: "Negative starting deadline",
+			config: common.Analyzer{
+				Client: &kubernetes.Client{
+					Client: fake.NewSimpleClientset(
+						&batchv1.CronJob{
+							ObjectMeta: metav1.ObjectMeta{
+								Name:      "negative-deadline",
+								Namespace: "default",
+							},
+							Spec: batchv1.CronJobSpec{
+								Schedule:                "*/5 * * * *",
+								StartingDeadlineSeconds: int64Ptr(-60), // Negative deadline
+							},
+						},
+					),
+				},
+				Context:   context.Background(),
+				Namespace: "default",
+			},
+			expectations: []struct {
+				name          string
+				failuresCount int
+			}{
+				{
+					name:          "default/negative-deadline",
+					failuresCount: 1, // One failure for negative deadline
+				},
+			},
+		},
+		{
+			name: "Valid CronJob",
+			config: common.Analyzer{
+				Client: &kubernetes.Client{
+					Client: fake.NewSimpleClientset(
+						&batchv1.CronJob{
+							ObjectMeta: metav1.ObjectMeta{
+								Name:      "valid-job",
+								Namespace: "default",
+							},
+							Spec: batchv1.CronJobSpec{
+								Schedule: "*/5 * * * *", // Valid cron format
+							},
+						},
+					),
+				},
+				Context:   context.Background(),
+				Namespace: "default",
+			},
+			expectations: []struct {
+				name          string
+				failuresCount int
+			}{
+				// No expectations for valid job
+			},
+		},
+		{
+			name: "Multiple issues",
+			config: common.Analyzer{
+				Client: &kubernetes.Client{
+					Client: fake.NewSimpleClientset(
+						&batchv1.CronJob{
+							ObjectMeta: metav1.ObjectMeta{
+								Name:      "multiple-issues",
+								Namespace: "default",
+							},
+							Spec: batchv1.CronJobSpec{
+								Schedule:                "invalid-cron",
+								StartingDeadlineSeconds: int64Ptr(-60),
+							},
+						},
+					),
+				},
+				Context:   context.Background(),
+				Namespace: "default",
+			},
+			expectations: []struct {
+				name          string
+				failuresCount int
+			}{
+				{
+					name:          "default/multiple-issues",
+					failuresCount: 2, // Two failures: invalid schedule and negative deadline
+				},
+			},
 		},
-		Context:   context.Background(),
-		Namespace: "default",
 	}
 
-	cjAnalyzer := CronJobAnalyzer{}
-	results, err := cjAnalyzer.Analyze(config)
-	require.NoError(t, err)
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			analyzer := CronJobAnalyzer{}
+			results, err := analyzer.Analyze(tt.config)
+			require.NoError(t, err)
+			require.Len(t, results, len(tt.expectations))
 
-	sort.Slice(results, func(i, j int) bool {
-		return results[i].Name < results[j].Name
-	})
+			// Sort results by name for consistent comparison
+			sort.Slice(results, func(i, j int) bool {
+				return results[i].Name < results[j].Name
+			})
 
-	expectations := []string{
-		"default/CJ2",
-		"default/CJ3",
-		"default/CJ4",
-	}
-
-	require.Equal(t, len(expectations), len(results))
-
-	for i, result := range results {
-		require.Equal(t, expectations[i], result.Name)
+			for i, expectation := range tt.expectations {
+				require.Equal(t, expectation.name, results[i].Name)
+				require.Len(t, results[i].Error, expectation.failuresCount)
+			}
+		})
 	}
 }
 
-func TestCronJobAnalyzerLabelSelectorFiltering(t *testing.T) {
-	suspend := new(bool)
-	*suspend = true
-
-	invalidStartingDeadline := new(int64)
-	*invalidStartingDeadline = -7
-
-	validStartingDeadline := new(int64)
-	*validStartingDeadline = 7
+func TestCronJobAnalyzerLabelSelector(t *testing.T) {
+	clientSet := fake.NewSimpleClientset(
+		&batchv1.CronJob{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "job-with-label",
+				Namespace: "default",
+				Labels: map[string]string{
+					"app": "test",
+				},
+			},
+			Spec: batchv1.CronJobSpec{
+				Schedule: "invalid-cron", // This should trigger a failure
+			},
+		},
+		&batchv1.CronJob{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "job-without-label",
+				Namespace: "default",
+			},
+			Spec: batchv1.CronJobSpec{
+				Schedule: "invalid-cron", // This should trigger a failure
+			},
+		},
+	)
 
+	// Test with label selector
 	config := common.Analyzer{
 		Client: &kubernetes.Client{
-			Client: fake.NewSimpleClientset(
-				&batchv1.CronJob{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "CJ1",
-						Namespace: "default",
-						Labels: map[string]string{
-							"app": "cronjob",
-						},
-					},
-				},
-				&batchv1.CronJob{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "CJ2",
-						Namespace: "default",
-					},
-				},
-			),
+			Client: clientSet,
 		},
 		Context:       context.Background(),
 		Namespace:     "default",
-		LabelSelector: "app=cronjob",
+		LabelSelector: "app=test",
 	}
 
-	cjAnalyzer := CronJobAnalyzer{}
-	results, err := cjAnalyzer.Analyze(config)
+	analyzer := CronJobAnalyzer{}
+	results, err := analyzer.Analyze(config)
 	require.NoError(t, err)
 	require.Equal(t, 1, len(results))
-	require.Equal(t, "default/CJ1", results[0].Name)
+	require.Equal(t, "default/job-with-label", results[0].Name)
+}
+
+func TestCheckCronScheduleIsValid(t *testing.T) {
+	tests := []struct {
+		name     string
+		schedule string
+		wantErr  bool
+	}{
+		{
+			name:     "Valid schedule - every 5 minutes",
+			schedule: "*/5 * * * *",
+			wantErr:  false,
+		},
+		{
+			name:     "Valid schedule - specific time",
+			schedule: "0 2 * * *",
+			wantErr:  false,
+		},
+		{
+			name:     "Valid schedule - complex",
+			schedule: "0 0 1,15 * 3",
+			wantErr:  false,
+		},
+		{
+			name:     "Invalid schedule - wrong format",
+			schedule: "invalid-cron",
+			wantErr:  true,
+		},
+		{
+			name:     "Invalid schedule - too many fields",
+			schedule: "* * * * * *",
+			wantErr:  true,
+		},
+		{
+			name:     "Invalid schedule - empty string",
+			schedule: "",
+			wantErr:  true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			_, err := CheckCronScheduleIsValid(tt.schedule)
+			if tt.wantErr {
+				require.Error(t, err)
+			} else {
+				require.NoError(t, err)
+			}
+		})
+	}
+}
+
+// Helper functions
+func boolPtr(b bool) *bool {
+	return &b
+}
+
+func int64Ptr(i int64) *int64 {
+	return &i
 }

pkg/analyzer/events_test.go

@@ -0,0 +1,137 @@
+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)
+				}
+			}
+		})
+	}
+}

pkg/analyzer/hpa.go

@@ -53,7 +53,6 @@ func (HpaAnalyzer) Analyze(a common.Analyzer) ([]common.Result, error) {
 	for _, hpa := range list.Items {
 		var failures []common.Failure
 
-	
 		//check the error from status field
 		conditions := hpa.Status.Conditions
 		for _, condition := range conditions {

pkg/analyzer/hpaAnalyzer_test.go

@@ -566,7 +566,6 @@ func TestHPAAnalyzerLabelSelectorFiltering(t *testing.T) {
 	assert.Equal(t, len(analysisResults), 1)
 }
 
-
 func TestHPAAnalyzerStatusFieldAbleToScale(t *testing.T) {
 	clientset := fake.NewSimpleClientset(
 		&autoscalingv2.HorizontalPodAutoscaler{
@@ -584,8 +583,8 @@ func TestHPAAnalyzerStatusFieldAbleToScale(t *testing.T) {
 			Status: autoscalingv2.HorizontalPodAutoscalerStatus{
 				Conditions: []autoscalingv2.HorizontalPodAutoscalerCondition{
 					{
-						Type:   "AbleToScale",
-						Status: "False",
+						Type:    "AbleToScale",
+						Status:  "False",
 						Message: "test reason",
 					},
 				},
@@ -607,7 +606,6 @@ func TestHPAAnalyzerStatusFieldAbleToScale(t *testing.T) {
 
 }
 
-
 func TestHPAAnalyzerStatusFieldScalingActive(t *testing.T) {
 	clientset := fake.NewSimpleClientset(
 		&autoscalingv2.HorizontalPodAutoscaler{
@@ -625,8 +623,8 @@ func TestHPAAnalyzerStatusFieldScalingActive(t *testing.T) {
 			Status: autoscalingv2.HorizontalPodAutoscalerStatus{
 				Conditions: []autoscalingv2.HorizontalPodAutoscalerCondition{
 					{
-						Type:   autoscalingv2.ScalingActive,
-						Status: "False",
+						Type:    autoscalingv2.ScalingActive,
+						Status:  "False",
 						Message: "test reason",
 					},
 				},
@@ -648,8 +646,6 @@ func TestHPAAnalyzerStatusFieldScalingActive(t *testing.T) {
 
 }
 
-
-
 func TestHPAAnalyzerStatusFieldScalingLimited(t *testing.T) {
 	clientset := fake.NewSimpleClientset(
 		&autoscalingv2.HorizontalPodAutoscaler{
@@ -667,8 +663,8 @@ func TestHPAAnalyzerStatusFieldScalingLimited(t *testing.T) {
 			Status: autoscalingv2.HorizontalPodAutoscalerStatus{
 				Conditions: []autoscalingv2.HorizontalPodAutoscalerCondition{
 					{
-						Type:   autoscalingv2.ScalingLimited,
-						Status: "False",
+						Type:    autoscalingv2.ScalingLimited,
+						Status:  "False",
 						Message: "test reason",
 					},
 				},
@@ -690,7 +686,6 @@ func TestHPAAnalyzerStatusFieldScalingLimited(t *testing.T) {
 
 }
 
-
 func TestHPAAnalyzerStatusField(t *testing.T) {
 	clientset := fake.NewSimpleClientset(
 		&autoscalingv2.HorizontalPodAutoscaler{
@@ -708,18 +703,18 @@ func TestHPAAnalyzerStatusField(t *testing.T) {
 			Status: autoscalingv2.HorizontalPodAutoscalerStatus{
 				Conditions: []autoscalingv2.HorizontalPodAutoscalerCondition{
 					{
-						Type:   autoscalingv2.AbleToScale,
-						Status: "True",
+						Type:    autoscalingv2.AbleToScale,
+						Status:  "True",
 						Message: "recommended size matches current size",
 					},
 					{
-						Type:   autoscalingv2.ScalingActive,
-						Status: "True",
+						Type:    autoscalingv2.ScalingActive,
+						Status:  "True",
 						Message: "the HPA was able to successfully calculate a replica count",
 					},
 					{
-						Type:   autoscalingv2.ScalingLimited,
-						Status: "True",
+						Type:    autoscalingv2.ScalingLimited,
+						Status:  "True",
 						Message: "the desired replica count is less than the minimum replica count",
 					},
 				},
@@ -739,4 +734,4 @@ func TestHPAAnalyzerStatusField(t *testing.T) {
 	}
 	assert.Equal(t, len(analysisResults), 1)
 
-}
+}

pkg/analyzer/ingress_test.go

@@ -28,213 +28,334 @@ import (
 )
 
 func TestIngressAnalyzer(t *testing.T) {
-	validIgClassName := new(string)
-	*validIgClassName = "valid-ingress-class"
-
-	var igRule networkingv1.IngressRule
-
-	httpRule := networkingv1.HTTPIngressRuleValue{
-		Paths: []networkingv1.HTTPIngressPath{
-			{
-				Path: "/",
-				Backend: networkingv1.IngressBackend{
-					Service: &networkingv1.IngressServiceBackend{
-						// This service exists.
-						Name: "Service1",
-					},
-				},
-			},
-			{
-				Path: "/test1",
-				Backend: networkingv1.IngressBackend{
-					Service: &networkingv1.IngressServiceBackend{
-						// This service is in the test namespace
-						// Hence, it won't be discovered.
-						Name: "Service2",
-					},
-				},
-			},
-			{
-				Path: "/test2",
-				Backend: networkingv1.IngressBackend{
-					Service: &networkingv1.IngressServiceBackend{
-						// This service doesn't exist.
-						Name: "Service3",
-					},
-				},
-			},
-		},
-	}
-	igRule.IngressRuleValue.HTTP = &httpRule
-
-	config := common.Analyzer{
-		Client: &kubernetes.Client{
-			Client: fake.NewSimpleClientset(
-				&networkingv1.Ingress{
-					// Doesn't specify an ingress class.
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "Ingress1",
-						Namespace: "default",
-					},
-				},
-				&networkingv1.Ingress{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "Ingress2",
-						Namespace: "default",
-						// Specify an invalid ingress class name using annotations.
-						Annotations: map[string]string{
-							"kubernetes.io/ingress.class": "invalid-class",
-						},
-					},
-				},
-				&networkingv1.Ingress{
-					// Namespace filtering.
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "Ingress3",
-						Namespace: "test",
-					},
-				},
-				&networkingv1.IngressClass{
-					ObjectMeta: metav1.ObjectMeta{
-						Name: *validIgClassName,
-					},
-				},
-				&networkingv1.Ingress{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "Ingress4",
-						Namespace: "default",
-						// Specify valid ingress class name using annotations.
-						Annotations: map[string]string{
-							"kubernetes.io/ingress.class": *validIgClassName,
-						},
-					},
-				},
-				&v1.Service{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "Service1",
-						Namespace: "default",
-					},
-				},
-				&v1.Service{
-					ObjectMeta: metav1.ObjectMeta{
-						// Namespace filtering.
-						Name:      "Service2",
-						Namespace: "test",
-					},
-				},
-				&v1.Secret{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "Secret1",
-						Namespace: "default",
-					},
-				},
-				&v1.Secret{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "Secret2",
-						Namespace: "test",
-					},
-				},
-				&networkingv1.Ingress{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "Ingress5",
-						Namespace: "default",
-					},
-
-					// Specify valid ingress class name in spec.
-					Spec: networkingv1.IngressSpec{
-						IngressClassName: validIgClassName,
-						Rules: []networkingv1.IngressRule{
-							igRule,
-						},
-						TLS: []networkingv1.IngressTLS{
-							{
-								// This won't contribute to any failures.
-								SecretName: "Secret1",
-							},
-							{
-								// This secret won't be discovered because of namespace filtering.
-								SecretName: "Secret2",
-							},
-							{
-								// This secret doesn't exist.
-								SecretName: "Secret3",
-							},
-						},
-					},
-				},
-			),
-		},
-		Context:   context.Background(),
-		Namespace: "default",
-	}
-
-	igAnalyzer := IngressAnalyzer{}
-	results, err := igAnalyzer.Analyze(config)
-	require.NoError(t, err)
-
-	sort.Slice(results, func(i, j int) bool {
-		return results[i].Name < results[j].Name
-	})
-
-	expectations := []struct {
-		name          string
-		failuresCount int
+	tests := []struct {
+		name         string
+		config       common.Analyzer
+		expectations []struct {
+			name          string
+			failuresCount int
+		}
 	}{
 		{
-			name:          "default/Ingress1",
-			failuresCount: 1,
+			name: "Missing ingress class",
+			config: common.Analyzer{
+				Client: &kubernetes.Client{
+					Client: fake.NewSimpleClientset(
+						&networkingv1.Ingress{
+							ObjectMeta: metav1.ObjectMeta{
+								Name:      "no-class",
+								Namespace: "default",
+							},
+							Spec: networkingv1.IngressSpec{
+								// No ingress class specified
+							},
+						},
+					),
+				},
+				Context:   context.Background(),
+				Namespace: "default",
+			},
+			expectations: []struct {
+				name          string
+				failuresCount int
+			}{
+				{
+					name:          "default/no-class",
+					failuresCount: 1, // One failure for missing ingress class
+				},
+			},
 		},
 		{
-			name:          "default/Ingress2",
-			failuresCount: 1,
+			name: "Non-existent ingress class",
+			config: common.Analyzer{
+				Client: &kubernetes.Client{
+					Client: fake.NewSimpleClientset(
+						&networkingv1.Ingress{
+							ObjectMeta: metav1.ObjectMeta{
+								Name:      "bad-class",
+								Namespace: "default",
+							},
+							Spec: networkingv1.IngressSpec{
+								IngressClassName: strPtr("non-existent"),
+							},
+						},
+					),
+				},
+				Context:   context.Background(),
+				Namespace: "default",
+			},
+			expectations: []struct {
+				name          string
+				failuresCount int
+			}{
+				{
+					name:          "default/bad-class",
+					failuresCount: 1, // One failure for non-existent ingress class
+				},
+			},
 		},
 		{
-			name:          "default/Ingress5",
-			failuresCount: 4,
+			name: "Non-existent backend service",
+			config: common.Analyzer{
+				Client: &kubernetes.Client{
+					Client: fake.NewSimpleClientset(
+						&networkingv1.Ingress{
+							ObjectMeta: metav1.ObjectMeta{
+								Name:      "bad-backend",
+								Namespace: "default",
+								Annotations: map[string]string{
+									"kubernetes.io/ingress.class": "nginx",
+								},
+							},
+							Spec: networkingv1.IngressSpec{
+								Rules: []networkingv1.IngressRule{
+									{
+										Host: "example.com",
+										IngressRuleValue: networkingv1.IngressRuleValue{
+											HTTP: &networkingv1.HTTPIngressRuleValue{
+												Paths: []networkingv1.HTTPIngressPath{
+													{
+														Path:     "/",
+														PathType: pathTypePtr(networkingv1.PathTypePrefix),
+														Backend: networkingv1.IngressBackend{
+															Service: &networkingv1.IngressServiceBackend{
+																Name: "non-existent-service",
+																Port: networkingv1.ServiceBackendPort{
+																	Number: 80,
+																},
+															},
+														},
+													},
+												},
+											},
+										},
+									},
+								},
+							},
+						},
+					),
+				},
+				Context:   context.Background(),
+				Namespace: "default",
+			},
+			expectations: []struct {
+				name          string
+				failuresCount int
+			}{
+				{
+					name:          "default/bad-backend",
+					failuresCount: 2, // Two failures: non-existent ingress class and non-existent service
+				},
+			},
+		},
+		{
+			name: "Non-existent TLS secret",
+			config: common.Analyzer{
+				Client: &kubernetes.Client{
+					Client: fake.NewSimpleClientset(
+						&networkingv1.Ingress{
+							ObjectMeta: metav1.ObjectMeta{
+								Name:      "bad-tls",
+								Namespace: "default",
+								Annotations: map[string]string{
+									"kubernetes.io/ingress.class": "nginx",
+								},
+							},
+							Spec: networkingv1.IngressSpec{
+								TLS: []networkingv1.IngressTLS{
+									{
+										Hosts:      []string{"example.com"},
+										SecretName: "non-existent-secret",
+									},
+								},
+							},
+						},
+					),
+				},
+				Context:   context.Background(),
+				Namespace: "default",
+			},
+			expectations: []struct {
+				name          string
+				failuresCount int
+			}{
+				{
+					name:          "default/bad-tls",
+					failuresCount: 2, // Two failures: non-existent ingress class and non-existent TLS secret
+				},
+			},
+		},
+		{
+			name: "Valid ingress with all components",
+			config: common.Analyzer{
+				Client: &kubernetes.Client{
+					Client: fake.NewSimpleClientset(
+						&networkingv1.Ingress{
+							ObjectMeta: metav1.ObjectMeta{
+								Name:      "valid-ingress",
+								Namespace: "default",
+							},
+							Spec: networkingv1.IngressSpec{
+								IngressClassName: strPtr("nginx"),
+							},
+						},
+						&networkingv1.IngressClass{
+							ObjectMeta: metav1.ObjectMeta{
+								Name: "nginx",
+							},
+						},
+						&v1.Service{
+							ObjectMeta: metav1.ObjectMeta{
+								Name:      "backend-service",
+								Namespace: "default",
+							},
+						},
+						&v1.Secret{
+							ObjectMeta: metav1.ObjectMeta{
+								Name:      "tls-secret",
+								Namespace: "default",
+							},
+							Type: v1.SecretTypeTLS,
+						},
+					),
+				},
+				Context:   context.Background(),
+				Namespace: "default",
+			},
+			expectations: []struct {
+				name          string
+				failuresCount int
+			}{
+				// No expectations for valid ingress
+			},
+		},
+		{
+			name: "Multiple issues",
+			config: common.Analyzer{
+				Client: &kubernetes.Client{
+					Client: fake.NewSimpleClientset(
+						&networkingv1.Ingress{
+							ObjectMeta: metav1.ObjectMeta{
+								Name:      "multiple-issues",
+								Namespace: "default",
+							},
+							Spec: networkingv1.IngressSpec{
+								IngressClassName: strPtr("non-existent"),
+								Rules: []networkingv1.IngressRule{
+									{
+										Host: "example.com",
+										IngressRuleValue: networkingv1.IngressRuleValue{
+											HTTP: &networkingv1.HTTPIngressRuleValue{
+												Paths: []networkingv1.HTTPIngressPath{
+													{
+														Path:     "/",
+														PathType: pathTypePtr(networkingv1.PathTypePrefix),
+														Backend: networkingv1.IngressBackend{
+															Service: &networkingv1.IngressServiceBackend{
+																Name: "non-existent-service",
+																Port: networkingv1.ServiceBackendPort{
+																	Number: 80,
+																},
+															},
+														},
+													},
+												},
+											},
+										},
+									},
+								},
+								TLS: []networkingv1.IngressTLS{
+									{
+										Hosts:      []string{"example.com"},
+										SecretName: "non-existent-secret",
+									},
+								},
+							},
+						},
+					),
+				},
+				Context:   context.Background(),
+				Namespace: "default",
+			},
+			expectations: []struct {
+				name          string
+				failuresCount int
+			}{
+				{
+					name:          "default/multiple-issues",
+					failuresCount: 3, // Three failures: ingress class, service, and TLS secret
+				},
+			},
 		},
 	}
 
-	require.Equal(t, len(expectations), len(results))
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			analyzer := IngressAnalyzer{}
+			results, err := analyzer.Analyze(tt.config)
+			require.NoError(t, err)
+			require.Len(t, results, len(tt.expectations))
 
-	for i, result := range results {
-		require.Equal(t, expectations[i].name, result.Name)
-		require.Equal(t, expectations[i].failuresCount, len(result.Error))
+			// Sort results by name for consistent comparison
+			sort.Slice(results, func(i, j int) bool {
+				return results[i].Name < results[j].Name
+			})
+
+			for i, expectation := range tt.expectations {
+				require.Equal(t, expectation.name, results[i].Name)
+				require.Len(t, results[i].Error, expectation.failuresCount)
+			}
+		})
 	}
 }
 
-func TestIngressAnalyzerLabelSelectorFiltering(t *testing.T) {
-	validIgClassName := new(string)
-	*validIgClassName = "valid-ingress-class"
+func TestIngressAnalyzerLabelSelector(t *testing.T) {
+	clientSet := fake.NewSimpleClientset(
+		&networkingv1.Ingress{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "ingress-with-label",
+				Namespace: "default",
+				Labels: map[string]string{
+					"app": "test",
+				},
+			},
+			Spec: networkingv1.IngressSpec{
+				// Missing ingress class to trigger a failure
+			},
+		},
+		&networkingv1.Ingress{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "ingress-without-label",
+				Namespace: "default",
+			},
+			Spec: networkingv1.IngressSpec{
+				// Missing ingress class to trigger a failure
+			},
+		},
+	)
 
+	// Test with label selector
 	config := common.Analyzer{
 		Client: &kubernetes.Client{
-			Client: fake.NewSimpleClientset(
-				&networkingv1.Ingress{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "Ingress1",
-						Namespace: "default",
-						Labels: map[string]string{
-							"app": "ingress",
-						},
-					},
-				},
-				&networkingv1.Ingress{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "Ingress2",
-						Namespace: "default",
-					},
-				},
-			),
+			Client: clientSet,
 		},
 		Context:       context.Background(),
 		Namespace:     "default",
-		LabelSelector: "app=ingress",
+		LabelSelector: "app=test",
 	}
 
-	igAnalyzer := IngressAnalyzer{}
-	results, err := igAnalyzer.Analyze(config)
+	analyzer := IngressAnalyzer{}
+	results, err := analyzer.Analyze(config)
 	require.NoError(t, err)
 	require.Equal(t, 1, len(results))
-	require.Equal(t, "default/Ingress1", results[0].Name)
-
+	require.Equal(t, "default/ingress-with-label", results[0].Name)
+}
+
+// Helper functions
+func strPtr(s string) *string {
+	return &s
+}
+
+func pathTypePtr(p networkingv1.PathType) *networkingv1.PathType {
+	return &p
 }

pkg/analyzer/pod.go

@@ -123,6 +123,20 @@ func analyzeContainerStatusFailures(a common.Analyzer, statuses []v1.ContainerSt
 					Sensitive: []common.Sensitive{},
 				})
 			}
+		} else if containerStatus.State.Terminated != nil {
+			if containerStatus.State.Terminated.ExitCode != 0 {
+				// This represents a container that is terminated abnormally
+				// https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-state-terminated
+				exitCode := containerStatus.State.Terminated.ExitCode
+				reason := containerStatus.State.Terminated.Reason
+				if reason == "" {
+					reason = "Unknown"
+				}
+				failures = append(failures, common.Failure{
+					Text:      fmt.Sprintf("the termination reason is %s exitCode=%d container=%s pod=%s", reason, exitCode, containerStatus.Name, name),
+					Sensitive: []common.Sensitive{},
+				})
+			}
 		} else {
 			// when pod is Running but its ReadinessProbe fails
 			if !containerStatus.Ready && statusPhase == "Running" {

pkg/analyzer/pod_test.go

@@ -343,6 +343,57 @@ func TestPodAnalyzer(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "Terminated container with non-zero exit code",
+			config: common.Analyzer{
+				Client: &kubernetes.Client{
+					Client: fake.NewSimpleClientset(
+						&v1.Pod{
+							ObjectMeta: metav1.ObjectMeta{
+								Name:      "Pod1",
+								Namespace: "default",
+							},
+							Status: v1.PodStatus{
+								Phase: v1.PodFailed,
+								ContainerStatuses: []v1.ContainerStatus{
+									{
+										Name:  "Container1",
+										Ready: false,
+										State: v1.ContainerState{
+											Terminated: &v1.ContainerStateTerminated{
+												ExitCode: 1,
+												Reason:   "Error",
+											},
+										},
+									},
+									{
+										Name:  "Container2",
+										Ready: false,
+										State: v1.ContainerState{
+											Terminated: &v1.ContainerStateTerminated{
+												ExitCode: 2,
+												Reason:   "",
+											},
+										},
+									},
+								},
+							},
+						},
+					),
+				},
+				Context:   context.Background(),
+				Namespace: "default",
+			},
+			expectations: []struct {
+				name          string
+				failuresCount int
+			}{
+				{
+					name:          "default/Pod1",
+					failuresCount: 2,
+				},
+			},
+		},
 	}
 
 	podAnalyzer := PodAnalyzer{}

pkg/analyzer/service_test.go

@@ -24,145 +24,232 @@ import (
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/fake"
-	"k8s.io/client-go/tools/leaderelection/resourcelock"
 )
 
 func TestServiceAnalyzer(t *testing.T) {
-	config := common.Analyzer{
-		Client: &kubernetes.Client{
-			Client: fake.NewSimpleClientset(
-				&v1.Endpoints{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "Endpoint1",
-						Namespace: "test",
-					},
-					// Endpoint with non-zero subsets.
-					Subsets: []v1.EndpointSubset{
-						{
-							// These not ready end points will contribute to failures.
-							NotReadyAddresses: []v1.EndpointAddress{
-								{
-									TargetRef: &v1.ObjectReference{
-										Kind: "test-reference",
-										Name: "reference1",
-									},
-								},
-								{
-									TargetRef: &v1.ObjectReference{
-										Kind: "test-reference",
-										Name: "reference2",
-									},
-								},
-							},
-						},
-						{
-							// These not ready end points will contribute to failures.
-							NotReadyAddresses: []v1.EndpointAddress{
-								{
-									TargetRef: &v1.ObjectReference{
-										Kind: "test-reference",
-										Name: "reference3",
-									},
-								},
-							},
-						},
-					},
-				},
-				&v1.Endpoints{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "Endpoint2",
-						Namespace: "test",
-						Annotations: map[string]string{
-							// Leader election record annotation key defined.
-							resourcelock.LeaderElectionRecordAnnotationKey: "this is okay",
-						},
-					},
-					// Endpoint with zero subsets.
-				},
-				&v1.Endpoints{
-					ObjectMeta: metav1.ObjectMeta{
-						// This won't contribute to any failures.
-						Name:        "non-existent-service",
-						Namespace:   "test",
-						Annotations: map[string]string{},
-					},
-					// Endpoint with zero subsets.
-				},
-				&v1.Endpoints{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:        "Service1",
-						Namespace:   "test",
-						Annotations: map[string]string{},
-					},
-					// Endpoint with zero subsets.
-				},
-				&v1.Service{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "Service1",
-						Namespace: "test",
-					},
-					Spec: v1.ServiceSpec{
-						Selector: map[string]string{
-							"app1": "test-app1",
-							"app2": "test-app2",
-						},
-					},
-				},
-				&v1.Service{
-					ObjectMeta: metav1.ObjectMeta{
-						// This service won't be discovered.
-						Name:      "Service2",
-						Namespace: "default",
-					},
-					Spec: v1.ServiceSpec{
-						Selector: map[string]string{
-							"app1": "test-app1",
-							"app2": "test-app2",
-						},
-					},
-				},
-				&v1.Service{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "Service3",
-						Namespace: "test",
-					},
-					Spec: v1.ServiceSpec{
-						// No Spec Selector
-					},
-				},
-			),
-		},
-		Context:   context.Background(),
-		Namespace: "test",
-	}
-
-	sAnalyzer := ServiceAnalyzer{}
-	results, err := sAnalyzer.Analyze(config)
-	require.NoError(t, err)
-
-	sort.Slice(results, func(i, j int) bool {
-		return results[i].Name < results[j].Name
-	})
-
-	expectations := []struct {
-		name          string
-		failuresCount int
+	tests := []struct {
+		name         string
+		config       common.Analyzer
+		expectations []struct {
+			name          string
+			failuresCount int
+		}
 	}{
 		{
-			name:          "test/Endpoint1",
-			failuresCount: 1,
+			name: "Service with no endpoints",
+			config: common.Analyzer{
+				Client: &kubernetes.Client{
+					Client: fake.NewSimpleClientset(
+						&v1.Endpoints{
+							ObjectMeta: metav1.ObjectMeta{
+								Name:      "test-service",
+								Namespace: "default",
+							},
+							Subsets: []v1.EndpointSubset{}, // Empty subsets
+						},
+						&v1.Service{
+							ObjectMeta: metav1.ObjectMeta{
+								Name:      "test-service",
+								Namespace: "default",
+							},
+							Spec: v1.ServiceSpec{
+								Selector: map[string]string{
+									"app": "test",
+								},
+							},
+						},
+					),
+				},
+				Namespace: "default",
+			},
+			expectations: []struct {
+				name          string
+				failuresCount int
+			}{
+				{
+					name:          "default/test-service",
+					failuresCount: 1, // One failure for no endpoints
+				},
+			},
 		},
 		{
-			name:          "test/Service1",
-			failuresCount: 2,
+			name: "Service with not ready endpoints",
+			config: common.Analyzer{
+				Client: &kubernetes.Client{
+					Client: fake.NewSimpleClientset(
+						&v1.Endpoints{
+							ObjectMeta: metav1.ObjectMeta{
+								Name:      "test-service",
+								Namespace: "default",
+							},
+							Subsets: []v1.EndpointSubset{
+								{
+									NotReadyAddresses: []v1.EndpointAddress{
+										{
+											TargetRef: &v1.ObjectReference{
+												Kind: "Pod",
+												Name: "test-pod",
+											},
+										},
+									},
+								},
+							},
+						},
+						&v1.Service{
+							ObjectMeta: metav1.ObjectMeta{
+								Name:      "test-service",
+								Namespace: "default",
+							},
+							Spec: v1.ServiceSpec{
+								Selector: map[string]string{
+									"app": "test",
+								},
+							},
+						},
+					),
+				},
+				Namespace: "default",
+			},
+			expectations: []struct {
+				name          string
+				failuresCount int
+			}{
+				{
+					name:          "default/test-service",
+					failuresCount: 1, // One failure for not ready endpoints
+				},
+			},
+		},
+		{
+			name: "Service with warning events",
+			config: common.Analyzer{
+				Client: &kubernetes.Client{
+					Client: fake.NewSimpleClientset(
+						&v1.Endpoints{
+							ObjectMeta: metav1.ObjectMeta{
+								Name:      "test-service",
+								Namespace: "default",
+							},
+							Subsets: []v1.EndpointSubset{}, // Empty subsets
+						},
+						&v1.Service{
+							ObjectMeta: metav1.ObjectMeta{
+								Name:      "test-service",
+								Namespace: "default",
+							},
+							Spec: v1.ServiceSpec{
+								Selector: map[string]string{
+									"app": "test",
+								},
+							},
+						},
+						&v1.Event{
+							ObjectMeta: metav1.ObjectMeta{
+								Name:      "test-event",
+								Namespace: "default",
+							},
+							InvolvedObject: v1.ObjectReference{
+								Kind:      "Service",
+								Name:      "test-service",
+								Namespace: "default",
+							},
+							Type:    "Warning",
+							Reason:  "TestReason",
+							Message: "Test warning message",
+						},
+					),
+				},
+				Namespace: "default",
+			},
+			expectations: []struct {
+				name          string
+				failuresCount int
+			}{
+				{
+					name:          "default/test-service",
+					failuresCount: 2, // One failure for no endpoints, one for warning event
+				},
+			},
+		},
+		{
+			name: "Service with leader election annotation",
+			config: common.Analyzer{
+				Client: &kubernetes.Client{
+					Client: fake.NewSimpleClientset(
+						&v1.Endpoints{
+							ObjectMeta: metav1.ObjectMeta{
+								Name:      "test-service",
+								Namespace: "default",
+								Annotations: map[string]string{
+									"control-plane.alpha.kubernetes.io/leader": "test-leader",
+								},
+							},
+							Subsets: []v1.EndpointSubset{}, // Empty subsets
+						},
+						&v1.Service{
+							ObjectMeta: metav1.ObjectMeta{
+								Name:      "test-service",
+								Namespace: "default",
+							},
+							Spec: v1.ServiceSpec{
+								Selector: map[string]string{
+									"app": "test",
+								},
+							},
+						},
+					),
+				},
+				Namespace: "default",
+			},
+			expectations: []struct {
+				name          string
+				failuresCount int
+			}{
+				// No expectations for leader election endpoints
+			},
+		},
+		{
+			name: "Service with non-existent service",
+			config: common.Analyzer{
+				Client: &kubernetes.Client{
+					Client: fake.NewSimpleClientset(
+						&v1.Endpoints{
+							ObjectMeta: metav1.ObjectMeta{
+								Name:      "test-service",
+								Namespace: "default",
+							},
+							Subsets: []v1.EndpointSubset{}, // Empty subsets
+						},
+					),
+				},
+				Namespace: "default",
+			},
+			expectations: []struct {
+				name          string
+				failuresCount int
+			}{
+				// No expectations for non-existent service
+			},
 		},
 	}
 
-	require.Equal(t, len(expectations), len(results))
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			analyzer := ServiceAnalyzer{}
+			results, err := analyzer.Analyze(tt.config)
+			require.NoError(t, err)
+			require.Len(t, results, len(tt.expectations))
 
-	for i, result := range results {
-		require.Equal(t, expectations[i].name, result.Name)
-		require.Equal(t, expectations[i].failuresCount, len(result.Error))
+			// Sort results by name for consistent comparison
+			sort.Slice(results, func(i, j int) bool {
+				return results[i].Name < results[j].Name
+			})
+
+			for i, expectation := range tt.expectations {
+				require.Equal(t, expectation.name, results[i].Name)
+				require.Len(t, results[i].Error, expectation.failuresCount)
+			}
+		})
 	}
 }
 

pkg/analyzer/statefulset_test.go

@@ -384,7 +384,7 @@ func TestStatefulSetAnalyzerUnavailableReplicaWithPodInitialized(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	}
-	
+
 	var errorFound bool
 	want := "Statefulset pod example-1 in the namespace default is not in running state."
 

pkg/cache/cache.go

@@ -14,6 +14,7 @@ var (
 		&FileBasedCache{},
 		&GCSCache{},
 		&S3Cache{},
+		&InterplexCache{},
 	}
 )
 
@@ -54,15 +55,21 @@ func NewCacheProvider(cacheType, bucketname, region, endpoint, storageAccount, c
 	case cacheType == "azure":
 		cProvider.Azure.ContainerName = containerName
 		cProvider.Azure.StorageAccount = storageAccount
+		cProvider.CurrentCacheType = "azure"
 	case cacheType == "gcs":
 		cProvider.GCS.BucketName = bucketname
 		cProvider.GCS.ProjectId = projectId
 		cProvider.GCS.Region = region
+		cProvider.CurrentCacheType = "gcs"
 	case cacheType == "s3":
 		cProvider.S3.BucketName = bucketname
 		cProvider.S3.Region = region
 		cProvider.S3.Endpoint = endpoint
 		cProvider.S3.InsecureSkipVerify = insecure
+		cProvider.CurrentCacheType = "s3"
+	case cacheType == "interplex":
+		cProvider.Interplex.ConnectionString = endpoint
+		cProvider.CurrentCacheType = "interplex"
 	default:
 		return CacheProvider{}, status.Error(codes.Internal, fmt.Sprintf("%s is not a valid option", cacheType))
 	}
@@ -83,20 +90,19 @@ func GetCacheConfiguration() (ICache, error) {
 	}
 
 	var cache ICache
-
 	switch {
-	case cacheInfo.GCS != GCSCacheConfiguration{}:
+	case cacheInfo.CurrentCacheType == "gcs":
 		cache = &GCSCache{}
-	case cacheInfo.Azure != AzureCacheConfiguration{}:
+	case cacheInfo.CurrentCacheType == "azure":
 		cache = &AzureCache{}
-	case cacheInfo.S3 != S3CacheConfiguration{}:
+	case cacheInfo.CurrentCacheType == "s3":
 		cache = &S3Cache{}
+	case cacheInfo.CurrentCacheType == "interplex":
+		cache = &InterplexCache{}
 	default:
 		cache = &FileBasedCache{}
 	}
-
 	err_config := cache.Configure(cacheInfo)
-
 	return cache, err_config
 }
 

pkg/cache/interplex_based.go

@@ -0,0 +1,108 @@
+package cache
+
+import (
+	rpc "buf.build/gen/go/interplex-ai/schemas/grpc/go/protobuf/schema/v1/schemav1grpc"
+	schemav1 "buf.build/gen/go/interplex-ai/schemas/protocolbuffers/go/protobuf/schema/v1"
+	"context"
+	"errors"
+	"google.golang.org/grpc"
+	"os"
+)
+
+var _ ICache = (*InterplexCache)(nil)
+
+type InterplexCache struct {
+	configuration      InterplexCacheConfiguration
+	client             InterplexClient
+	cacheServiceClient rpc.CacheServiceClient
+	noCache            bool
+}
+
+type InterplexCacheConfiguration struct {
+	ConnectionString string `mapstructure:"connectionString" yaml:"connectionString,omitempty"`
+}
+
+type InterplexClient struct {
+}
+
+func (c *InterplexCache) Configure(cacheInfo CacheProvider) error {
+
+	if cacheInfo.Interplex.ConnectionString == "" {
+		return errors.New("connection string is required")
+	}
+	c.configuration.ConnectionString = cacheInfo.Interplex.ConnectionString
+	return nil
+}
+
+func (c *InterplexCache) Store(key string, data string) error {
+
+	if os.Getenv("INTERPLEX_LOCAL_MODE") != "" {
+		c.configuration.ConnectionString = "localhost:8084"
+	}
+
+	conn, err := grpc.NewClient(c.configuration.ConnectionString, grpc.WithInsecure(), grpc.WithBlock())
+	defer conn.Close()
+	if err != nil {
+		return err
+	}
+	serviceClient := rpc.NewCacheServiceClient(conn)
+	c.cacheServiceClient = serviceClient
+	req := schemav1.SetRequest{
+		Key:   key,
+		Value: data,
+	}
+	_, err = c.cacheServiceClient.Set(context.Background(), &req)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (c *InterplexCache) Load(key string) (string, error) {
+	conn, err := grpc.NewClient(c.configuration.ConnectionString, grpc.WithInsecure(), grpc.WithBlock())
+	defer conn.Close()
+	if err != nil {
+		return "", err
+	}
+	serviceClient := rpc.NewCacheServiceClient(conn)
+	c.cacheServiceClient = serviceClient
+	req := schemav1.GetRequest{
+		Key: key,
+	}
+	resp, err := c.cacheServiceClient.Get(context.Background(), &req)
+	// check if response is cache error not found
+	if err != nil {
+		return "", err
+	}
+	return resp.Value, nil
+}
+
+func (InterplexCache) List() ([]CacheObjectDetails, error) {
+	//TODO implement me
+	return nil, errors.New("not implemented")
+}
+
+func (InterplexCache) Remove(key string) error {
+
+	return errors.New("not implemented")
+}
+
+func (c *InterplexCache) Exists(key string) bool {
+	if _, err := c.Load(key); err != nil {
+		return false
+	}
+	return true
+}
+
+func (c *InterplexCache) IsCacheDisabled() bool {
+	return c.noCache
+}
+
+func (InterplexCache) GetName() string {
+	//TODO implement me
+	return "interplex"
+}
+
+func (c *InterplexCache) DisableCache() {
+	c.noCache = true
+}

pkg/cache/interplex_based_test.go

@@ -0,0 +1,77 @@
+package cache
+
+import (
+	rpc "buf.build/gen/go/interplex-ai/schemas/grpc/go/protobuf/schema/v1/schemav1grpc"
+	schemav1 "buf.build/gen/go/interplex-ai/schemas/protocolbuffers/go/protobuf/schema/v1"
+	"context"
+	"errors"
+	"google.golang.org/grpc"
+	"net"
+	"testing"
+)
+
+func TestInterplexCache(t *testing.T) {
+	cache := &InterplexCache{
+		configuration: InterplexCacheConfiguration{
+			ConnectionString: "localhost:50051",
+		},
+	}
+
+	// Mock GRPC server setup
+	go func() {
+		lis, err := net.Listen("tcp", ":50051")
+		if err != nil {
+			t.Fatalf("failed to listen: %v", err)
+		}
+		s := grpc.NewServer()
+		rpc.RegisterCacheServiceServer(s, &mockCacheService{})
+		if err := s.Serve(lis); err != nil {
+			t.Fatalf("failed to serve: %v", err)
+		}
+	}()
+
+	t.Run("TestStore", func(t *testing.T) {
+		err := cache.Store("key1", "value1")
+		if err != nil {
+			t.Errorf("Error storing value: %v", err)
+		}
+	})
+
+	t.Run("TestLoad", func(t *testing.T) {
+		value, err := cache.Load("key1")
+		if err != nil {
+			t.Errorf("Error loading value: %v", err)
+		}
+		if value != "value1" {
+			t.Errorf("Expected value1, got %v", value)
+		}
+	})
+
+	t.Run("TestExists", func(t *testing.T) {
+		exists := cache.Exists("key1")
+		if !exists {
+			t.Errorf("Expected key1 to exist")
+		}
+	})
+}
+
+type mockCacheService struct {
+	rpc.UnimplementedCacheServiceServer
+	data map[string]string
+}
+
+func (m *mockCacheService) Set(ctx context.Context, req *schemav1.SetRequest) (*schemav1.SetResponse, error) {
+	if m.data == nil {
+		m.data = make(map[string]string)
+	}
+	m.data[req.Key] = req.Value
+	return &schemav1.SetResponse{}, nil
+}
+
+func (m *mockCacheService) Get(ctx context.Context, req *schemav1.GetRequest) (*schemav1.GetResponse, error) {
+	value, exists := m.data[req.Key]
+	if !exists {
+		return nil, errors.New("key not found")
+	}
+	return &schemav1.GetResponse{Value: value}, nil
+}

pkg/cache/types.go

@@ -3,9 +3,11 @@ package cache
 import "time"
 
 type CacheProvider struct {
-	GCS   GCSCacheConfiguration   `mapstructucre:"gcs" yaml:"gcs,omitempty"`
-	Azure AzureCacheConfiguration `mapstructucre:"azure" yaml:"azure,omitempty"`
-	S3    S3CacheConfiguration    `mapstructucre:"s3" yaml:"s3,omitempty"`
+	CurrentCacheType string                      `mapstructure:"currentCacheType" yaml:"currentCacheType"`
+	GCS              GCSCacheConfiguration       `mapstructure:"gcs" yaml:"gcs,omitempty"`
+	Azure            AzureCacheConfiguration     `mapstructure:"azure" yaml:"azure,omitempty"`
+	S3               S3CacheConfiguration        `mapstructure:"s3" yaml:"s3,omitempty"`
+	Interplex        InterplexCacheConfiguration `mapstructure:"interplex" yaml:"interplex,omitempty"`
 }
 
 type CacheObjectDetails struct {

pkg/common/types.go

@@ -17,7 +17,6 @@ import (
 	"context"
 	"time"
 
-	trivy "github.com/aquasecurity/trivy-operator/pkg/apis/aquasecurity/v1alpha1"
 	openapi_v2 "github.com/google/gnostic/openapiv2"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/ai"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
@@ -67,8 +66,6 @@ type PreAnalysis struct {
 	HTTPRoute                gtwapi.HTTPRoute
 	// Integrations
 	ScaledObject               keda.ScaledObject
-	TrivyVulnerabilityReport   trivy.VulnerabilityReport
-	TrivyConfigAuditReport     trivy.ConfigAuditReport
 	KyvernoPolicyReport        kyverno.PolicyReport
 	KyvernoClusterPolicyReport kyverno.ClusterPolicyReport
 }

pkg/integration/integration.go

@@ -23,7 +23,6 @@ import (
 	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/integration/keda"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/integration/prometheus"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/integration/trivy"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/util"
 	"github.com/spf13/viper"
 )
@@ -49,7 +48,6 @@ type Integration struct {
 }
 
 var integrations = map[string]IIntegration{
-	"trivy":      trivy.NewTrivy(),
 	"prometheus": prometheus.NewPrometheus(),
 	"aws":        aws.NewAWS(),
 	"keda":       keda.NewKeda(),

pkg/integration/integration_test.go

@@ -43,14 +43,6 @@ func TestAnalyzerByIntegration(t *testing.T) {
 			name:         "PrometheusConfigRelabelReport",
 			expectedName: "prometheus",
 		},
-		{
-			name:         "VulnerabilityReport",
-			expectedName: "trivy",
-		},
-		{
-			name:         "ConfigAuditReport",
-			expectedName: "trivy",
-		},
 	}
 	for _, tt := range tests {
 		tt := tt
@@ -106,12 +98,6 @@ func TestActivate(t *testing.T) {
 			skipInstall:        true,
 			expectedIsActivate: true,
 		},
-		{
-			name:                    "trivy",
-			skipInstall:             false,
-			expectedActivationErr:   "failed to deploy trivy integration:",
-			expectedDeactivationErr: "failed to undeploy trivy integration:",
-		},
 	}
 	for _, tt := range tests {
 		tt := tt

pkg/integration/kyverno/analyzer.go

@@ -39,7 +39,7 @@ func (KyvernoAnalyzer) analyzePolicyReports(a common.Analyzer) ([]common.Result,
 	if err != nil {
 		return nil, err
 	}
-	if err := client.List(a.Context, result, &ctrl.ListOptions{}); err != nil {
+	if err := client.List(a.Context, result, &ctrl.ListOptions{Namespace: a.Namespace}); err != nil {
 		return nil, err
 	}
 

pkg/integration/kyverno/analyzer_test.go

@@ -0,0 +1,117 @@
+/*
+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 kyverno
+
+import (
+	"context"
+	"testing"
+
+	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
+	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
+	"github.com/kyverno/policy-reporter-kyverno-plugin/pkg/crd/api/policyreport/v1alpha2"
+
+	"github.com/stretchr/testify/assert"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+)
+
+func buildFakeClient(t *testing.T) client.Client {
+	objects := []client.Object{
+		&v1alpha2.PolicyReport{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "policy-1",
+				Namespace: "test-ns",
+			},
+			Results: []v1alpha2.PolicyReportResult{
+				{
+					Category: "Other",
+					Message:  "validation failure: Images built more than 6 months ago are prohibited.",
+					Policy:   "block-stale-images",
+					Result:   "fail",
+				},
+			},
+		},
+		&v1alpha2.PolicyReport{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "policy-2",
+				Namespace: "other-ns",
+			},
+			Results: []v1alpha2.PolicyReportResult{
+				{
+					Category: "Other",
+					Message:  "validation failure: Images built more than 6 months ago are prohibited.",
+					Policy:   "block-stale-images",
+					Result:   "fail",
+				},
+			},
+		},
+	}
+
+	scheme := runtime.NewScheme()
+	err := v1alpha2.AddToScheme(scheme)
+	if err != nil {
+		t.Error(err)
+	}
+	return fake.NewClientBuilder().WithScheme(scheme).WithObjects(objects...).Build()
+}
+
+func TestAnalyzerNamespaceFiltering(t *testing.T) {
+
+	config := common.Analyzer{
+		Client: &kubernetes.Client{
+			CtrlClient: buildFakeClient(t),
+		},
+		Context:   context.Background(),
+		Namespace: "test-ns",
+	}
+
+	// Create and run analyzer
+	analyzer := KyvernoAnalyzer{
+		policyReportAnalysis: true,
+	}
+	results, err := analyzer.Analyze(config)
+	if err != nil {
+		t.Error(err)
+	}
+
+	// Verify results
+	assert.Equal(t, len(results), 1)
+	assert.Equal(t, results[0].Kind, "PolicyReport")
+	assert.Equal(t, results[0].Name, "test-ns/policy-1")
+}
+
+func TestAnalyzerAllNamespace(t *testing.T) {
+
+	config := common.Analyzer{
+		Client: &kubernetes.Client{
+			CtrlClient: buildFakeClient(t),
+		},
+		Context: context.Background(),
+	}
+
+	// Create and run analyzer
+	analyzer := KyvernoAnalyzer{
+		policyReportAnalysis: true,
+	}
+	results, err := analyzer.Analyze(config)
+	if err != nil {
+		t.Error(err)
+	}
+
+	// Verify results
+	assert.Equal(t, len(results), 2)
+
+}

pkg/integration/trivy/analyzer.go

@@ -1,175 +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 trivy
-
-import (
-	"fmt"
-	"strings"
-
-	ctrl "sigs.k8s.io/controller-runtime/pkg/client"
-
-	"github.com/aquasecurity/trivy-operator/pkg/apis/aquasecurity/v1alpha1"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/util"
-)
-
-type TrivyAnalyzer struct {
-	vulernabilityReportAnalysis bool
-	configAuditReportAnalysis   bool
-}
-
-func (TrivyAnalyzer) analyzeVulnerabilityReports(a common.Analyzer) ([]common.Result, error) {
-	// Get all trivy VulnerabilityReports
-	result := &v1alpha1.VulnerabilityReportList{}
-
-	client := a.Client.CtrlClient
-	err := v1alpha1.AddToScheme(client.Scheme())
-	if err != nil {
-		return nil, err
-	}
-	if err := client.List(a.Context, result, &ctrl.ListOptions{}); err != nil {
-		return nil, err
-	}
-
-	// Find criticals and get CVE
-	var preAnalysis = map[string]common.PreAnalysis{}
-
-	for _, report := range result.Items {
-
-		// For each pod there may be multiple vulnerabilities
-		var failures []common.Failure
-		distinctFailures := make(map[string]common.Failure)
-		for _, vuln := range report.Report.Vulnerabilities {
-			if vuln.Severity == "CRITICAL" {
-				// get the vulnerability ID
-				// get the vulnerability description
-				text := fmt.Sprintf("critical Vulnerability found ID: %s (learn more at: %s)", vuln.VulnerabilityID, vuln.PrimaryLink)
-				distinctFailures[text] = common.Failure{
-					Text:      text,
-					Sensitive: []common.Sensitive{},
-				}
-			}
-		}
-		for _, v := range distinctFailures {
-			failures = append(failures, v)
-		}
-		if len(failures) > 0 {
-			preAnalysis[fmt.Sprintf("%s/%s", report.Namespace,
-				report.Name)] = common.PreAnalysis{
-				TrivyVulnerabilityReport: report,
-				FailureDetails:           failures,
-			}
-		}
-	}
-
-	for key, value := range preAnalysis {
-		var currentAnalysis = common.Result{
-			Kind:  "VulnerabilityReport",
-			Name:  key,
-			Error: value.FailureDetails,
-		}
-
-		parent, _ := util.GetParent(a.Client, value.TrivyVulnerabilityReport.ObjectMeta)
-		currentAnalysis.ParentObject = parent
-		a.Results = append(a.Results, currentAnalysis)
-	}
-
-	return a.Results, nil
-
-}
-
-func (t TrivyAnalyzer) analyzeConfigAuditReports(a common.Analyzer) ([]common.Result, error) {
-	// Get all trivy ConfigAuditReports
-	result := &v1alpha1.ConfigAuditReportList{}
-
-	client := a.Client.CtrlClient
-	err := v1alpha1.AddToScheme(client.Scheme())
-	if err != nil {
-		return nil, err
-	}
-	if err := client.List(a.Context, result, &ctrl.ListOptions{}); err != nil {
-		return nil, err
-	}
-
-	// Find criticals and get CVE
-	var preAnalysis = map[string]common.PreAnalysis{}
-
-	for _, report := range result.Items {
-
-		// For each k8s resources there may be multiple checks
-		var failures []common.Failure
-		for _, check := range report.Report.Checks {
-			if check.Severity == "MEDIUM" || check.Severity == "HIGH" || check.Severity == "CRITICAL" {
-				failures = append(failures, common.Failure{
-					Text: fmt.Sprintf("Config issue with severity \"%s\" found: %s", check.Severity, strings.Join(check.Messages, "")),
-					Sensitive: []common.Sensitive{
-						{
-							Unmasked: report.Labels["trivy-operator.resource.name"],
-							Masked:   util.MaskString(report.Labels["trivy-operator.resource.name"]),
-						},
-						{
-							Unmasked: report.Labels["trivy-operator.resource.namespace"],
-							Masked:   util.MaskString(report.Labels["trivy-operator.resource.namespace"]),
-						},
-					},
-				})
-			}
-		}
-
-		if len(failures) > 0 {
-			preAnalysis[fmt.Sprintf("%s/%s", report.Namespace,
-				report.Name)] = common.PreAnalysis{
-				TrivyConfigAuditReport: report,
-				FailureDetails:         failures,
-			}
-		}
-	}
-
-	for key, value := range preAnalysis {
-		var currentAnalysis = common.Result{
-			Kind:  "ConfigAuditReport",
-			Name:  key,
-			Error: value.FailureDetails,
-		}
-
-		parent, _ := util.GetParent(a.Client, value.TrivyConfigAuditReport.ObjectMeta)
-		currentAnalysis.ParentObject = parent
-		a.Results = append(a.Results, currentAnalysis)
-	}
-
-	return a.Results, nil
-}
-
-func (t TrivyAnalyzer) Analyze(a common.Analyzer) ([]common.Result, error) {
-
-	if t.vulernabilityReportAnalysis {
-		common := make([]common.Result, 0)
-		vresult, err := t.analyzeVulnerabilityReports(a)
-		if err != nil {
-			return nil, err
-		}
-		common = append(common, vresult...)
-		return common, nil
-	}
-	if t.configAuditReportAnalysis {
-		common := make([]common.Result, 0)
-		cresult, err := t.analyzeConfigAuditReports(a)
-		if err != nil {
-			return nil, err
-		}
-		common = append(common, cresult...)
-		return common, nil
-	}
-	return make([]common.Result, 0), nil
-}

pkg/integration/trivy/trivy.go

@@ -1,199 +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 trivy
-
-import (
-	"context"
-	"fmt"
-	"os"
-
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-
-	"github.com/fatih/color"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
-	helmclient "github.com/mittwald/go-helm-client"
-	"github.com/spf13/viper"
-	"helm.sh/helm/v3/pkg/repo"
-)
-
-var (
-	Repo          = getEnv("TRIVY_REPO", "https://aquasecurity.github.io/helm-charts/")
-	Version       = getEnv("TRIVY_VERSION", "0.13.0")
-	ChartName     = getEnv("TRIVY_CHART_NAME", "trivy-operator")
-	RepoShortName = getEnv("TRIVY_REPO_SHORT_NAME", "aqua")
-	ReleaseName   = getEnv("TRIVY_RELEASE_NAME", "trivy-operator-k8sgpt")
-)
-
-type Trivy struct {
-	helm helmclient.Client
-}
-
-func getEnv(key, defaultValue string) string {
-	value := os.Getenv(key)
-	if value == "" {
-		return defaultValue
-	}
-	return value
-}
-
-func NewTrivy() *Trivy {
-	helmClient, err := helmclient.New(&helmclient.Options{})
-	if err != nil {
-		panic(err)
-	}
-	return &Trivy{
-		helm: helmClient,
-	}
-}
-
-func (t *Trivy) GetAnalyzerName() []string {
-	return []string{
-		"VulnerabilityReport",
-		"ConfigAuditReport",
-	}
-}
-
-// This doesnt work
-func (t *Trivy) GetNamespace() (string, error) {
-	releases, err := t.helm.ListDeployedReleases()
-	if err != nil {
-		return "", err
-	}
-	for _, rel := range releases {
-		if rel.Name == ReleaseName {
-			return rel.Namespace, nil
-		}
-	}
-	return "", status.Error(codes.NotFound, "trivy release not found")
-}
-
-func (t *Trivy) OwnsAnalyzer(analyzer string) bool {
-
-	for _, a := range t.GetAnalyzerName() {
-		if analyzer == a {
-			return true
-		}
-	}
-	return false
-}
-func (t *Trivy) Deploy(namespace string) error {
-
-	// Add the repository
-	chartRepo := repo.Entry{
-		Name: RepoShortName,
-		URL:  Repo,
-	}
-	// Add a chart-repository to the client.
-	if err := t.helm.AddOrUpdateChartRepo(chartRepo); err != nil {
-		panic(err)
-	}
-
-	chartSpec := helmclient.ChartSpec{
-		ReleaseName: ReleaseName,
-		ChartName:   fmt.Sprintf("%s/%s", RepoShortName, ChartName),
-		Namespace:   namespace,
-
-		//TODO: All of this should be configurable
-		UpgradeCRDs:     true,
-		Wait:            false,
-		Timeout:         300,
-		CreateNamespace: true,
-	}
-
-	// Install a chart release.
-	// Note that helmclient.Options.Namespace should ideally match the namespace in chartSpec.Namespace.
-	if _, err := t.helm.InstallOrUpgradeChart(context.Background(), &chartSpec, nil); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (t *Trivy) UnDeploy(namespace string) error {
-	chartSpec := helmclient.ChartSpec{
-		ReleaseName: ReleaseName,
-		ChartName:   fmt.Sprintf("%s/%s", RepoShortName, ChartName),
-		Namespace:   namespace,
-		UpgradeCRDs: true,
-		Wait:        false,
-		Timeout:     300,
-	}
-	// Uninstall the chart release.
-	// Note that helmclient.Options.Namespace should ideally match the namespace in chartSpec.Namespace.
-	if err := t.helm.UninstallRelease(&chartSpec); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (t *Trivy) isDeployed() bool {
-	// check if aquasec apigroup is available as a marker if trivy is installed on the cluster
-	kubecontext := viper.GetString("kubecontext")
-	kubeconfig := viper.GetString("kubeconfig")
-	client, err := kubernetes.NewClient(kubecontext, kubeconfig)
-	if err != nil {
-		// TODO: better error handling
-		color.Red("Error initialising kubernetes client: %v", err)
-		os.Exit(1)
-	}
-	groups, _, err := client.Client.Discovery().ServerGroupsAndResources()
-	if err != nil {
-		// TODO: better error handling
-		color.Red("Error initialising discovery client: %v", err)
-		os.Exit(1)
-	}
-
-	for _, group := range groups {
-		if group.Name == "aquasecurity.github.io" {
-			return true
-		}
-	}
-
-	return false
-}
-
-func (t *Trivy) isFilterActive() bool {
-	activeFilters := viper.GetStringSlice("active_filters")
-
-	for _, filter := range t.GetAnalyzerName() {
-		for _, af := range activeFilters {
-			if af == filter {
-				return true
-			}
-		}
-	}
-
-	return false
-}
-
-func (t *Trivy) IsActivate() bool {
-	if t.isFilterActive() && t.isDeployed() {
-		return true
-	} else {
-		return false
-	}
-}
-
-func (t *Trivy) AddAnalyzer(mergedMap *map[string]common.IAnalyzer) {
-
-	(*mergedMap)["VulnerabilityReport"] = &TrivyAnalyzer{
-		vulernabilityReportAnalysis: true,
-	}
-	(*mergedMap)["ConfigAuditReport"] = &TrivyAnalyzer{
-		configAuditReportAnalysis: true,
-	}
-
-}

pkg/server/README.md

@@ -19,12 +19,12 @@ grpcurl -plaintext -d '{"namespace": "k8sgpt", "explain" : "true"}' localhost:80
 grpcurl -plaintext  localhost:8080 schema.v1.ServiceConfigService/ListIntegrations
 {
   "integrations": [
-    "trivy"
+    "prometheus"
   ]
 }
 
 ```
 
 ```
-grpcurl -plaintext -d '{"integrations":{"trivy":{"enabled":"true","namespace":"default","skipInstall":"false"}}}' localhost:8080 schema.v1.ServiceConfigService/AddConfig
+grpcurl -plaintext -d '{"integrations":{"prometheus":{"enabled":"true","namespace":"default","skipInstall":"false"}}}' localhost:8080 schema.v1.ServiceConfigService/AddConfig
 ```

pkg/server/analyze/analyze.go

@@ -34,10 +34,10 @@ func (h *Handler) Analyze(ctx context.Context, i *schemav1.AnalyzeRequest) (
 		[]string{}, //TODO: add custom http headers in server mode
 		false,      // with stats disable
 	)
-	config.Context = ctx // Replace context for correct timeouts.
 	if err != nil {
 		return &schemav1.AnalyzeResponse{}, err
 	}
+	config.Context = ctx // Replace context for correct timeouts.
 	defer config.Close()
 
 	if config.CustomAnalyzersAreAvailable() {

pkg/server/config/config.go

@@ -71,6 +71,8 @@ func (h *Handler) AddConfig(ctx context.Context, i *schemav1.AddConfigRequest) (
 			remoteCache, err = cache.NewCacheProvider("s3", i.Cache.GetS3Cache().BucketName, i.Cache.GetS3Cache().Region, i.Cache.GetS3Cache().Endpoint, notUsedStorageAcc, notUsedContainerName, notUsedProjectId, i.Cache.GetS3Cache().Insecure)
 		case *schemav1.Cache_GcsCache:
 			remoteCache, err = cache.NewCacheProvider("gcs", i.Cache.GetGcsCache().BucketName, i.Cache.GetGcsCache().Region, notUsedEndpoint, notUsedStorageAcc, notUsedContainerName, i.Cache.GetGcsCache().GetProjectId(), notUsedInsecure)
+		case *schemav1.Cache_InterplexCache:
+			remoteCache, err = cache.NewCacheProvider("interplex", notUsedBucket, notUsedRegion, i.Cache.GetInterplexCache().Endpoint, notUsedStorageAcc, notUsedContainerName, notUsedProjectId, notUsedInsecure)
 		default:
 			return resp, status.Error(codes.InvalidArgument, "Invalid cache configuration")
 		}

pkg/server/config/integration.go

@@ -4,16 +4,14 @@ import (
 	schemav1 "buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go/schema/v1"
 	"context"
 	"fmt"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/analyzer"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/integration"
-	"github.com/spf13/viper"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
 
-const (
-	trivyName = "trivy"
-)
+//const (
+//	trivyName = "trivy"
+//)
 
 // syncIntegration is aware of the following events
 // A new integration added
@@ -21,6 +19,9 @@ const (
 func (h *Handler) syncIntegration(ctx context.Context,
 	i *schemav1.AddConfigRequest) (*schemav1.AddConfigResponse, error,
 ) {
+
+	fmt.Println("WARNING: syncIntegration is deprecated.")
+
 	response := &schemav1.AddConfigResponse{}
 	integrationProvider := integration.NewIntegration()
 	if i.Integrations == nil {
@@ -31,98 +32,106 @@ func (h *Handler) syncIntegration(ctx context.Context,
 		}
 		return response, nil
 	}
-	coreFilters, _, _ := analyzer.ListFilters()
-	// Update filters
-	activeFilters := viper.GetStringSlice("active_filters")
-	if len(activeFilters) == 0 {
-		activeFilters = coreFilters
-	}
-	var err error = status.Error(codes.OK, "")
-	if err != nil {
-		fmt.Println(err)
-	}
-	deactivateFunc := func(integrationRef integration.IIntegration) error {
-		namespace, err := integrationRef.GetNamespace()
-		if err != nil {
-			return err
-		}
-		err = integrationProvider.Deactivate(trivyName, namespace)
-		if err != nil {
-			return status.Error(codes.NotFound, "integration already deactivated")
-		}
-		return nil
-	}
-	integrationRef, err := integrationProvider.Get(trivyName)
-	if err != nil {
-		return response, status.Error(codes.NotFound, "provider get failure")
-	}
-	if i.Integrations.Trivy != nil {
-		switch i.Integrations.Trivy.Enabled {
-		case true:
-			if b, err := integrationProvider.IsActivate(trivyName); err != nil {
-				return response, status.Error(codes.Internal, "integration activation error")
-			} else {
-				if !b {
-					err := integrationProvider.Activate(trivyName, i.Integrations.Trivy.Namespace,
-						activeFilters, i.Integrations.Trivy.SkipInstall)
-					if err != nil {
-						return nil, err
-					}
-				} else {
-					return response, status.Error(codes.AlreadyExists, "integration already active")
-				}
-			}
-		case false:
-			err = deactivateFunc(integrationRef)
-			if err != nil {
-				return nil, err
-			}
-			// This break is included purely for static analysis to pass
-		}
-	} else {
-		// If Trivy has been removed, disable it
-		err = deactivateFunc(integrationRef)
-		if err != nil {
-			return nil, err
-		}
-	}
 
-	return response, err
+	// Warning: This code is an example of an integration modifying the active filter list
+	// This integration is no longer part of K8sGPT due to compatibility issues
+
+	//coreFilters, _, _ := analyzer.ListFilters()
+	// Update filters
+	//activeFilters := viper.GetStringSlice("active_filters")
+	//if len(activeFilters) == 0 {
+	//	activeFilters = coreFilters
+	//}
+	//var err error = status.Error(codes.OK, "")
+	//if err != nil {
+	//	fmt.Println(err)
+	//}
+	//deactivateFunc := func(integrationRef integration.IIntegration) error {
+	//	namespace, err := integrationRef.GetNamespace()
+	//	if err != nil {
+	//		return err
+	//	}
+	//	err = integrationProvider.Deactivate(trivyName, namespace)
+	//	if err != nil {
+	//		return status.Error(codes.NotFound, "integration already deactivated")
+	//	}
+	//	return nil
+	//}
+	//integrationRef, err := integrationProvider.Get(trivyName)
+	//if err != nil {
+	//	return response, status.Error(codes.NotFound, "provider get failure")
+	//}
+	//if i.Integrations.Trivy != nil {
+	//	switch i.Integrations.Trivy.Enabled {
+	//	case true:
+	//		if b, err := integrationProvider.IsActivate(trivyName); err != nil {
+	//			return response, status.Error(codes.Internal, "integration activation error")
+	//		} else {
+	//			if !b {
+	//				err := integrationProvider.Activate(trivyName, i.Integrations.Trivy.Namespace,
+	//					activeFilters, i.Integrations.Trivy.SkipInstall)
+	//				if err != nil {
+	//					return nil, err
+	//				}
+	//			} else {
+	//				return response, status.Error(codes.AlreadyExists, "integration already active")
+	//			}
+	//		}
+	//	case false:
+	//		err = deactivateFunc(integrationRef)
+	//		if err != nil {
+	//			return nil, err
+	//		}
+	//		// This break is included purely for static analysis to pass
+	//	}
+	//} else {
+	//	// If Trivy has been removed, disable it
+	//	err = deactivateFunc(integrationRef)
+	//	if err != nil {
+	//		return nil, err
+	//	}
+	//}
+
+	return response, nil
 }
 
-func (*Handler) ListIntegrations(ctx context.Context, req *schemav1.ListIntegrationsRequest) (*schemav1.ListIntegrationsResponse, error) {
+func (h *Handler) ListIntegrations(ctx context.Context, req *schemav1.ListIntegrationsRequest) (*schemav1.ListIntegrationsResponse, error) {
 
-	integrationProvider := integration.NewIntegration()
+	fmt.Println("WARNING: ListIntegrations is deprecated.")
+
+	//integrationProvider := integration.NewIntegration()
 	// Update the requester with the status of Trivy
-	trivy, err := integrationProvider.Get(trivyName)
-	active := trivy.IsActivate()
-	var skipInstall bool
-	var namespace string = ""
-	if active {
-		namespace, err = trivy.GetNamespace()
-		if err != nil {
-			return nil, status.Error(codes.NotFound, "namespace not found")
-		}
-		if namespace == "" {
-			skipInstall = true
-		}
-	}
-
-	if err != nil {
-		return nil, status.Error(codes.NotFound, "trivy integration")
-	}
+	//trivy, err := integrationProvider.Get(trivyName)
+	//active := trivy.IsActivate()
+	//var skipInstall bool
+	//var namespace string = ""
+	//if active {
+	//	namespace, err = trivy.GetNamespace()
+	//	if err != nil {
+	//		return nil, status.Error(codes.NotFound, "namespace not found")
+	//	}
+	//	if namespace == "" {
+	//		skipInstall = true
+	//	}
+	//}
+	//
+	//if err != nil {
+	//	return nil, status.Error(codes.NotFound, "trivy integration")
+	//}
 	resp := &schemav1.ListIntegrationsResponse{
-		Trivy: &schemav1.Trivy{
-			Enabled:     active,
-			Namespace:   namespace,
-			SkipInstall: skipInstall,
-		},
+		//Trivy: &schemav1.Trivy{
+		//	Enabled:     active,
+		//	Namespace:   namespace,
+		//	SkipInstall: skipInstall,
+		//},
 	}
 
 	return resp, nil
 }
 
 func (*Handler) deactivateAllIntegrations(integrationProvider *integration.Integration) error {
+
+	fmt.Println("WARNING: deactivateIntegrations is deprecated.")
 	integrations := integrationProvider.List()
 	for _, i := range integrations {
 		b, _ := integrationProvider.IsActivate(i)

pkg/server/query/query.go

@@ -1,8 +1,10 @@
 package query
 
 import (
-	schemav1 "buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go/schema/v1"
 	"context"
+	"fmt"
+
+	schemav1 "buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go/schema/v1"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/ai"
 )
 
@@ -10,9 +12,50 @@ func (h *Handler) Query(ctx context.Context, i *schemav1.QueryRequest) (
 	*schemav1.QueryResponse,
 	error,
 ) {
-	aiClient := ai.NewClient(i.Backend)
+	// Create client factory and config provider
+	factory := ai.GetAIClientFactory()
+	configProvider := ai.GetConfigProvider()
+
+	// Use the factory to create the client
+	aiClient := factory.NewClient(i.Backend)
 	defer aiClient.Close()
 
+	var configAI ai.AIConfiguration
+	if err := configProvider.UnmarshalKey("ai", &configAI); err != nil {
+		return &schemav1.QueryResponse{
+			Response: "",
+			Error: &schemav1.QueryError{
+				Message: fmt.Sprintf("Failed to unmarshal AI configuration: %v", err),
+			},
+		}, nil
+	}
+
+	var aiProvider ai.AIProvider
+	for _, provider := range configAI.Providers {
+		if i.Backend == provider.Name {
+			aiProvider = provider
+			break
+		}
+	}
+	if aiProvider.Name == "" {
+		return &schemav1.QueryResponse{
+			Response: "",
+			Error: &schemav1.QueryError{
+				Message: fmt.Sprintf("AI provider %s not found in configuration", i.Backend),
+			},
+		}, nil
+	}
+
+	// Configure the AI client
+	if err := aiClient.Configure(&aiProvider); err != nil {
+		return &schemav1.QueryResponse{
+			Response: "",
+			Error: &schemav1.QueryError{
+				Message: fmt.Sprintf("Failed to configure AI client: %v", err),
+			},
+		}, nil
+	}
+
 	resp, err := aiClient.GetCompletion(ctx, i.Query)
 	var errMessage string = ""
 	if err != nil {

pkg/server/query/query_test.go

@@ -0,0 +1,310 @@
+package query
+
+import (
+	"context"
+	"errors"
+	"testing"
+
+	schemav1 "buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go/schema/v1"
+	"github.com/k8sgpt-ai/k8sgpt/pkg/ai"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+)
+
+// MockAI is a mock implementation of the ai.IAI interface for testing
+type MockAI struct {
+	mock.Mock
+}
+
+func (m *MockAI) Configure(config ai.IAIConfig) error {
+	args := m.Called(config)
+	return args.Error(0)
+}
+
+func (m *MockAI) GetCompletion(ctx context.Context, prompt string) (string, error) {
+	args := m.Called(ctx, prompt)
+	return args.String(0), args.Error(1)
+}
+
+func (m *MockAI) GetName() string {
+	args := m.Called()
+	return args.String(0)
+}
+
+func (m *MockAI) Close() {
+	m.Called()
+}
+
+// MockAIClientFactory is a mock implementation of AIClientFactory
+type MockAIClientFactory struct {
+	mock.Mock
+}
+
+func (m *MockAIClientFactory) NewClient(provider string) ai.IAI {
+	args := m.Called(provider)
+	return args.Get(0).(ai.IAI)
+}
+
+// MockConfigProvider is a mock implementation of ConfigProvider
+type MockConfigProvider struct {
+	mock.Mock
+}
+
+func (m *MockConfigProvider) UnmarshalKey(key string, rawVal interface{}) error {
+	args := m.Called(key, rawVal)
+
+	// If we want to set the rawVal (which is a pointer)
+	if fn, ok := args.Get(0).(func(interface{})); ok && fn != nil {
+		fn(rawVal)
+	}
+
+	// Return the error as the first return value
+	return args.Error(0)
+}
+
+func TestQuery_Success(t *testing.T) {
+	// Setup mocks
+	mockAI := new(MockAI)
+	mockFactory := new(MockAIClientFactory)
+	mockConfig := new(MockConfigProvider)
+
+	// Set test implementations
+	ai.SetTestAIClientFactory(mockFactory)
+	ai.SetTestConfigProvider(mockConfig)
+	defer ai.ResetTestImplementations()
+
+	// Define test data
+	testBackend := "test-backend"
+	testQuery := "test query"
+	testResponse := "test response"
+
+	// Setup expectations
+	mockFactory.On("NewClient", testBackend).Return(mockAI)
+	mockAI.On("Close").Return()
+
+	// Set up configuration with a valid provider
+	mockConfig.On("UnmarshalKey", "ai", mock.Anything).Run(func(args mock.Arguments) {
+		config := args.Get(1).(*ai.AIConfiguration)
+		*config = ai.AIConfiguration{
+			Providers: []ai.AIProvider{
+				{
+					Name:     testBackend,
+					Password: "test-password",
+					Model:    "test-model",
+				},
+			},
+		}
+	}).Return(nil)
+
+	mockAI.On("Configure", mock.AnythingOfType("*ai.AIProvider")).Return(nil)
+	mockAI.On("GetCompletion", mock.Anything, testQuery).Return(testResponse, nil)
+
+	// Create handler and call Query
+	handler := &Handler{}
+	response, err := handler.Query(context.Background(), &schemav1.QueryRequest{
+		Backend: testBackend,
+		Query:   testQuery,
+	})
+
+	// Assertions
+	assert.NoError(t, err)
+	assert.NotNil(t, response)
+	assert.Equal(t, testResponse, response.Response)
+	assert.Equal(t, "", response.Error.Message)
+
+	// Verify mocks
+	mockAI.AssertExpectations(t)
+	mockFactory.AssertExpectations(t)
+	mockConfig.AssertExpectations(t)
+}
+
+func TestQuery_UnmarshalError(t *testing.T) {
+	// Setup mocks
+	mockAI := new(MockAI)
+	mockFactory := new(MockAIClientFactory)
+	mockConfig := new(MockConfigProvider)
+
+	// Set test implementations
+	ai.SetTestAIClientFactory(mockFactory)
+	ai.SetTestConfigProvider(mockConfig)
+	defer ai.ResetTestImplementations()
+
+	// Setup expectations
+	mockFactory.On("NewClient", "test-backend").Return(mockAI)
+	mockAI.On("Close").Return()
+
+	// Mock unmarshal error
+	mockConfig.On("UnmarshalKey", "ai", mock.Anything).Return(errors.New("unmarshal error"))
+
+	// Create handler and call Query
+	handler := &Handler{}
+	response, err := handler.Query(context.Background(), &schemav1.QueryRequest{
+		Backend: "test-backend",
+		Query:   "test query",
+	})
+
+	// Assertions
+	assert.NoError(t, err)
+	assert.NotNil(t, response)
+	assert.Equal(t, "", response.Response)
+	assert.Contains(t, response.Error.Message, "Failed to unmarshal AI configuration")
+
+	// Verify mocks
+	mockAI.AssertExpectations(t)
+	mockFactory.AssertExpectations(t)
+	mockConfig.AssertExpectations(t)
+}
+
+func TestQuery_ProviderNotFound(t *testing.T) {
+	// Setup mocks
+	mockAI := new(MockAI)
+	mockFactory := new(MockAIClientFactory)
+	mockConfig := new(MockConfigProvider)
+
+	// Set test implementations
+	ai.SetTestAIClientFactory(mockFactory)
+	ai.SetTestConfigProvider(mockConfig)
+	defer ai.ResetTestImplementations()
+
+	// Define test data
+	testBackend := "test-backend"
+
+	// Setup expectations
+	mockFactory.On("NewClient", testBackend).Return(mockAI)
+	mockAI.On("Close").Return()
+
+	// Set up configuration with no matching provider
+	mockConfig.On("UnmarshalKey", "ai", mock.Anything).Run(func(args mock.Arguments) {
+		config := args.Get(1).(*ai.AIConfiguration)
+		*config = ai.AIConfiguration{
+			Providers: []ai.AIProvider{
+				{
+					Name: "other-backend",
+				},
+			},
+		}
+	}).Return(nil)
+
+	// Create handler and call Query
+	handler := &Handler{}
+	response, err := handler.Query(context.Background(), &schemav1.QueryRequest{
+		Backend: testBackend,
+		Query:   "test query",
+	})
+
+	// Assertions
+	assert.NoError(t, err)
+	assert.NotNil(t, response)
+	assert.Equal(t, "", response.Response)
+	assert.Contains(t, response.Error.Message, "AI provider test-backend not found in configuration")
+
+	// Verify mocks
+	mockAI.AssertExpectations(t)
+	mockFactory.AssertExpectations(t)
+	mockConfig.AssertExpectations(t)
+}
+
+func TestQuery_ConfigureError(t *testing.T) {
+	// Setup mocks
+	mockAI := new(MockAI)
+	mockFactory := new(MockAIClientFactory)
+	mockConfig := new(MockConfigProvider)
+
+	// Set test implementations
+	ai.SetTestAIClientFactory(mockFactory)
+	ai.SetTestConfigProvider(mockConfig)
+	defer ai.ResetTestImplementations()
+
+	// Define test data
+	testBackend := "test-backend"
+
+	// Setup expectations
+	mockFactory.On("NewClient", testBackend).Return(mockAI)
+	mockAI.On("Close").Return()
+
+	// Set up configuration with a valid provider
+	mockConfig.On("UnmarshalKey", "ai", mock.Anything).Run(func(args mock.Arguments) {
+		config := args.Get(1).(*ai.AIConfiguration)
+		*config = ai.AIConfiguration{
+			Providers: []ai.AIProvider{
+				{
+					Name: testBackend,
+				},
+			},
+		}
+	}).Return(nil)
+
+	// Mock configure error
+	mockAI.On("Configure", mock.AnythingOfType("*ai.AIProvider")).Return(errors.New("configure error"))
+
+	// Create handler and call Query
+	handler := &Handler{}
+	response, err := handler.Query(context.Background(), &schemav1.QueryRequest{
+		Backend: testBackend,
+		Query:   "test query",
+	})
+
+	// Assertions
+	assert.NoError(t, err)
+	assert.NotNil(t, response)
+	assert.Equal(t, "", response.Response)
+	assert.Contains(t, response.Error.Message, "Failed to configure AI client")
+
+	// Verify mocks
+	mockAI.AssertExpectations(t)
+	mockFactory.AssertExpectations(t)
+	mockConfig.AssertExpectations(t)
+}
+
+func TestQuery_GetCompletionError(t *testing.T) {
+	// Setup mocks
+	mockAI := new(MockAI)
+	mockFactory := new(MockAIClientFactory)
+	mockConfig := new(MockConfigProvider)
+
+	// Set test implementations
+	ai.SetTestAIClientFactory(mockFactory)
+	ai.SetTestConfigProvider(mockConfig)
+	defer ai.ResetTestImplementations()
+
+	// Define test data
+	testBackend := "test-backend"
+	testQuery := "test query"
+
+	// Setup expectations
+	mockFactory.On("NewClient", testBackend).Return(mockAI)
+	mockAI.On("Close").Return()
+
+	// Set up configuration with a valid provider
+	mockConfig.On("UnmarshalKey", "ai", mock.Anything).Run(func(args mock.Arguments) {
+		config := args.Get(1).(*ai.AIConfiguration)
+		*config = ai.AIConfiguration{
+			Providers: []ai.AIProvider{
+				{
+					Name: testBackend,
+				},
+			},
+		}
+	}).Return(nil)
+
+	mockAI.On("Configure", mock.AnythingOfType("*ai.AIProvider")).Return(nil)
+	mockAI.On("GetCompletion", mock.Anything, testQuery).Return("", errors.New("completion error"))
+
+	// Create handler and call Query
+	handler := &Handler{}
+	response, err := handler.Query(context.Background(), &schemav1.QueryRequest{
+		Backend: testBackend,
+		Query:   testQuery,
+	})
+
+	// Assertions
+	assert.NoError(t, err)
+	assert.NotNil(t, response)
+	assert.Equal(t, "", response.Response)
+	assert.Equal(t, "completion error", response.Error.Message)
+
+	// Verify mocks
+	mockAI.AssertExpectations(t)
+	mockFactory.AssertExpectations(t)
+	mockConfig.AssertExpectations(t)
+}

pkg/util/util.go

@@ -14,6 +14,7 @@ limitations under the License.
 package util
 
 import (
+	"bytes"
 	"context"
 	"crypto/rand"
 	"crypto/sha256"
@@ -311,3 +312,33 @@ func LabelStrToSelector(labelStr string) labels.Selector {
 	}
 	return labels.SelectorFromSet(labels.Set(labelSelectorMap))
 }
+
+// CaptureOutput captures the output of a function that writes to stdout
+func CaptureOutput(f func()) string {
+	old := os.Stdout
+	r, w, err := os.Pipe()
+	if err != nil {
+		panic(fmt.Sprintf("failed to create pipe: %v", err))
+	}
+	os.Stdout = w
+	// Ensure os.Stdout is restored even if panic occurs
+	defer func() {
+		os.Stdout = old
+	}()
+
+	f()
+
+	if err := w.Close(); err != nil {
+		panic(fmt.Sprintf("failed to close writer: %v", err))
+	}
+	var buf bytes.Buffer
+	if _, err := buf.ReadFrom(r); err != nil {
+		panic(fmt.Sprintf("failed to read from pipe: %v", err))
+	}
+	return buf.String()
+}
+
+// Contains checks if substr is present in s
+func Contains(s, substr string) bool {
+	return bytes.Contains([]byte(s), []byte(substr))
+}