Merge branch 'main' into vsukhin/feature/run-workflow-selector

kubeshop · Nov 18, 2024 · 4cad37a · 4cad37a
2 parents 6d2e076 + 481c968
commit 4cad37a
Show file tree

Hide file tree

Showing 14 changed files with 312 additions and 73 deletions.
diff --git a/.github/workflows/docker-build-api-executors-tag.yaml b/.github/workflows/docker-build-api-executors-tag.yaml
@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v4
 
       - uses: sigstore/[email protected]
-      - uses: anchore/sbom-action/[email protected].6
+      - uses: anchore/sbom-action/[email protected].7
 
       - name: Set up Docker Buildx
         id: buildx
@@ -94,7 +94,7 @@ jobs:
         uses: actions/checkout@v4
 
       - uses: sigstore/[email protected]
-      - uses: anchore/sbom-action/[email protected].6
+      - uses: anchore/sbom-action/[email protected].7
 
       - name: Set up Docker Buildx
         id: buildx
@@ -178,7 +178,7 @@ jobs:
         uses: actions/checkout@v4
 
       - uses: sigstore/[email protected]
-      - uses: anchore/sbom-action/[email protected].6
+      - uses: anchore/sbom-action/[email protected].7
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -249,7 +249,7 @@ jobs:
         uses: actions/checkout@v4
 
       - uses: sigstore/[email protected]
-      - uses: anchore/sbom-action/[email protected].6
+      - uses: anchore/sbom-action/[email protected].7
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -317,7 +317,7 @@ jobs:
         uses: actions/checkout@v4
 
       - uses: sigstore/[email protected]
-      - uses: anchore/sbom-action/[email protected].6
+      - uses: anchore/sbom-action/[email protected].7
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -442,7 +442,7 @@ jobs:
         uses: actions/checkout@v4
 
       - uses: sigstore/[email protected]
-      - uses: anchore/sbom-action/[email protected].6
+      - uses: anchore/sbom-action/[email protected].7
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -510,7 +510,7 @@ jobs:
         uses: actions/checkout@v4
 
       - uses: sigstore/[email protected]
-      - uses: anchore/sbom-action/[email protected].6
+      - uses: anchore/sbom-action/[email protected].7
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -669,7 +669,7 @@ jobs:
         uses: actions/checkout@v4
 
       - uses: sigstore/[email protected]
-      - uses: anchore/sbom-action/[email protected].6
+      - uses: anchore/sbom-action/[email protected].7
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -741,7 +741,7 @@ jobs:
         uses: docker/setup-qemu-action@v3
 
       - uses: sigstore/[email protected]
-      - uses: anchore/sbom-action/[email protected].6
+      - uses: anchore/sbom-action/[email protected].7
 
       - name: Set up Docker Buildx
         id: buildx
@@ -790,7 +790,7 @@ jobs:
         uses: actions/checkout@v4
 
       - uses: sigstore/[email protected]
-      - uses: anchore/sbom-action/[email protected].6
+      - uses: anchore/sbom-action/[email protected].7
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -863,7 +863,7 @@ jobs:
           fetch-depth: 0
 
       - uses: sigstore/[email protected]
-      - uses: anchore/sbom-action/[email protected].6
+      - uses: anchore/sbom-action/[email protected].7
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3

diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml
@@ -185,7 +185,7 @@ jobs:
         with:
           fetch-depth: 0
       - uses: sigstore/[email protected]
-      - uses: anchore/sbom-action/[email protected].6
+      - uses: anchore/sbom-action/[email protected].7
       - name: Download Artifacts for Linux
         uses: actions/download-artifact@master
         with:

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -177,7 +177,7 @@ jobs:
         with:
           fetch-depth: 0
       - uses: sigstore/[email protected]
-      - uses: anchore/sbom-action/[email protected].6
+      - uses: anchore/sbom-action/[email protected].7
       - name: Download Artifacts for Linux
         uses: actions/download-artifact@master
         with:

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -53,7 +53,7 @@ jobs:
 
       - name: Send coverage report to Codecov
         if: always()
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           file: ./coverage.out
           flags: unittests
@@ -181,7 +181,7 @@ jobs:
 
       - name: Send coverage report to Codecov
         if: always()
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           file: ./coverage.out
           flags: integrationtests

diff --git a/cmd/kubectl-testkube/commands/common/errors.go b/cmd/kubectl-testkube/commands/common/errors.go
@@ -3,6 +3,7 @@ package common
 import (
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -52,13 +53,14 @@ const (
 const helpUrl = "https://testkubeworkspace.slack.com"
 
 type CLIError struct {
-	Code        ErrorCode
-	Title       string
-	Description string
-	ActualError error
-	StackTrace  string
-	MoreInfo    string
-	Telemetry   *ErrorTelemetry
+	Code            ErrorCode
+	Title           string
+	Description     string
+	ActualError     error
+	StackTrace      string
+	MoreInfo        string
+	ExecutedCommand string
+	Telemetry       *ErrorTelemetry
 }
 
 type ErrorTelemetry struct {
@@ -86,6 +88,15 @@ func (e *CLIError) Print() {
 
 	pterm.DefaultSection.Println("Error Details")
 
+	cmd := ""
+	if e.ExecutedCommand != "" {
+		pterm.FgDarkGray.Printfln("Executed command: %s", e.ExecutedCommand)
+		params := strings.Split(e.ExecutedCommand, " ")
+		if len(params) > 0 {
+			cmd = params[0]
+		}
+	}
+
 	items := []pterm.BulletListItem{
 		{Level: 0, Text: pterm.Sprintf("[%s]: %s", e.Code, e.Title), TextStyle: pterm.NewStyle(pterm.FgRed)},
 		{Level: 0, Text: pterm.Sprintf("%s", e.Description), TextStyle: pterm.NewStyle(pterm.FgLightWhite)},
@@ -94,6 +105,9 @@ func (e *CLIError) Print() {
 		items = append(items, pterm.BulletListItem{Level: 0, Text: pterm.Sprintf("%s", e.MoreInfo), TextStyle: pterm.NewStyle(pterm.FgGray)})
 	}
 	pterm.DefaultBulletList.WithItems(items).Render()
+	if cmd != "" {
+		pterm.DefaultBox.Printfln("Error description is provided in context of binary execution %s", cmd)
+	}
 
 	pterm.Println()
 	pterm.Println("Let us help you!")
@@ -111,6 +125,11 @@ func NewCLIError(code ErrorCode, title, moreInfoURL string, err error) *CLIError
 	}
 }
 
+func (err *CLIError) WithExecutedCommand(executedCommand string) *CLIError {
+	err.ExecutedCommand = executedCommand
+	return err
+}
+
 // HandleCLIError checks does the error exist, and if it does, prints the error and exits the program.
 func HandleCLIError(err *CLIError) {
 	if err != nil {