chore(main): release 0.3.17 (#674 )

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
feat: integration refactor (#684 )
2026-03-19 11:33:08 +00:00 · 2023-09-29 08:13:39 +01:00 · 2023-09-28 07:43:05 +01:00 · 2023-09-26 12:50:59 +01:00 · 2023-09-26 10:24:19 +01:00 · 2023-09-26 10:15:50 +01:00
16 changed files with 655 additions and 128 deletions
--- a/.github/workflows/build_container.yaml
+++ b/.github/workflows/build_container.yaml
@@ -33,7 +33,7 @@ jobs:

    steps:
      - name: Check out code
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # 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@8ade135a41bc03ea155e62e844d188df1ea18608 # 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@8ade135a41bc03ea155e62e844d188df1ea18608 # v4

      - name: Login to GitHub Container Registry
        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3
--- a/.github/workflows/golangci_lint.yaml
+++ b/.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@8ade135a41bc03ea155e62e844d188df1ea18608 # v4

      - name: golangci-lint
        uses: reviewdog/action-golangci-lint@24d4af2fc93f5b2b296229e8b0c0f658d25707af # v2
--- a/.github/workflows/release.yaml
+++ b/.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@8ade135a41bc03ea155e62e844d188df1ea18608 # 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@8ade135a41bc03ea155e62e844d188df1ea18608 # 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@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
        with:
          submodules: recursive

--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -16,7 +16,7 @@ jobs:

    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4

      - name: Set up Go
        uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.idea
 __debug*
 .DS_Store
 k8sgpt*
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1 +1 @@
-{".":"0.3.16"}
+{".":"0.3.17"}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,28 @@
 # Changelog

+## [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)


--- a/README.md
+++ b/README.md
@@ -34,7 +34,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.17/k8sgpt_386.rpm
  sudo rpm -ivh k8sgpt_386.rpm
  ```
  <!---x-release-please-end-->
@@ -43,7 +43,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.17/k8sgpt_amd64.rpm
  sudo rpm -ivh -i k8sgpt_amd64.rpm
  ```
  <!---x-release-please-end-->
@@ -55,7 +55,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.17/k8sgpt_386.deb
  sudo dpkg -i k8sgpt_386.deb
  ```
  <!---x-release-please-end-->
@@ -63,7 +63,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.17/k8sgpt_amd64.deb
  sudo dpkg -i k8sgpt_amd64.deb
  ```
  <!---x-release-please-end-->
@@ -76,14 +76,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.17/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.17/k8sgpt_amd64.apk
  apk add k8sgpt_amd64.apk
  ```
  <!---x-release-please-end-->x
@@ -149,6 +149,8 @@ you will be able to write your own analyzers.
 - [x] deploymentAnalyzer
 - [x] cronJobAnalyzer
 - [x] nodeAnalyzer
+- [x] mutatingWebhookAnalyzer
+- [x] validatingWebhookAnalyzer

 #### Optional

--- a/go.mod
+++ b/go.mod
@@ -14,19 +14,19 @@ require (
 	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
+	k8s.io/api v0.28.2
+	k8s.io/apimachinery v0.28.2
+	k8s.io/client-go v0.28.2
+	k8s.io/kubectl v0.28.2

 )

 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-20230927080702-a2be8a73637d.1
+	buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go v1.31.0-20230927080702-a2be8a73637d.1
+	github.com/aws/aws-sdk-go v1.45.16
 	github.com/cohere-ai/cohere-go v0.2.0
 )

@@ -34,6 +34,7 @@ require (
 	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/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
 )
@@ -82,7 +83,7 @@ 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
@@ -132,7 +133,7 @@ require (
 	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/common v0.44.0 // indirect
 	github.com/prometheus/procfs v0.10.1 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/robfig/cron/v3 v3.0.1
@@ -150,15 +151,15 @@ require (
 	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/net v0.13.0 // indirect
 	golang.org/x/oauth2 v0.10.0 // indirect
 	golang.org/x/sync v0.3.0 // indirect
 	golang.org/x/sys v0.12.0 // indirect
@@ -166,7 +167,7 @@ require (
 	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.2
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
@@ -174,15 +175,15 @@ require (
 	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/cli-runtime v0.28.2 // indirect
+	k8s.io/component-base v0.28.2 // 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
 )
--- a/go.sum
+++ b/go.sum
--- a/pkg/cache/cache.go
+++ b/pkg/cache/cache.go
@@ -1,7 +1,8 @@
 package cache

 import (
-	"errors"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"

 	"github.com/spf13/viper"
 )
@@ -63,17 +64,17 @@ func RemoveRemoteCache(bucketName string) 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")
+		return status.Error(codes.Internal, "no 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
--- a/pkg/integration/integration.go
+++ b/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)
--- a/pkg/integration/trivy/trivy.go
+++ b/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.
--- a/pkg/server/README.md
+++ b/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
+```
--- a/pkg/server/config.go
+++ b/pkg/server/config.go
@@ -1,64 +1,45 @@
 package server

 import (
-	"context"
-	"errors"
-
 	schemav1 "buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go/schema/v1"
-	"github.com/k8sgpt-ai/k8sgpt/pkg/analyzer"
+	"context"
 	"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")
+			return resp, status.Error(codes.InvalidArgument, "cache arguments")
 		}

 		err := cache.AddRemoteCache(i.Cache.BucketName, i.Cache.Region)
 		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)
 	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
