Merge branch 'main' into feat/interfaces_contd

.github/workflows/release.yaml

@@ -36,7 +36,6 @@ jobs:
     if: needs.release-please.outputs.releases_created == 'true'
     permissions:
       contents: write
-
     needs:
       - release-please
     runs-on: ubuntu-latest
@@ -49,6 +48,8 @@ jobs:
         uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4
         with:
           go-version: '1.20'
+      - name: Download Syft
+        uses: anchore/sbom-action/download-syft@448520c4f19577ffce70a8317e619089054687e3 # v0.13.4
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@f82d6c1c344bcacabba2c841718984797f664a6b # v4
         with:
@@ -70,6 +71,7 @@ jobs:
       id-token: write
     env:
       IMAGE_TAG: ghcr.io/k8sgpt-ai/k8sgpt:${{ needs.release-please.outputs.tag_name }}
+      IMAGE_NAME: k8sgpt
     steps:
       - name: Checkout
         uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3
@@ -98,8 +100,8 @@ jobs:
             ${{ env.IMAGE_TAG }}
           builder: ${{ steps.buildx.outputs.name }}
           push: true
-          cache-from: type=gha,scope=${{ github.ref_name }}-${{ env.IMAGE_NAME }}
-          cache-to: type=gha,scope=${{ github.ref_name }}-${{ env.IMAGE_NAME }}
+          cache-from: type=gha,scope=${{ github.ref_name }}-${{ env.IMAGE_TAG }}
+          cache-to: type=gha,scope=${{ github.ref_name }}-${{ env.IMAGE_TAG }}
 
       - name: Generate SBOM
         uses: anchore/sbom-action@422cb34a0f8b599678c41b21163ea6088edb2624 # v0.14.1

.goreleaser.yaml

@@ -16,6 +16,27 @@ builds:
     ldflags:
           - -s -w -X main.version={{.Version}}
 
+nfpms:
+  - file_name_template: '{{ .ProjectName }}_{{ .Arch }}'
+    homepage: https://k8sgpt.ai
+    description: >-
+      K8sGPT is a tool for scanning your kubernetes clusters, diagnosing and triaging issues in simple english. It has SRE experience codified into it’s analyzers and helps to pull out the most relevant information to enrich it with AI.
+    license: "MIT"
+    formats:
+      - deb
+      - rpm
+      - apk
+    bindir: /usr/bin
+    section: utils
+    contents:
+      - src: ./LICENSE
+        dst: /usr/share/doc/nfpm/copyright
+        file_info:
+          mode: 0644
+
+sboms:
+  - artifacts: archive
+
 archives:
   - format: tar.gz
     # this name template makes the OS and Arch compatible with the results of uname.

.release-please-manifest.json

@@ -1 +1 @@
-{".":"0.1.7"}
+{".":"0.1.8"}

CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## [0.1.8](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.1.7...v0.1.8) (2023-04-03)
+
+
+### Features
+
+* add password flag for backend authentication ([#199](https://github.com/k8sgpt-ai/k8sgpt/issues/199)) ([075a940](https://github.com/k8sgpt-ai/k8sgpt/commit/075a940d2c9bdd8aa9162940ed46abad47d46998))
+* adding shields to readme ([213ecd8](https://github.com/k8sgpt-ai/k8sgpt/commit/213ecd8e83933fabaa5d3d674c67958599dd72ce))
+* adding unit testing and example ([35b838b](https://github.com/k8sgpt-ai/k8sgpt/commit/35b838bfafa248dbf3932c7a3ee708b1a1539f18))
+* alias filter to filters ([dde4e83](https://github.com/k8sgpt-ai/k8sgpt/commit/dde4e833b0e87553dea4e5c1e17a14e303956bc1))
+* analyzer ifacing ([426f562](https://github.com/k8sgpt-ai/k8sgpt/commit/426f562be83ed0e708a07b9e1900ac06fa017c27))
+* service test ([44cc8f7](https://github.com/k8sgpt-ai/k8sgpt/commit/44cc8f7ad68d152ec577e57cab7d8d9ab9613378))
+* test workflow ([5f30a4d](https://github.com/k8sgpt-ai/k8sgpt/commit/5f30a4ddf44ebff949bb0573f261667539a2dcfb))
+
+
+### Bug Fixes
+
+* **deps:** update module github.com/sashabaranov/go-openai to v1.5.8 ([91fb065](https://github.com/k8sgpt-ai/k8sgpt/commit/91fb06530a21259da6e72c28342e743d2b481294))
+
+
+### Other
+
+* create linux packages ([#201](https://github.com/k8sgpt-ai/k8sgpt/issues/201)) ([67753be](https://github.com/k8sgpt-ai/k8sgpt/commit/67753be6f317c462ebe1d9a316f2b0c9684ca4e5))
+* **deps:** pin dependencies ([#198](https://github.com/k8sgpt-ai/k8sgpt/issues/198)) ([f8291aa](https://github.com/k8sgpt-ai/k8sgpt/commit/f8291aab085209f9fee13a6c92c96076163e2e90))
+
 ## [0.1.7](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.1.6...v0.1.7) (2023-04-02)
 
 

README.md

@@ -51,7 +51,8 @@ If you install gcc as suggested, the problem will persist. Therefore, you need t
 
 * Currently the default AI provider is OpenAI, you will need to generate an API key from [OpenAI](https://openai.com)
   * You can do this by running `k8sgpt generate` to open a browser link to generate it
-* Run `k8sgpt auth` to set it in k8sgpt.
+* Run `k8sgpt auth` to set it in k8sgpt. 
+  * You can provide the password directly using the `--password` flag.
 * Run `k8sgpt filters` to manage the active filters used by the analyzer. By default, all filters are executed during analysis.
 * Run `k8sgpt analyze` to run a scan.
 * And use `k8sgpt analyze --explain` to get a more detailed explanation of the issues.

cmd/auth/auth.go

@@ -13,7 +13,8 @@ import (
 )
 
 var (
-	backend string
+	backend  string
+	password string
 )
 
 // authCmd represents the auth command
@@ -38,14 +39,16 @@ var AuthCmd = &cobra.Command{
 			color.Green("Using %s as backend AI provider", backendType)
 		}
 
-		fmt.Printf("Enter %s Key: ", backendType)
-		bytePassword, err := term.ReadPassword(int(syscall.Stdin))
-		if err != nil {
-			color.Red("Error reading %s Key from stdin: %s", backendType,
-				err.Error())
-			os.Exit(1)
+		if password == "" {
+			fmt.Printf("Enter %s Key: ", backendType)
+			bytePassword, err := term.ReadPassword(int(syscall.Stdin))
+			if err != nil {
+				color.Red("Error reading %s Key from stdin: %s", backendType,
+					err.Error())
+				os.Exit(1)
+			}
+			password = strings.TrimSpace(string(bytePassword))
 		}
-		password := strings.TrimSpace(string(bytePassword))
 
 		viper.Set(fmt.Sprintf("%s_key", backendType), password)
 		if err := viper.WriteConfig(); err != nil {
@@ -59,4 +62,6 @@ var AuthCmd = &cobra.Command{
 func init() {
 	// add flag for backend
 	AuthCmd.Flags().StringVarP(&backend, "backend", "b", "openai", "Backend AI provider")
+	// add flag for password
+	AuthCmd.Flags().StringVarP(&password, "password", "p", "", "Backend AI password")
 }

cmd/generate/generate.go

@@ -7,7 +7,6 @@ import (
 	"github.com/spf13/viper"
 	"os/exec"
 	"runtime"
-	"time"
 )
 
 var (
@@ -31,10 +30,6 @@ var GenerateCmd = &cobra.Command{
 			backendType = backend
 		}
 		fmt.Println("")
-		color.Green("Opening: https://beta.openai.com/account/api-keys to generate a key for %s", backendType)
-		color.Green("Please copy the generated key and run `k8sgpt auth` to add it to your config file")
-		fmt.Println("")
-		time.Sleep(5 * time.Second)
 		openbrowser("https://beta.openai.com/account/api-keys")
 	},
 }
@@ -46,17 +41,37 @@ func init() {
 
 func openbrowser(url string) {
 	var err error
+	isGui := true
 	switch runtime.GOOS {
 	case "linux":
-		err = exec.Command("xdg-open", url).Start()
+		_, err = exec.LookPath("xdg-open")
+		if err != nil {
+			isGui = false
+		} else {
+			err = exec.Command("xdg-open", url).Start()
+		}
 	case "windows":
 		err = exec.Command("rundll32", "url.dll,FileProtocolHandler", url).Start()
 	case "darwin":
 		err = exec.Command("open", url).Start()
 	default:
 		err = fmt.Errorf("unsupported platform")
 	}
+	printInstructions(isGui, backend)
 	if err != nil {
 		fmt.Println(err)
 	}
 }
+
+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)
+		fmt.Println("")
+	} else {
+		color.Green("Please open: https://beta.openai.com/account/api-keys to generate a key for %s", backendType)
+		fmt.Println("")
+	}
+	color.Green("Please copy the generated key and run `k8sgpt auth` to add it to your config file")
+	fmt.Println("")
+}