chore(main): release 0.3.19 (#708)

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

.github/workflows/build_container.yaml

@@ -33,7 +33,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
       - name: Extract branch name
         id: extract_branch
@@ -70,7 +70,7 @@ jobs:
       RELEASE_REGISTRY: "localhost:5000/k8sgpt"
     steps:
       - name: Check out code
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
       - name: Set up Docker Buildx
         id: buildx
@@ -115,7 +115,7 @@ jobs:
       contents: read # Needed for checking out the repository
     steps:
       - name: Check out code
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3

.github/workflows/golangci_lint.yaml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code into the Go module directory
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
       - name: golangci-lint
         uses: reviewdog/action-golangci-lint@24d4af2fc93f5b2b296229e8b0c0f658d25707af # v2

.github/workflows/release.yaml

@@ -23,7 +23,7 @@ jobs:
     # Release-please creates a PR that tracks all changes
     steps:
       - name: Checkout
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
       - uses: google-github-actions/release-please-action@ca6063f4ed81b55db15b8c42d1b6f7925866342d # v3
         id: release
@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
           fetch-depth: 0
       - name: Set up Go
@@ -74,7 +74,7 @@ jobs:
       IMAGE_NAME: k8sgpt
     steps:
       - name: Checkout
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
           submodules: recursive
 

.github/workflows/semantic_pr.yaml

@@ -16,7 +16,7 @@ jobs:
       pull-requests: read # Needed for reading prs
     steps:
       - name: Validate Pull Request
-        uses: amannn/action-semantic-pull-request@c3cd5d1ea3580753008872425915e343e351ab54 # v5.2.0
+        uses: amannn/action-semantic-pull-request@47b15d52c5c30e94a17ec87eb8dd51ff5221fed9 # v5.3.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.github/workflows/test.yaml

@@ -16,7 +16,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
       - name: Set up Go
         uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4

.gitignore

@@ -1,3 +1,4 @@
+.idea
 __debug*
 .DS_Store
 k8sgpt*

.release-please-manifest.json

@@ -1 +1 @@
-{".":"0.3.16"}
+{".":"0.3.19"}

CHANGELOG.md

@@ -1,5 +1,82 @@
 # Changelog
 
+## [0.3.19](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.3.18...v0.3.19) (2023-10-28)
+
+
+### Features
+
+* add amazonbedrock ([#718](https://github.com/k8sgpt-ai/k8sgpt/issues/718)) ([f1a7801](https://github.com/k8sgpt-ai/k8sgpt/commit/f1a7801e9e6a7e4a5310622951dfba3ba3acd047))
+* add Azure remote cache ([#690](https://github.com/k8sgpt-ai/k8sgpt/issues/690)) ([23ac52d](https://github.com/k8sgpt-ai/k8sgpt/commit/23ac52d5ffc0b2ebb7516b070fa740108cb4299a))
+
+
+### Bug Fixes
+
+* **deps:** update kubernetes packages to v0.28.3 ([#715](https://github.com/k8sgpt-ai/k8sgpt/issues/715)) ([7e73f8a](https://github.com/k8sgpt-ai/k8sgpt/commit/7e73f8afbce7ba0e9de432671b88c01fcfe28c3a))
+* **deps:** update module github.com/aws/aws-sdk-go to v1.45.25 ([#707](https://github.com/k8sgpt-ai/k8sgpt/issues/707)) ([3ebc867](https://github.com/k8sgpt-ai/k8sgpt/commit/3ebc86772dc8f8cb2d2246724f5fd05d1e931512))
+* **deps:** update module github.com/aws/aws-sdk-go to v1.45.26 ([#709](https://github.com/k8sgpt-ai/k8sgpt/issues/709)) ([c977528](https://github.com/k8sgpt-ai/k8sgpt/commit/c977528ec7839902570785e0803f6c6b83a0a69d))
+* **deps:** update module github.com/aws/aws-sdk-go to v1.46.5 ([#712](https://github.com/k8sgpt-ai/k8sgpt/issues/712)) ([63a2260](https://github.com/k8sgpt-ai/k8sgpt/commit/63a226065c8068f9bdc0aa791a325fa10bba3fcc))
+* **deps:** update module github.com/azure/azure-sdk-for-go/sdk/azidentity to v1.4.0 ([#722](https://github.com/k8sgpt-ai/k8sgpt/issues/722)) ([0e7219a](https://github.com/k8sgpt-ai/k8sgpt/commit/0e7219a36aaa718b7d86adf0a218a521bfac119b))
+* **deps:** update module github.com/sashabaranov/go-openai to v1.16.0 ([#703](https://github.com/k8sgpt-ai/k8sgpt/issues/703)) ([b5facd6](https://github.com/k8sgpt-ai/k8sgpt/commit/b5facd64a340a96d38faf045bbb889b928ef08a1))
+* **deps:** update module github.com/spf13/viper to v1.17.0 ([#700](https://github.com/k8sgpt-ai/k8sgpt/issues/700)) ([184d148](https://github.com/k8sgpt-ai/k8sgpt/commit/184d1481081f4297bec21fbd60d7eff1964944ae))
+* **deps:** update module google.golang.org/grpc to v1.58.3 ([#704](https://github.com/k8sgpt-ai/k8sgpt/issues/704)) ([1d7360c](https://github.com/k8sgpt-ai/k8sgpt/commit/1d7360c0ae4dab376872acc71dc68d59eb4d9752))
+
+
+### Other
+
+* **deps:** update actions/checkout digest to b4ffde6 ([#719](https://github.com/k8sgpt-ai/k8sgpt/issues/719)) ([a77bd41](https://github.com/k8sgpt-ai/k8sgpt/commit/a77bd410489e624d29ccc8fd45a004f6844b3620))
+* **deps:** update module oras.land/oras-go to v1.2.4 ([#665](https://github.com/k8sgpt-ai/k8sgpt/issues/665)) ([4af0ad0](https://github.com/k8sgpt-ai/k8sgpt/commit/4af0ad0303d9b0ffb43f1e87fb5abe279d9a8724))
+
+## [0.3.18](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.3.17...v0.3.18) (2023-10-12)
+
+
+### Features
+
+* adding temperature to server mode ([#705](https://github.com/k8sgpt-ai/k8sgpt/issues/705)) ([539ca3b](https://github.com/k8sgpt-ai/k8sgpt/commit/539ca3b78f96694c11f788255d3b83d2fb335df4))
+
+
+### Bug Fixes
+
+* **deps:** update module buf.build/gen/go/k8sgpt-ai/k8sgpt/grpc/go to v1.3.0-20231002095256-194bc640518b.1 ([#692](https://github.com/k8sgpt-ai/k8sgpt/issues/692)) ([4d4e33b](https://github.com/k8sgpt-ai/k8sgpt/commit/4d4e33bea9cc4f5f9bf5379db5b890d9ba86e0a9))
+* **deps:** update module buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go to v1.31.0-20231002095256-194bc640518b.1 ([#693](https://github.com/k8sgpt-ai/k8sgpt/issues/693)) ([20e6bd8](https://github.com/k8sgpt-ai/k8sgpt/commit/20e6bd816f636d4e4c8274d417870ec28fdd8a56))
+* **deps:** update module github.com/aws/aws-sdk-go to v1.45.20 ([#685](https://github.com/k8sgpt-ai/k8sgpt/issues/685)) ([2494946](https://github.com/k8sgpt-ai/k8sgpt/commit/2494946dc867a532460bd6aac74dfb7da5184c1c))
+* **deps:** update module github.com/aws/aws-sdk-go to v1.45.21 ([#696](https://github.com/k8sgpt-ai/k8sgpt/issues/696)) ([95c8cc0](https://github.com/k8sgpt-ai/k8sgpt/commit/95c8cc0afb0bb7b99784dcc5ba155f94b5a7dbdf))
+* **deps:** update module github.com/aws/aws-sdk-go to v1.45.22 ([#697](https://github.com/k8sgpt-ai/k8sgpt/issues/697)) ([923a8c1](https://github.com/k8sgpt-ai/k8sgpt/commit/923a8c13c06b152d04e8b00ab002e2036bf12740))
+* **deps:** update module github.com/aws/aws-sdk-go to v1.45.23 ([#699](https://github.com/k8sgpt-ai/k8sgpt/issues/699)) ([3f36a44](https://github.com/k8sgpt-ai/k8sgpt/commit/3f36a4441532e3d0ac1bd9d00fc738d4902b23a8))
+* **deps:** update module github.com/aws/aws-sdk-go to v1.45.24 ([#701](https://github.com/k8sgpt-ai/k8sgpt/issues/701)) ([6d3038b](https://github.com/k8sgpt-ai/k8sgpt/commit/6d3038b0e8336235dc6a2fdb69d2381790331596))
+* **deps:** update module github.com/prometheus/client_golang to v1.17.0 ([#687](https://github.com/k8sgpt-ai/k8sgpt/issues/687)) ([9597002](https://github.com/k8sgpt-ai/k8sgpt/commit/95970027237e0079ed1f66dc9655fa01b181f4d7))
+* **deps:** update module github.com/sashabaranov/go-openai to v1.15.4 ([#689](https://github.com/k8sgpt-ai/k8sgpt/issues/689)) ([f11d314](https://github.com/k8sgpt-ai/k8sgpt/commit/f11d3149b228b643155ed66c189cb0f8a4dd5a0f))
+* **deps:** update module helm.sh/helm/v3 to v3.13.0 ([#688](https://github.com/k8sgpt-ai/k8sgpt/issues/688)) ([87c8bce](https://github.com/k8sgpt-ai/k8sgpt/commit/87c8bcea4becd165aeb0ac98d79df7dab9c37ee3))
+* security warning around printing provider details in https://github.com/k8sgpt-ai/k8sgpt/security/code-scanning/1 ([#695](https://github.com/k8sgpt-ai/k8sgpt/issues/695)) ([85ce557](https://github.com/k8sgpt-ai/k8sgpt/commit/85ce55768199f90b1d2a5118ec2621ea5c7a7a67))
+
+
+### Other
+
+* **deps:** update amannn/action-semantic-pull-request action to v5.3.0 ([#683](https://github.com/k8sgpt-ai/k8sgpt/issues/683)) ([c5a8c46](https://github.com/k8sgpt-ai/k8sgpt/commit/c5a8c462989c097bf37ac48ea4f1a9010285042c))
+* fixing default model issue ([#702](https://github.com/k8sgpt-ai/k8sgpt/issues/702)) ([2a34ff2](https://github.com/k8sgpt-ai/k8sgpt/commit/2a34ff24d1f391270ae42531807cb1422880ad27))
+
+## [0.3.17](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.3.16...v0.3.17) (2023-09-28)
+
+
+### Features
+
+* added create namespace on deploy ([#673](https://github.com/k8sgpt-ai/k8sgpt/issues/673)) ([820e475](https://github.com/k8sgpt-ai/k8sgpt/commit/820e4755a54ecab3b5d800017bf6948dc9212825))
+* integration refactor ([#684](https://github.com/k8sgpt-ai/k8sgpt/issues/684)) ([69fe2db](https://github.com/k8sgpt-ai/k8sgpt/commit/69fe2db8acb795add27f04c1c8ee8d05819300ac))
+* update readme with new analyzers ([#671](https://github.com/k8sgpt-ai/k8sgpt/issues/671)) ([cad605a](https://github.com/k8sgpt-ai/k8sgpt/commit/cad605af462ce8b02ffc279ea847e41b7a64196f))
+
+
+### Bug Fixes
+
+* **deps:** update kubernetes packages to v0.28.2 ([#607](https://github.com/k8sgpt-ai/k8sgpt/issues/607)) ([ddeff9f](https://github.com/k8sgpt-ai/k8sgpt/commit/ddeff9fae4e80d1452893c59b89742633eb6b51b))
+* **deps:** update module github.com/aws/aws-sdk-go to v1.45.14 ([#672](https://github.com/k8sgpt-ai/k8sgpt/issues/672)) ([1da4b7c](https://github.com/k8sgpt-ai/k8sgpt/commit/1da4b7c8f0eee877d5b76a7dd9abda7631d922f3))
+* **deps:** update module github.com/aws/aws-sdk-go to v1.45.16 ([#682](https://github.com/k8sgpt-ai/k8sgpt/issues/682)) ([e1a42ff](https://github.com/k8sgpt-ai/k8sgpt/commit/e1a42ff3bcb3ddea71df2a5b5288eade024684dc))
+* **deps:** update module github.com/google/gnostic to v0.7.0 ([#679](https://github.com/k8sgpt-ai/k8sgpt/issues/679)) ([901ffb8](https://github.com/k8sgpt-ai/k8sgpt/commit/901ffb8df451ce41e6dc96da61deab987e51b6df))
+* **deps:** update module google.golang.org/grpc to v1.58.2 ([#680](https://github.com/k8sgpt-ai/k8sgpt/issues/680)) ([402e97d](https://github.com/k8sgpt-ai/k8sgpt/commit/402e97d05ea33879d997d98019b72da0f1074fc7))
+
+
+### Other
+
+* **deps:** update actions/checkout digest to 8ade135 ([#681](https://github.com/k8sgpt-ai/k8sgpt/issues/681)) ([aa9e6a3](https://github.com/k8sgpt-ai/k8sgpt/commit/aa9e6a3549877260423462c35ebbdfd95381be2c))
+
 ## [0.3.16](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.3.15...v0.3.16) (2023-09-19)
 
 

README.md

@@ -14,6 +14,8 @@
 
 It has SRE experience codified into its analyzers and helps to pull out the most relevant information to enrich it with AI.
 
+_Out of the box integration with OpenAI, Azure, Cohere, Amazon Bedrock and local models._
+
 <a href="https://www.producthunt.com/posts/k8sgpt?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-k8sgpt" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=389489&theme=light" alt="K8sGPT - K8sGPT&#0032;gives&#0032;Kubernetes&#0032;Superpowers&#0032;to&#0032;everyone | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
 
 <img src="images/demo4.gif" width=650px; />
@@ -34,7 +36,7 @@ brew install k8sgpt
   **32 bit:**
   <!---x-release-please-start-version-->
   ```
-  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.16/k8sgpt_386.rpm
+  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.19/k8sgpt_386.rpm
   sudo rpm -ivh k8sgpt_386.rpm
   ```
   <!---x-release-please-end-->
@@ -43,7 +45,7 @@ brew install k8sgpt
 
   <!---x-release-please-start-version-->
   ```
-  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.16/k8sgpt_amd64.rpm
+  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.19/k8sgpt_amd64.rpm
   sudo rpm -ivh -i k8sgpt_amd64.rpm
   ```
   <!---x-release-please-end-->
@@ -55,7 +57,7 @@ brew install k8sgpt
   **32 bit:**
   <!---x-release-please-start-version-->
   ```
-  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.16/k8sgpt_386.deb
+  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.19/k8sgpt_386.deb
   sudo dpkg -i k8sgpt_386.deb
   ```
   <!---x-release-please-end-->
@@ -63,7 +65,7 @@ brew install k8sgpt
 
   <!---x-release-please-start-version-->
   ```
-  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.16/k8sgpt_amd64.deb
+  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.19/k8sgpt_amd64.deb
   sudo dpkg -i k8sgpt_amd64.deb
   ```
   <!---x-release-please-end-->
@@ -76,14 +78,14 @@ brew install k8sgpt
   **32 bit:**
   <!---x-release-please-start-version-->
   ```
-  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.16/k8sgpt_386.apk
+  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.19/k8sgpt_386.apk
   apk add k8sgpt_386.apk
   ```
   <!---x-release-please-end-->
   **64 bit:**
   <!---x-release-please-start-version-->
   ```
-  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.16/k8sgpt_amd64.apk
+  curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.3.19/k8sgpt_amd64.apk
   apk add k8sgpt_amd64.apk
   ```
   <!---x-release-please-end-->x
@@ -149,6 +151,8 @@ you will be able to write your own analyzers.
 - [x] deploymentAnalyzer
 - [x] cronJobAnalyzer
 - [x] nodeAnalyzer
+- [x] mutatingWebhookAnalyzer
+- [x] validatingWebhookAnalyzer
 
 #### Optional
 
@@ -357,6 +361,45 @@ k8sgpt analyze --explain --backend cohere
 
 </details>
 
+<details>
+<summary>Amazon Bedrock provider</summary>
+
+
+<em>Prerequisites</em>
+Bedrock API access is needed. 
+
+<img src="images/bedrock.png" width="500px;" />
+
+As illustrated below, you will need to enable this in the [AWS Console](https://eu-central-1.console.aws.amazon.com/bedrock/home?region=eu-central-1#/modelaccess)
+
+In addition to this you will need to set the follow local environmental variables:
+
+
+```
+- AWS_ACCESS_KEY
+- AWS_SECRET_ACCESS_KEY
+- AWS_DEFAULT_REGION
+```
+
+
+```
+k8sgpt auth add --backend amazonbedrock --model anthropic.claude-v2
+```
+
+TODO: Currently access key will be requested in the CLI, you can enter anything into this. 
+
+#### Usage
+
+```
+k8sgpt analyze -e -b amazonbedrock
+
+0 argocd/argocd-application-controller(argocd-application-controller)
+- Error: StatefulSet uses the service argocd/argocd-application-controller which does not exist.
+
+ You're right, I don't have enough context to determine if a StatefulSet is correctly configured to use a non-existent service. A StatefulSet manages Pods with persistent storage, and the Pods are created from the same spec. The service name referenced in the StatefulSet configuration would need to match an existing Kubernetes service for the Pods to connect to. Without more details on the specific StatefulSet and environment, I can't confirm whether the configuration is valid or not.
+```
+</details>
+
 <details>
 <summary>Setting a new default AI provider</summary>
 
@@ -374,6 +417,8 @@ Active:
 Unused:
 > localai
 > noopai
+> amazonbedrock
+> cohere
 
 ```
 
@@ -483,18 +528,22 @@ Config file locations:
 
 <details>
 There may be scenarios where caching remotely is preferred.
-In these scenarios K8sGPT supports AWS S3 Integration.
+In these scenarios K8sGPT supports AWS S3 or Azure Blob storage Integration.
 
-<summary> Remote caching </summary>
-
- _As a prerequisite `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` are required as environmental variables._
+<summary> Remote caching </summary>  
+<em>Note: You can only configure and use only one remote cache at a time</em>
 
 _Adding a remote cache_
 
-Note: this will create the bucket if it does not exist
-```
-k8sgpt cache add --region <aws region> --bucket <name>
-```
+ * AWS S3
+   *  _As a prerequisite `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` are required as environmental variables._
+   * Configuration, ``` k8sgpt cache add --region <aws region> --bucket <name> ```
+     * K8sGPT will create the bucket if it does not exist
+ * Azure Storage
+   * We support a number of [techniques](https://learn.microsoft.com/en-us/azure/developer/go/azure-sdk-authentication?tabs=bash#2-authenticate-with-azure) to authenticate against Azure
+   * Configuration, ``` k8sgpt cache add --storageacc <storage account name> --container <container name> ```
+     * K8sGPT assumes that the storage account already exist and it will create the container if it does not exist
+     * It's **users'** responsibility have to grant specific permissions to their identity in order to be able to upload blob files and create SA containers (e.g Storage Blob Data Contributor)       
 
 _Listing cache items_
 ```
@@ -502,9 +551,9 @@ k8sgpt cache list
 ```
 
 _Removing the remote cache_
-Note: this will not delete the bucket
+Note: this will not delete the upstream S3 bucket or Azure storage container
 ```
-k8sgpt cache remove --bucket <name>
+k8sgpt cache remove
 ```
 </details>
 

cmd/auth/add.go

@@ -26,6 +26,11 @@ import (
 	"golang.org/x/term"
 )
 
+const (
+	defaultBackend = "openai"
+	defaultModel   = "gpt-3.5-turbo"
+)
+
 var addCmd = &cobra.Command{
 	Use:   "add",
 	Short: "Add new provider",
@@ -36,6 +41,7 @@ var addCmd = &cobra.Command{
 			_ = cmd.MarkFlagRequired("engine")
 			_ = cmd.MarkFlagRequired("baseurl")
 		}
+
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 
@@ -66,8 +72,8 @@ var addCmd = &cobra.Command{
 
 		// check if backend is not empty and a valid value
 		if backend == "" {
-			color.Yellow("Warning: backend input is empty, will use the default value: openai")
-			backend = "openai"
+			color.Yellow(fmt.Sprintf("Warning: backend input is empty, will use the default value: %s", defaultBackend))
+			backend = defaultBackend
 		} else {
 			if !validBackend(ai.Backends, backend) {
 				color.Red("Error: Backend AI accepted values are '%v'", strings.Join(ai.Backends, ", "))
@@ -77,7 +83,8 @@ var addCmd = &cobra.Command{
 
 		// check if model is not empty
 		if model == "" {
-			color.Yellow("Warning: model input is empty, will use the default value: gpt-3.5-turbo")
+			model = defaultModel
+			color.Yellow(fmt.Sprintf("Warning: model input is empty, will use the default value: %s", defaultModel))
 		}
 		if temperature > 1.0 || temperature < 0.0 {
 			color.Red("Error: temperature ranges from 0 to 1.")
@@ -97,12 +104,13 @@ var addCmd = &cobra.Command{
 
 		// create new provider object
 		newProvider := ai.AIProvider{
-			Name:        backend,
-			Model:       model,
-			Password:    password,
-			BaseURL:     baseURL,
-			Engine:      engine,
-			Temperature: temperature,
+			Name:           backend,
+			Model:          model,
+			Password:       password,
+			BaseURL:        baseURL,
+			Engine:         engine,
+			Temperature:    temperature,
+			ProviderRegion: providerRegion,
 		}
 
 		if providerIndex == -1 {
@@ -123,9 +131,9 @@ var addCmd = &cobra.Command{
 
 func init() {
 	// add flag for backend
-	addCmd.Flags().StringVarP(&backend, "backend", "b", "openai", "Backend AI provider")
+	addCmd.Flags().StringVarP(&backend, "backend", "b", defaultBackend, "Backend AI provider")
 	// add flag for model
-	addCmd.Flags().StringVarP(&model, "model", "m", "gpt-3.5-turbo", "Backend AI model")
+	addCmd.Flags().StringVarP(&model, "model", "m", defaultModel, "Backend AI model")
 	// add flag for password
 	addCmd.Flags().StringVarP(&password, "password", "p", "", "Backend AI password")
 	// add flag for url
@@ -134,4 +142,6 @@ func init() {
 	addCmd.Flags().Float32VarP(&temperature, "temperature", "t", 0.7, "The sampling temperature, value ranges between 0 ( output be more deterministic) and 1 (more random)")
 	// add flag for azure open ai engine/deployment name
 	addCmd.Flags().StringVarP(&engine, "engine", "e", "", "Azure AI deployment name")
+	//add flag for amazonbedrock region name
+	addCmd.Flags().StringVarP(&providerRegion, "providerRegion", "r", "", "Provider Region name")
 }

cmd/auth/auth.go

@@ -19,12 +19,13 @@ import (
 )
 
 var (
-	backend     string
-	password    string
-	baseURL     string
-	model       string
-	engine      string
-	temperature float32
+	backend        string
+	password       string
+	baseURL        string
+	model          string
+	engine         string
+	temperature    float32
+	providerRegion string
 )
 
 var configAI ai.AIConfiguration

cmd/auth/list.go

@@ -16,8 +16,6 @@ package auth
 import (
 	"fmt"
 	"os"
-	"strings"
-	"unicode/utf8"
 
 	"github.com/fatih/color"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/ai"
@@ -97,20 +95,6 @@ func printDetails(provider ai.AIProvider, userInput string) {
 	if provider.Model != "" {
 		fmt.Printf("   - Model: %s\n", provider.Model)
 	}
-	switch userInput {
-	case "y":
-		if provider.Password != "" {
-			fmt.Printf("   - Password: %s\n", provider.Password)
-		}
-	case "n":
-		if provider.Password != "" {
-			nc := utf8.RuneCountInString(provider.Password)
-			newStr := strings.Repeat("*", nc)
-			fmt.Printf("   - Password: %s\n", newStr)
-		}
-	default:
-		break
-	}
 	if provider.Engine != "" {
 		fmt.Printf("   - Engine: %s\n", provider.Engine)
 	}

cmd/cache/add.go

@@ -24,7 +24,10 @@ import (
 )
 
 var (
-	region string
+	region         string
+	bucketName     string
+	storageAccount string
+	containerName  string
 )
 
 // addCmd represents the add command
@@ -33,10 +36,12 @@ 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
 	- S3`,
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println(color.YellowString("Adding remote S3 based cache"))
-		err := cache.AddRemoteCache(bucketname, region)
+		fmt.Println(color.YellowString("Adding remote based cache"))
+		remoteCache := cache.NewCacheProvider(bucketname, region, storageAccount, containerName)
+		err := cache.AddRemoteCache(remoteCache)
 		if err != nil {
 			color.Red("Error: %v", err)
 			os.Exit(1)
@@ -46,9 +51,15 @@ var addCmd = &cobra.Command{
 
 func init() {
 	CacheCmd.AddCommand(addCmd)
-	addCmd.Flags().StringVarP(&region, "region", "r", "", "The region to use for the cache")
-	addCmd.Flags().StringVarP(&bucketname, "bucket", "b", "", "The name of the bucket to use for the cache")
-	addCmd.MarkFlagRequired("bucket")
-	addCmd.MarkFlagRequired("region")
-
+	addCmd.Flags().StringVarP(&region, "region", "r", "", "The region to use for the AWS S3 cache")
+	addCmd.Flags().StringVarP(&bucketname, "bucket", "b", "", "The name of the AWS S3 bucket to use for the cache")
+	addCmd.MarkFlagsRequiredTogether("region", "bucket")
+	addCmd.Flags().StringVarP(&storageAccount, "storageacc", "s", "", "The Azure storage account name of the container")
+	addCmd.Flags().StringVarP(&containerName, "container", "c", "", "The Azure container name to use for the cache")
+	addCmd.MarkFlagsRequiredTogether("storageacc", "container")
+	// Tedious check to ensure we don't include arguments from different providers
+	addCmd.MarkFlagsMutuallyExclusive("region", "storageacc")
+	addCmd.MarkFlagsMutuallyExclusive("region", "container")
+	addCmd.MarkFlagsMutuallyExclusive("bucket", "storageacc")
+	addCmd.MarkFlagsMutuallyExclusive("bucket", "container")
 }

cmd/cache/remove.go

@@ -29,7 +29,7 @@ var removeCmd = &cobra.Command{
 	Long:  `This command allows you to remove the remote cache and use the default filecache.`,
 	Run: func(cmd *cobra.Command, args []string) {
 
-		err := cache.RemoveRemoteCache(bucketname)
+		err := cache.RemoveRemoteCache()
 		if err != nil {
 			color.Red("Error: %v", err)
 			os.Exit(1)

cmd/serve/serve.go

@@ -15,6 +15,7 @@ package serve
 
 import (
 	"os"
+	"strconv"
 
 	"github.com/fatih/color"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/ai"
@@ -24,6 +25,10 @@ import (
 	"go.uber.org/zap"
 )
 
+const (
+	defaultTemperature float32 = 0.7
+)
+
 var (
 	port        string
 	metricsPort string
@@ -44,6 +49,23 @@ var ServeCmd = &cobra.Command{
 		}
 		var aiProvider *ai.AIProvider
 		if len(configAI.Providers) == 0 {
+			// we validate and set temperature for our backend
+			temperature := func() float32 {
+				env := os.Getenv("K8SGPT_TEMPERATURE")
+				if env == "" {
+					return defaultTemperature
+				}
+				temperature, err := strconv.ParseFloat(env, 32)
+				if err != nil {
+					color.Red("Unable to convert Temperature value: %v", err)
+					os.Exit(1)
+				}
+				if temperature > 1.0 || temperature < 0.0 {
+					color.Red("Error: temperature ranges from 0 to 1.")
+					os.Exit(1)
+				}
+				return float32(temperature)
+			}
 			// Check for env injection
 			backend = os.Getenv("K8SGPT_BACKEND")
 			password := os.Getenv("K8SGPT_PASSWORD")
@@ -55,11 +77,12 @@ var ServeCmd = &cobra.Command{
 			envIsSet := backend != "" || password != "" || model != ""
 			if envIsSet {
 				aiProvider = &ai.AIProvider{
-					Name:     backend,
-					Password: password,
-					Model:    model,
-					BaseURL:  baseURL,
-					Engine:   engine,
+					Name:        backend,
+					Password:    password,
+					Model:       model,
+					BaseURL:     baseURL,
+					Engine:      engine,
+					Temperature: temperature(),
 				}
 
 				configAI.Providers = append(configAI.Providers, *aiProvider)

go.mod

@@ -7,41 +7,54 @@ require (
 	github.com/fatih/color v1.15.0
 	github.com/magiconair/properties v1.8.7
 	github.com/mittwald/go-helm-client v0.12.3
-	github.com/sashabaranov/go-openai v1.15.3
+	github.com/sashabaranov/go-openai v1.16.0
 	github.com/schollz/progressbar/v3 v3.13.1
 	github.com/spf13/cobra v1.7.0
-	github.com/spf13/viper v1.16.0
+	github.com/spf13/viper v1.17.0
 	github.com/stretchr/testify v1.8.4
-	golang.org/x/term v0.12.0
-	helm.sh/helm/v3 v3.12.3
-	k8s.io/api v0.27.4
-	k8s.io/apimachinery v0.27.4
-	k8s.io/client-go v0.27.4
-	k8s.io/kubectl v0.27.4
+	golang.org/x/term v0.13.0
+	helm.sh/helm/v3 v3.13.0
+	k8s.io/api v0.28.3
+	k8s.io/apimachinery v0.28.3
+	k8s.io/client-go v0.28.3
+	k8s.io/kubectl v0.28.3
 
 )
 
 require github.com/adrg/xdg v0.4.0
 
 require (
-	buf.build/gen/go/k8sgpt-ai/k8sgpt/grpc/go v1.3.0-20230919114723-34e017906403.1
-	buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go v1.31.0-20230919114723-34e017906403.1
-	github.com/aws/aws-sdk-go v1.45.12
+	buf.build/gen/go/k8sgpt-ai/k8sgpt/grpc/go v1.3.0-20231002095256-194bc640518b.1
+	buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go v1.31.0-20231002095256-194bc640518b.1
+	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0
+	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.1.0
+	github.com/aws/aws-sdk-go v1.46.5
 	github.com/cohere-ai/cohere-go v0.2.0
 )
 
 require (
+	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.8.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
+	github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1 // indirect
+	github.com/Microsoft/hcsshim v0.11.0 // indirect
 	github.com/anchore/go-struct-converter v0.0.0-20221118182256-c68fdcfa2092 // indirect
 	github.com/cohere-ai/tokenizer v1.1.1 // indirect
 	github.com/dlclark/regexp2 v1.4.0 // indirect
+	github.com/golang-jwt/jwt/v5 v5.0.0 // indirect
+	github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
+	github.com/kylelemons/godebug v1.1.0 // indirect
+	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
+	github.com/sagikazarmark/locafero v0.3.0 // indirect
+	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
+	github.com/sourcegraph/conc v0.3.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
 )
 
 require (
-	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 // indirect
+	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
-	github.com/BurntSushi/toml v1.3.0 // indirect
+	github.com/BurntSushi/toml v1.3.2 // indirect
 	github.com/MakeNowJust/heredoc v1.0.0 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver/v3 v3.2.1 // indirect
@@ -57,12 +70,12 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/chai2010/gettext-go v1.0.2 // indirect
-	github.com/containerd/containerd v1.7.0 // indirect
+	github.com/containerd/containerd v1.7.6 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/docker/cli v23.0.5+incompatible // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/docker/cli v24.0.6+incompatible // indirect
 	github.com/docker/distribution v2.8.2+incompatible // indirect
-	github.com/docker/docker v23.0.5+incompatible // indirect
+	github.com/docker/docker v24.0.6+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.7.0 // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect
@@ -82,12 +95,12 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/btree v1.1.2 // indirect
-	github.com/google/gnostic v0.6.9
+	github.com/google/gnostic v0.7.0
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/go-containerregistry v0.15.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.3.0 // indirect
+	github.com/google/uuid v1.3.1 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/gosuri/uitable v0.0.4 // indirect
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
@@ -100,7 +113,7 @@ require (
 	github.com/jmoiron/sqlx v1.3.5 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.16.5 // indirect
+	github.com/klauspost/compress v1.17.0 // indirect
 	github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
 	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
 	github.com/lib/pq v1.10.9 // indirect
@@ -118,75 +131,74 @@ require (
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/moby/locker v1.0.1 // indirect
 	github.com/moby/spdystream v0.2.0 // indirect
-	github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // 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
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0-rc3 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
+	github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
+	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_golang v1.16.0
-	github.com/prometheus/client_model v0.4.0 // indirect
-	github.com/prometheus/common v0.42.0 // indirect
-	github.com/prometheus/procfs v0.10.1 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/prometheus/client_golang v1.17.0
+	github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
+	github.com/prometheus/common v0.44.0 // indirect
+	github.com/prometheus/procfs v0.11.1 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/rubenv/sql-migrate v1.3.1 // indirect
+	github.com/rubenv/sql-migrate v1.5.2 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/samber/lo v1.38.1 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spdx/tools-golang v0.5.0 // indirect
-	github.com/spf13/afero v1.9.5 // indirect
+	github.com/spf13/afero v1.10.0 // indirect
 	github.com/spf13/cast v1.5.1 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/subosito/gotenv v1.4.2 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
-	github.com/xlab/treeprint v1.1.0 // indirect
+	github.com/xlab/treeprint v1.2.0 // indirect
 	go.opentelemetry.io/otel v1.14.0 // indirect
 	go.opentelemetry.io/otel/trace v1.14.0 // indirect
-	go.starlark.net v0.0.0-20221020143700-22309ac47eac // indirect
+	go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.26.0
-	golang.org/x/crypto v0.11.0 // indirect
-	golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
-	golang.org/x/net v0.12.0 // indirect
-	golang.org/x/oauth2 v0.10.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
+	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/oauth2 v0.12.0 // indirect
 	golang.org/x/sync v0.3.0 // indirect
-	golang.org/x/sys v0.12.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/grpc v1.58.1
+	google.golang.org/grpc v1.58.3
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.27.3 // indirect
-	k8s.io/apiserver v0.27.3 // indirect
-	k8s.io/cli-runtime v0.27.4 // indirect
-	k8s.io/component-base v0.27.4 // indirect
+	k8s.io/apiextensions-apiserver v0.28.2 // indirect
+	k8s.io/apiserver v0.28.2 // indirect
+	k8s.io/cli-runtime v0.28.3 // indirect
+	k8s.io/component-base v0.28.3 // indirect
 	k8s.io/klog/v2 v2.100.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
-	k8s.io/utils v0.0.0-20230313181309-38a27ef9d749 // indirect
+	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
+	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
 	oras.land/oras-go v1.2.3 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/kustomize/api v0.13.2 // indirect
-	sigs.k8s.io/kustomize/kyaml v0.14.1 // indirect
+	sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
+	sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )
 
 // v1.2.0 is taken from github.com/open-policy-agent/opa v0.42.0
 // v1.2.0 incompatible with github.com/docker/docker v23.0.0-rc.1+incompatible
-replace oras.land/oras-go => oras.land/oras-go v1.2.3
+replace oras.land/oras-go => oras.land/oras-go v1.2.4

pkg/ai/amazonbedrock.go

@@ -0,0 +1,196 @@
+package ai
+
+import (
+	"context"
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"strings"
+
+	"github.com/fatih/color"
+
+	"github.com/k8sgpt-ai/k8sgpt/pkg/cache"
+	"github.com/k8sgpt-ai/k8sgpt/pkg/util"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go/service/bedrockruntime"
+)
+
+// AmazonBedRockClient represents the client for interacting with the Amazon Bedrock service.
+type AmazonBedRockClient struct {
+	client      *bedrockruntime.BedrockRuntime
+	language    string
+	model       string
+	temperature float32
+}
+
+// InvokeModelResponseBody represents the response body structure from the model invocation.
+type InvokeModelResponseBody struct {
+	Completion  string `json:"completion"`
+	Stop_reason string `json:"stop_reason"`
+}
+
+// Amazon BedRock support region list US East (N. Virginia),US West (Oregon),Asia Pacific (Singapore),Asia Pacific (Tokyo),Europe (Frankfurt)
+// https://docs.aws.amazon.com/bedrock/latest/userguide/what-is-bedrock.html#bedrock-regions
+const BEDROCK_DEFAULT_REGION = "us-east-1" // default use us-east-1 region
+
+const (
+	US_East_1      = "us-east-1"
+	US_West_2      = "us-west-2"
+	AP_Southeast_1 = "ap-southeast-1"
+	AP_Northeast_1 = "ap-northeast-1"
+	EU_Central_1   = "eu-central-1"
+)
+
+var BEDROCKER_SUPPORTED_REGION = []string{
+	US_East_1,
+	US_West_2,
+	AP_Southeast_1,
+	AP_Northeast_1,
+	EU_Central_1,
+}
+
+const (
+	ModelAnthropicClaudeV2        = "anthropic.claude-v2"
+	ModelAnthropicClaudeV1        = "anthropic.claude-v1"
+	ModelAnthropicClaudeInstantV1 = "anthropic.claude-instant-v1"
+)
+
+var BEDROCK_MODELS = []string{
+	ModelAnthropicClaudeV2,
+	ModelAnthropicClaudeV1,
+	ModelAnthropicClaudeInstantV1,
+}
+
+// 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
+		}
+	}
+
+	// Return the default model if the provided model is not in the list
+	return BEDROCK_MODELS[0]
+}
+
+// GetModelOrDefault check config region
+func GetRegionOrDefault(region string) string {
+
+	// Check if the provided model is in the list
+	for _, m := range BEDROCKER_SUPPORTED_REGION {
+		if m == region {
+			return region // Return the provided model
+		}
+	}
+
+	// Return the default model if the provided model is not in the list
+	return BEDROCK_DEFAULT_REGION
+}
+
+// Configure configures the AmazonBedRockClient with the provided configuration and language.
+func (a *AmazonBedRockClient) Configure(config IAIConfig, language string) error {
+
+	// Create a new AWS session
+	providerRegion := GetRegionOrDefault(config.GetProviderRegion())
+
+	sess, err := session.NewSession(&aws.Config{
+		Region: aws.String(providerRegion),
+	})
+
+	if err != nil {
+		return err
+	}
+
+	// Create a new BedrockRuntime client
+	a.client = bedrockruntime.New(sess)
+	a.language = language
+	a.model = GetModelOrDefault(config.GetModel())
+	a.temperature = config.GetTemperature()
+
+	return nil
+}
+
+// GetCompletion sends a request to the model for generating completion based on the provided prompt.
+func (a *AmazonBedRockClient) GetCompletion(ctx context.Context, prompt string, promptTmpl string) (string, error) {
+
+	// Prepare the input data for the model invocation
+	request := map[string]interface{}{
+		"prompt":               fmt.Sprintf("\n\nHuman: %s  \n\nAssistant:", prompt),
+		"max_tokens_to_sample": 1024,
+		"temperature":          a.temperature,
+		"top_p":                0.9,
+	}
+
+	body, err := json.Marshal(request)
+	if err != nil {
+		return "", err
+	}
+
+	// Build the parameters for the model invocation
+	params := &bedrockruntime.InvokeModelInput{
+		Body:        body,
+		ModelId:     aws.String(a.model),
+		ContentType: aws.String("application/json"),
+		Accept:      aws.String("application/json"),
+	}
+	// Invoke the model
+	resp, err := a.client.InvokeModelWithContext(ctx, params)
+
+	if err != nil {
+		return "", err
+	}
+	// Parse the response body
+	output := &InvokeModelResponseBody{}
+	err = json.Unmarshal(resp.Body, output)
+	if err != nil {
+		return "", err
+	}
+	return output.Completion, nil
+}
+
+// Parse generates a completion for the provided prompt using the Amazon Bedrock model.
+func (a *AmazonBedRockClient) Parse(ctx context.Context, prompt []string, cache cache.ICache, promptTmpl string) (string, error) {
+	inputKey := strings.Join(prompt, " ")
+	// Check for cached data
+	cacheKey := util.GetCacheKey(a.GetName(), a.language, inputKey)
+
+	if !cache.IsCacheDisabled() && cache.Exists(cacheKey) {
+		response, err := cache.Load(cacheKey)
+		if err != nil {
+			return "", err
+		}
+
+		if response != "" {
+			output, err := base64.StdEncoding.DecodeString(response)
+			if err != nil {
+				color.Red("error decoding cached data: %v", err)
+				return "", nil
+			}
+			return string(output), nil
+		}
+	}
+
+	response, err := a.GetCompletion(ctx, inputKey, promptTmpl)
+
+	if err != nil {
+		return "", err
+	}
+
+	err = cache.Store(cacheKey, base64.StdEncoding.EncodeToString([]byte(response)))
+
+	if err != nil {
+		color.Red("error storing value to cache: %v", err)
+		return "", nil
+	}
+
+	return response, nil
+}
+
+// GetName returns the name of the AmazonBedRockClient.
+func (a *AmazonBedRockClient) GetName() string {
+	return "amazonbedrock"
+}

pkg/ai/iai.go

@@ -26,6 +26,7 @@ var (
 		&LocalAIClient{},
 		&NoOpAIClient{},
 		&CohereClient{},
+		&AmazonBedRockClient{},
 	}
 	Backends = []string{
 		"openai",
@@ -33,6 +34,7 @@ var (
 		"azureopenai",
 		"noopai",
 		"cohere",
+		"amazonbedrock",
 	}
 )
 
@@ -49,6 +51,7 @@ type IAIConfig interface {
 	GetBaseURL() string
 	GetEngine() string
 	GetTemperature() float32
+	GetProviderRegion() string
 }
 
 func NewClient(provider string) IAI {
@@ -67,12 +70,13 @@ type AIConfiguration struct {
 }
 
 type AIProvider struct {
-	Name        string  `mapstructure:"name"`
-	Model       string  `mapstructure:"model"`
-	Password    string  `mapstructure:"password" yaml:"password,omitempty"`
-	BaseURL     string  `mapstructure:"baseurl" yaml:"baseurl,omitempty"`
-	Engine      string  `mapstructure:"engine" yaml:"engine,omitempty"`
-	Temperature float32 `mapstructure:"temperature" yaml:"temperature,omitempty"`
+	Name           string  `mapstructure:"name"`
+	Model          string  `mapstructure:"model"`
+	Password       string  `mapstructure:"password" yaml:"password,omitempty"`
+	BaseURL        string  `mapstructure:"baseurl" yaml:"baseurl,omitempty"`
+	Engine         string  `mapstructure:"engine" yaml:"engine,omitempty"`
+	Temperature    float32 `mapstructure:"temperature" yaml:"temperature,omitempty"`
+	ProviderRegion string  `mapstructure:"providerregion" yaml:"providerregion,omitempty"`
 }
 
 func (p *AIProvider) GetBaseURL() string {
@@ -94,6 +98,10 @@ func (p *AIProvider) GetTemperature() float32 {
 	return p.Temperature
 }
 
+func (p *AIProvider) GetProviderRegion() string {
+	return p.ProviderRegion
+}
+
 func NeedPassword(backend string) bool {
 	return backend != "localai"
 }

pkg/cache/azuresa_based.go

@@ -0,0 +1,138 @@
+package cache
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"log"
+	"strings"
+
+	"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
+	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
+	"github.com/spf13/viper"
+)
+
+// Generate ICache implementation
+type AzureCache struct {
+	ctx           context.Context
+	noCache       bool
+	containerName string
+	session       *azblob.Client
+}
+
+func (s *AzureCache) Store(key string, data string) error {
+	// Store the object as a new file in the Azure blob storage with data as the content
+	cacheData := []byte(data)
+	_, err := s.session.UploadBuffer(s.ctx, s.containerName, key, cacheData, &azblob.UploadBufferOptions{})
+	return err
+}
+
+func (s *AzureCache) Load(key string) (string, error) {
+	// Load blob file contents
+	load, err := s.session.DownloadStream(s.ctx, s.containerName, key, nil)
+	if err != nil {
+		return "", err
+	}
+	data := bytes.Buffer{}
+	retryReader := load.NewRetryReader(s.ctx, &azblob.RetryReaderOptions{})
+	_, err = data.ReadFrom(retryReader)
+	if err != nil {
+		return "", err
+	}
+	if err := retryReader.Close(); err != nil {
+		return "", err
+	}
+	return data.String(), nil
+}
+
+func (s *AzureCache) List() ([]string, error) {
+	// List the files in the blob containerName
+	files := []string{}
+
+	pager := s.session.NewListBlobsFlatPager(s.containerName, &azblob.ListBlobsFlatOptions{
+		Include: azblob.ListBlobsInclude{Snapshots: false, Versions: false},
+	})
+
+	for pager.More() {
+		resp, err := pager.NextPage(s.ctx)
+		if err != nil {
+			return nil, err
+		}
+
+		for _, blob := range resp.Segment.BlobItems {
+			files = append(files, *blob.Name)
+		}
+	}
+
+	return files, nil
+}
+
+func (s *AzureCache) Exists(key string) bool {
+	// Check if the object exists in the blob storage
+	pager := s.session.NewListBlobsFlatPager(s.containerName, &azblob.ListBlobsFlatOptions{
+		Include: azblob.ListBlobsInclude{Snapshots: false, Versions: false},
+	})
+
+	for pager.More() {
+		resp, err := pager.NextPage(s.ctx)
+		if err != nil {
+			return false
+		}
+
+		for _, blob := range resp.Segment.BlobItems {
+			if *blob.Name == key {
+				return true
+			}
+		}
+	}
+
+	return false
+}
+
+func (s *AzureCache) IsCacheDisabled() bool {
+	return s.noCache
+}
+
+func NewAzureCache(nocache bool) ICache {
+	ctx := context.Background()
+	var cache CacheProvider
+	err := viper.UnmarshalKey("cache", &cache)
+	if err != nil {
+		panic(err)
+	}
+	if cache.ContainerName == "" {
+		log.Fatal("Azure Container name not configured")
+	}
+	if cache.StorageAccount == "" {
+		log.Fatal("Azure Storage account not configured")
+	}
+
+	// We assume that Storage account is already in place
+	blobUrl := fmt.Sprintf("https://%s.blob.core.windows.net/", cache.StorageAccount)
+	credential, err := azidentity.NewDefaultAzureCredential(nil)
+	if err != nil {
+		log.Fatal(err)
+	}
+	client, err := azblob.NewClient(blobUrl, credential, nil)
+	if err != nil {
+		log.Fatal(err)
+	}
+	// Try to create the blob container
+	_, err = client.CreateContainer(ctx, cache.ContainerName, nil)
+	if err != nil {
+		// TODO: Maybe there is a better way to check this?
+		// docs: https://pkg.go.dev/github.com/Azure/azure-storage-blob-go/azblob
+		if strings.Contains(err.Error(), "ContainerAlreadyExists") {
+			// do nothing
+		} else {
+			log.Fatal(err)
+		}
+	}
+
+	return &AzureCache{
+		ctx:           ctx,
+		noCache:       nocache,
+		containerName: cache.ContainerName,
+		session:       client,
+	}
+}

pkg/cache/cache.go

@@ -1,11 +1,20 @@
 package cache
 
 import (
-	"errors"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 
 	"github.com/spf13/viper"
 )
 
+type CacheType string
+
+const (
+	Azure     CacheType = "azure"
+	S3        CacheType = "s3"
+	FileBased CacheType = "file"
+)
+
 type ICache interface {
 	Store(key string, data string) error
 	Load(key string) (string, error)
@@ -14,43 +23,68 @@ type ICache interface {
 	IsCacheDisabled() bool
 }
 
-func New(noCache bool, remoteCache bool) ICache {
-	if remoteCache {
+func New(noCache bool, remoteCache CacheType) ICache {
+	switch remoteCache {
+	case S3:
 		return NewS3Cache(noCache)
-	}
-	return &FileBasedCache{
-		noCache: noCache,
+	case Azure:
+		return NewAzureCache(noCache)
+	case FileBased:
+		return &FileBasedCache{
+			noCache: noCache,
+		}
+	default:
+		return &FileBasedCache{
+			noCache: noCache,
+		}
 	}
 }
 
 // CacheProvider is the configuration for the cache provider when using a remote cache
 type CacheProvider struct {
-	BucketName string `mapstructure:"bucketname"`
-	Region     string `mapstructure:"region"`
+	BucketName     string `mapstructure:"bucketname" yaml:"bucketname,omitempty"`
+	Region         string `mapstructure:"region" yaml:"region,omitempty"`
+	StorageAccount string `mapstructure:"storageaccount" yaml:"storageaccount,omitempty"`
+	ContainerName  string `mapstructure:"container" yaml:"container,omitempty"`
 }
 
-func RemoteCacheEnabled() (bool, error) {
+// NewCacheProvider constructs a new cache struct
+func NewCacheProvider(bucketname, region, storageaccount, containername string) CacheProvider {
+	return CacheProvider{
+		BucketName:     bucketname,
+		Region:         region,
+		StorageAccount: storageaccount,
+		ContainerName:  containername,
+	}
+}
+
+// If we have set a remote cache, return the remote cache type
+func RemoteCacheEnabled() (CacheType, error) {
 	// load remote cache if it is configured
 	var cache CacheProvider
 	err := viper.UnmarshalKey("cache", &cache)
 	if err != nil {
-		return false, err
+		return "", err
 	}
 	if cache.BucketName != "" && cache.Region != "" {
-		return true, nil
+		return S3, nil
+	} else if cache.StorageAccount != "" && cache.ContainerName != "" {
+		return Azure, nil
 	}
-	return false, nil
+	return FileBased, nil
 }
 
-func AddRemoteCache(bucketName string, region string) error {
+func AddRemoteCache(cache CacheProvider) error {
 	var cacheInfo CacheProvider
 	err := viper.UnmarshalKey("cache", &cacheInfo)
 	if err != nil {
 		return err
 	}
 
-	cacheInfo.BucketName = bucketName
-	cacheInfo.Region = region
+	cacheInfo.BucketName = cache.BucketName
+	cacheInfo.Region = cache.Region
+	cacheInfo.StorageAccount = cache.StorageAccount
+	cacheInfo.ContainerName = cache.ContainerName
 	viper.Set("cache", cacheInfo)
 	err = viper.WriteConfig()
 	if err != nil {
@@ -59,21 +93,21 @@ func AddRemoteCache(bucketName string, region string) error {
 	return nil
 }
 
-func RemoveRemoteCache(bucketName string) error {
+func RemoveRemoteCache() error {
 	var cacheInfo CacheProvider
 	err := viper.UnmarshalKey("cache", &cacheInfo)
 	if err != nil {
-		return err
+		return status.Error(codes.Internal, "cache unmarshal")
 	}
-	if cacheInfo.BucketName == "" {
-		return errors.New("Error: no cache is configured")
+	if cacheInfo.BucketName == "" && cacheInfo.ContainerName == "" && cacheInfo.StorageAccount == "" {
+		return status.Error(codes.Internal, "no remote cache configured")
 	}
 
 	cacheInfo = CacheProvider{}
 	viper.Set("cache", cacheInfo)
 	err = viper.WriteConfig()
 	if err != nil {
-		return err
+		return status.Error(codes.Internal, "unable to write config")
 	}
 
 	return nil

pkg/cache/s3_based.go

@@ -2,6 +2,7 @@ package cache
 
 import (
 	"bytes"
+	"log"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
@@ -79,13 +80,13 @@ func NewS3Cache(nocache bool) ICache {
 	var cache CacheProvider
 	err := viper.UnmarshalKey("cache", &cache)
 	if err != nil {
-		panic(err)
+		log.Fatal(err)
 	}
 	if cache.BucketName == "" {
-		panic("Bucket name not configured")
+		log.Fatal("Bucket name not configured")
 	}
 	if cache.Region == "" {
-		panic("Region not configured")
+		log.Fatal("Region not configured")
 	}
 
 	sess := session.Must(session.NewSessionWithOptions(session.Options{

pkg/integration/integration.go

@@ -32,6 +32,8 @@ type IIntegration interface {
 	AddAnalyzer(*map[string]common.IAnalyzer)
 
 	GetAnalyzerName() []string
+	// An integration must keep record of its deployed namespace (if not using --no-install)
+	GetNamespace() (string, error)
 
 	OwnsAnalyzer(string) bool
 
@@ -86,7 +88,6 @@ func (*Integration) Activate(name string, namespace string, activeFilters []stri
 			return err
 		}
 	}
-
 	mergedFilters := activeFilters
 	mergedFilters = append(mergedFilters, integrations[name].GetAnalyzerName()...)
 	uniqueFilters, _ := util.RemoveDuplicates(mergedFilters)

pkg/integration/trivy/trivy.go

@@ -16,6 +16,8 @@ package trivy
 import (
 	"context"
 	"fmt"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 
 	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
 	helmclient "github.com/mittwald/go-helm-client"
@@ -51,6 +53,20 @@ func (t *Trivy) GetAnalyzerName() []string {
 	}
 }
 
+// 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() {
@@ -67,7 +83,6 @@ func (t *Trivy) Deploy(namespace string) error {
 		Name: RepoShortName,
 		URL:  Repo,
 	}
-
 	// Add a chart-repository to the client.
 	if err := t.helm.AddOrUpdateChartRepo(chartRepo); err != nil {
 		panic(err)
@@ -77,9 +92,12 @@ func (t *Trivy) Deploy(namespace string) error {
 		ReleaseName: ReleaseName,
 		ChartName:   fmt.Sprintf("%s/%s", RepoShortName, ChartName),
 		Namespace:   namespace,
-		UpgradeCRDs: true,
-		Wait:        false,
-		Timeout:     300,
+
+		//TODO: All of this should be configurable
+		UpgradeCRDs:     true,
+		Wait:            false,
+		Timeout:         300,
+		CreateNamespace: true,
 	}
 
 	// Install a chart release.

pkg/server/README.md

@@ -16,7 +16,7 @@ grpcurl -plaintext -d '{"namespace": "k8sgpt", "explain" : "true"}' localhost:80
 ```
 
 ```
-grpcurl -plaintext  localhost:8080 schema.v1.ServerService/ListIntegrations
+grpcurl -plaintext  localhost:8080 schema.v1.ServerService/ListIntegrations 
 {
   "integrations": [
     "trivy"
@@ -24,3 +24,7 @@ grpcurl -plaintext  localhost:8080 schema.v1.ServerService/ListIntegrations
 }
 
 ```
+
+```
+grpcurl -plaintext -d '{"integrations":{"trivy":{"enabled":"true","namespace":"default","skipInstall":"false"}}}' localhost:8080 schema.v1.ServerService/AddConfig
+```

pkg/server/config.go

@@ -2,63 +2,47 @@ package server
 
 import (
 	"context"
-	"errors"
 
 	schemav1 "buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go/schema/v1"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/analyzer"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/cache"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/integration"
-	"github.com/spf13/viper"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 )
 
 func (h *handler) AddConfig(ctx context.Context, i *schemav1.AddConfigRequest) (*schemav1.AddConfigResponse, error,
 ) {
 
-	if i.Integrations != nil {
-		coreFilters, _, _ := analyzer.ListFilters()
-		// Update filters
-		activeFilters := viper.GetStringSlice("active_filters")
-		if len(activeFilters) == 0 {
-			activeFilters = coreFilters
-		}
-		integration := integration.NewIntegration()
-
-		if i.Integrations.Trivy != nil {
-			// Enable/Disable Trivy
-			var err = integration.Activate("trivy", i.Integrations.Trivy.Namespace,
-				activeFilters, i.Integrations.Trivy.SkipInstall)
-			return &schemav1.AddConfigResponse{
-				Status: "",
-			}, err
-		}
+	resp, err := h.syncIntegration(ctx, i)
+	if err != nil {
+		return resp, err
 	}
+
 	if i.Cache != nil {
-		// Remote cache
-		if i.Cache.BucketName == "" || i.Cache.Region == "" {
-			return &schemav1.AddConfigResponse{}, errors.New("BucketName & Region are required")
+		// We check if we have a mixed cache configuration
+		CacheConfigured := (i.Cache.Region == "" && i.Cache.BucketName == "") || (i.Cache.ContainerName == "" && i.Cache.StorageAccount == "")
+		if !CacheConfigured {
+			return resp, status.Error(codes.InvalidArgument, "mixed cache arguments")
 		}
 
-		err := cache.AddRemoteCache(i.Cache.BucketName, i.Cache.Region)
+		cacheProvider := cache.NewCacheProvider(i.Cache.BucketName, i.Cache.Region, i.Cache.StorageAccount, i.Cache.ContainerName)
+		err := cache.AddRemoteCache(cacheProvider)
 		if err != nil {
-			return &schemav1.AddConfigResponse{
-				Status: err.Error(),
-			}, err
+			return resp, err
 		}
 	}
-	return &schemav1.AddConfigResponse{
-		Status: "Configuration updated.",
-	}, nil
+	return resp, nil
 }
 
 func (h *handler) RemoveConfig(ctx context.Context, i *schemav1.RemoveConfigRequest) (*schemav1.RemoveConfigResponse, error,
 ) {
-	err := cache.RemoveRemoteCache(i.Cache.BucketName)
+	err := cache.RemoveRemoteCache()
 	if err != nil {
-		return &schemav1.RemoveConfigResponse{
-			Status: err.Error(),
-		}, err
+		return &schemav1.RemoveConfigResponse{}, err
 	}
 
+	// Remove any integrations is a TBD as it would be nice to make this more granular
+	// Currently integrations can be removed in the AddConfig sync
+
 	return &schemav1.RemoveConfigResponse{
 		Status: "Successfully removed the remote cache",
 	}, nil

pkg/server/integration.go

@@ -1,24 +1,144 @@
 package server
 
 import (
-	"context"
-
 	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"
+)
+
+// syncIntegration is aware of the following events
+// A new integration added
+// An integration removed from the Integration block
+func (h *handler) syncIntegration(ctx context.Context,
+	i *schemav1.AddConfigRequest) (*schemav1.AddConfigResponse, error,
+) {
+	response := &schemav1.AddConfigResponse{}
+	integrationProvider := integration.NewIntegration()
+	if i.Integrations == nil {
+		// If there are locally activate integrations, disable them
+		err := h.deactivateAllIntegrations(integrationProvider)
+		if err != nil {
+			return response, status.Error(codes.NotFound, "deactivation error")
+		}
+		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, "")
+	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
+}
+
 func (*handler) ListIntegrations(ctx context.Context, req *schemav1.ListIntegrationsRequest) (*schemav1.ListIntegrationsResponse, error) {
 
 	integrationProvider := integration.NewIntegration()
-	integrations := integrationProvider.List()
-	resp := &schemav1.ListIntegrationsResponse{
-		Integrations: make([]string, 0),
+	// 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")
+	}
+	resp := &schemav1.ListIntegrationsResponse{
+		Trivy: &schemav1.Trivy{
+			Enabled:     active,
+			Namespace:   namespace,
+			SkipInstall: skipInstall,
+		},
+	}
+
+	return resp, nil
+}
+
+func (*handler) deactivateAllIntegrations(integrationProvider *integration.Integration) error {
+	integrations := integrationProvider.List()
 	for _, i := range integrations {
 		b, _ := integrationProvider.IsActivate(i)
 		if b {
-			resp.Integrations = append(resp.Integrations, i)
+			in, err := integrationProvider.Get(i)
+			namespace, err := in.GetNamespace()
+			if err != nil {
+				return err
+			}
+			if err == nil {
+				if namespace != "" {
+					integrationProvider.Deactivate(i, namespace)
+				} else {
+					fmt.Printf("Skipping deactivation of %s, not installed\n", i)
+				}
+			} else {
+				return err
+			}
 		}
 	}
-	return resp, nil
+	return nil
 }