--- a/pkg/server/integration.go
+++ b/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
 }
Author	SHA1	Message	Date
github-actions[bot]	bcd058c3b0	chore(main): release 0.3.17 (#674 ) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-09-29 08:13:39 +01:00
Alex Jones	69fe2db8ac	feat: integration refactor (#684 ) * feat: more significant refactor Signed-off-by: Alex Jones <alexsimonjones@gmail.com> * feat: more significant refactor Signed-off-by: Alex Jones <alexsimonjones@gmail.com> * feat: reworked the integration activate/deactivation Signed-off-by: Alex Jones <alexsimonjones@gmail.com> * chore: updated schema for list integrations Signed-off-by: Alex Jones <alexsimonjones@gmail.com> * fix: error with incorrect error being swallowed Signed-off-by: Alex Jones <alexsimonjones@gmail.com> * feat: added namespace check Signed-off-by: Alex Jones <alexsimonjones@gmail.com> * chore: fixed issue with namespace and skip install validation Signed-off-by: Alex Jones <alexsimonjones@gmail.com> --------- Signed-off-by: Alex Jones <alexsimonjones@gmail.com>	2023-09-28 07:43:05 +01:00
renovate[bot]	ddeff9fae4	fix(deps): update kubernetes packages to v0.28.2 (#607 ) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-09-26 12:50:59 +01:00
renovate[bot]	aa9e6a3549	chore(deps): update actions/checkout digest to 8ade135 (#681 ) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-09-26 10:24:19 +01:00
renovate[bot]	e1a42ff3bc	fix(deps): update module github.com/aws/aws-sdk-go to v1.45.16 (#682 ) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-09-26 10:15:50 +01:00
renovate[bot]	901ffb8df4	fix(deps): update module github.com/google/gnostic to v0.7.0 (#679 ) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-09-22 12:08:52 +01:00
renovate[bot]	402e97d05e	fix(deps): update module google.golang.org/grpc to v1.58.2 (#680 ) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-09-22 07:10:12 +01:00
renovate[bot]	1da4b7c8f0	fix(deps): update module github.com/aws/aws-sdk-go to v1.45.14 (#672 ) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2023-09-21 06:42:23 +01:00
Alex Jones	820e4755a5	feat: added create namespace on deploy (#673 ) Signed-off-by: Alex Jones <alexsimonjones@gmail.com> Co-authored-by: Aris Boutselis <aris.boutselis@senseon.io>	2023-09-20 12:43:18 +01:00
Rakshit Gondwal	cad605af46	feat: update readme with new analyzers (#671 ) Signed-off-by: Rakshit Gondwal <98955085+rakshitgondwal@users.noreply.github.com>	2023-09-20 12:20:13 +01:00