Combine benchmarks rebase new

.github/workflows/01-powerpipe-pre-release.yaml

@@ -39,7 +39,7 @@ jobs:
           path: pipe-fittings
           ref: tp
 
-       # this is required, check golangci-lint-action docs
+      # this is required, check golangci-lint-action docs
       - uses: actions/setup-go@v5
         with:
           go-version: '1.23'
@@ -129,7 +129,7 @@ jobs:
         id: prepare-for-downloads
         run: |
           mkdir ~/artifacts
-  
+
       - name: Download Linux Build Artifacts
         uses: actions/download-artifact@v3
         if: ${{ matrix.platform == 'ubuntu-latest' }}
@@ -155,7 +155,7 @@ jobs:
         run: |
           mkdir ~/build
           tar -xf ~/artifacts/linux.tar.gz -C ~/build
-      
+
       - name: Install Steampipe(Darwin)
         if: ${{ matrix.platform == 'macos-latest' }}
         run: |
@@ -167,7 +167,7 @@ jobs:
         run: |
           sudo /bin/sh -c "$(curl -fsSL https://steampipe.io/install/steampipe.sh)"
           steampipe -v
-      
+
       - name: Set PATH
         run: |
           echo "PATH=$PATH:$HOME/build:$GTIHUB_WORKSPACE/powerpipe/tests/acceptance/lib/bats-core/libexec" >> $GITHUB_ENV
@@ -220,29 +220,29 @@ jobs:
         with:
           name: build-artifact-linux
           path: ./artifacts
-  
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-  
+
       - name: Pull Ubuntu latest Image
         run: docker pull ubuntu:latest
-  
+
       - name: Create and Start Ubuntu latest Container
         run: |
           docker run -d --name ubuntu-24-test -v ${{ github.workspace }}/artifacts:/artifacts -v ${{ github.workspace }}/scripts:/scripts ubuntu:latest tail -f /dev/null
 
       - name: Get runner/container info
         run: |
           docker exec ubuntu-24-test /scripts/linux_container_info.sh
-  
+
       - name: Install dependencies, create user, and assign necessary permissions
         run: |
           docker exec ubuntu-24-test /scripts/prepare_ubuntu_container.sh
 
       - name: Run smoke tests
         run: |
           docker exec -u steampipe ubuntu-24-test /scripts/smoke_test.sh
-  
+
       - name: Stop and Remove Container
         run: |
           docker stop ubuntu-24-test
@@ -255,35 +255,35 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-  
+
       - name: Download Linux Build Artifact
         uses: actions/download-artifact@v3
         with:
           name: build-artifact-linux
           path: ./artifacts
-  
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-  
+
       - name: Pull CentOS Stream 9 image
         run: docker pull quay.io/centos/centos:stream9
-  
+
       - name: Create and Start CentOS stream9 Container
         run: |
           docker run -d --name centos-stream9-test -v ${{ github.workspace }}/artifacts:/artifacts -v ${{ github.workspace }}/scripts:/scripts quay.io/centos/centos:stream9 tail -f /dev/null
 
       - name: Get runner/container info
         run: |
           docker exec centos-stream9-test /scripts/linux_container_info.sh
-  
+
       - name: Install dependencies, create user, and assign necessary permissions
         run: |
           docker exec centos-stream9-test /scripts/prepare_centos_container.sh
-        
+
       - name: Run smoke tests
         run: |
           docker exec -u steampipe centos-stream9-test /scripts/smoke_test.sh
-  
+
       - name: Stop and Remove Container
         run: |
           docker stop centos-stream9-test
@@ -302,29 +302,29 @@ jobs:
         with:
           name: build-artifact-linux
           path: ./artifacts
-  
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-  
+
       - name: Pull Amazon Linux 2023 Image
         run: docker pull amazonlinux:2023
-  
+
       - name: Create and Start Amazon Linux 2023 Container
         run: |
           docker run -d --name amazonlinux-2023-test -v ${{ github.workspace }}/artifacts:/artifacts -v ${{ github.workspace }}/scripts:/scripts amazonlinux:2023 tail -f /dev/null
 
       - name: Get runner/container info
         run: |
           docker exec amazonlinux-2023-test /scripts/linux_container_info.sh
-  
+
       - name: Install dependencies, create user, and assign necessary permissions
         run: |
           docker exec amazonlinux-2023-test /scripts/prepare_amazonlinux_container.sh
 
       - name: Run smoke tests
         run: |
           docker exec -u steampipe amazonlinux-2023-test /scripts/smoke_test.sh
-  
+
       - name: Stop and Remove Container
         run: |
           docker stop amazonlinux-2023-test
@@ -343,23 +343,23 @@ jobs:
   #       with:
   #         name: build-artifact-linux-arm
   #         path: ./artifacts
-  
+
   #     - name: Set up Docker Buildx
   #       uses: docker/setup-buildx-action@v3
-  
+
   #     - name: Set up QEMU
   #       uses: docker/setup-qemu-action@v3
   #       with:
   #         platforms: arm64
-  
+
   #     - name: Create Buildx Builder
   #       run: |
   #         docker buildx create --use --name mybuilder
   #         docker buildx inspect --bootstrap
-  
+
   #     - name: Pull Ubuntu 24 ARM64 Image
   #       run: docker pull arm64v8/ubuntu:latest
-  
+
   #     - name: Create and Start Ubuntu 24 ARM64 Container
   #       run: |
   #         docker run -d --name ubuntu-24-arm64-test -v ${{ github.workspace }}/artifacts:/artifacts -v ${{ github.workspace }}/scripts:/scripts arm64v8/ubuntu:latest tail -f /dev/null
@@ -375,7 +375,7 @@ jobs:
   #     - name: Run smoke tests
   #       run: |
   #         docker exec -u steampipe ubuntu-24-arm64-test /scripts/smoke_test.sh
-  
+
   #     - name: Stop and Remove Container
   #       run: |
   #         docker stop ubuntu-24-arm64-test

CHANGELOG.md

@@ -1,7 +1,4 @@
 ## v1.0.1 [2024-11-21]
-_Whats new_
-- Update uploaded Pipes snapshot URL to include `/powerpipe`. ([#577](https://github.com/turbot/powerpipe/issues/577))
-
 _Bug fixes_
 - Fix minor spelling issue in query help output. ([#542](https://github.com/turbot/powerpipe/issues/542))
 - Update error message to inform users to run `make dashboard_assets` when dashboard assets are not present. ([#524](https://github.com/turbot/powerpipe/issues/524))

internal/cmd/check.go

@@ -24,6 +24,7 @@ import (
 	"github.com/turbot/powerpipe/internal/controlexecute"
 	"github.com/turbot/powerpipe/internal/controlinit"
 	"github.com/turbot/powerpipe/internal/controlstatus"
+	"github.com/turbot/powerpipe/internal/dashboardexecute"
 	"github.com/turbot/powerpipe/internal/display"
 	localqueryresult "github.com/turbot/powerpipe/internal/queryresult"
 	"github.com/turbot/powerpipe/internal/resources"
@@ -158,7 +159,7 @@ func runCheckCmd[T controlinit.CheckTarget](cmd *cobra.Command, args []string) {
 	initCtx := statushooks.DisableStatusHooks(ctx)
 
 	// initialise
-	initData := controlinit.NewInitData[T](initCtx, cmd, args)
+	initData := controlinit.NewInitData[T](initCtx, cmd, args...)
 	if initData.Result.Error != nil {
 		exitCode = constants.ExitCodeInitializationFailed
 		error_helpers.ShowError(ctx, initData.Result.Error)
@@ -173,7 +174,7 @@ func runCheckCmd[T controlinit.CheckTarget](cmd *cobra.Command, args []string) {
 		if !viper.IsSet(constants.ArgOutput) {
 			viper.Set(constants.ArgOutput, constants.OutputFormatSnapshot)
 		}
-		detectionRunWithInitData[*resources.DetectionBenchmark](cmd, initData.BaseInitData(), args)
+		detectionRunWithInitData[*resources.DetectionBenchmark](cmd, initData, args)
 		return
 	}
 
@@ -185,7 +186,7 @@ func runCheckCmd[T controlinit.CheckTarget](cmd *cobra.Command, args []string) {
 
 	// now filter the target
 	// get the execution trees
-	trees, err := getExecutionTrees[T](ctx, initData)
+	trees, err := getExecutionTrees(ctx, initData)
 	error_helpers.FailOnError(err)
 
 	// pull out useful properties
@@ -229,7 +230,7 @@ func runCheckCmd[T controlinit.CheckTarget](cmd *cobra.Command, args []string) {
 }
 
 // exportExecutionTree relies on the fact that the given tree is already executed
-func exportExecutionTree[T controlinit.CheckTarget](ctx context.Context, namedTree *namedExecutionTree, initData *controlinit.InitData[T], exportArgs []string) error {
+func exportExecutionTree(ctx context.Context, namedTree *namedExecutionTree, initData *controlinit.InitData, exportArgs []string) error {
 	statushooks.Show(ctx)
 	defer statushooks.Done(ctx)
 
@@ -251,7 +252,7 @@ func exportExecutionTree[T controlinit.CheckTarget](ctx context.Context, namedTr
 }
 
 // executeTree executes and displays the (table) results of an execution
-func executeTree[T controlinit.CheckTarget](ctx context.Context, tree *controlexecute.ExecutionTree, initData *controlinit.InitData[T]) error {
+func executeTree(ctx context.Context, tree *controlexecute.ExecutionTree, initData *controlinit.InitData) error {
 	// create a context with check status hooks
 	checkCtx, cancel := createCheckContext(ctx)
 	defer cancel()
@@ -290,7 +291,7 @@ func publishSnapshot(ctx context.Context, executionTree *controlexecute.Executio
 	return nil
 }
 
-func getExecutionTrees[T controlinit.CheckTarget](ctx context.Context, initData *controlinit.InitData[T]) ([]*namedExecutionTree, error) {
+func getExecutionTrees(ctx context.Context, initData *controlinit.InitData) ([]*namedExecutionTree, error) {
 	var trees []*namedExecutionTree
 	if error_helpers.IsContextCanceled(ctx) {
 		return nil, ctx.Err()
@@ -394,6 +395,15 @@ func displayControlResults(ctx context.Context, executionTree *controlexecute.Ex
 	return err
 }
 
+func displayDetectionResults(ctx context.Context, executionTree *dashboardexecute.DetectionBenchmarkDisplayTree, formatter controldisplay.Formatter) error {
+	reader, err := formatter.FormatDetection(ctx, executionTree)
+	if err != nil {
+		return err
+	}
+	_, err = io.Copy(os.Stdout, reader)
+	return err
+}
+
 type namedExecutionTree struct {
 	tree *controlexecute.ExecutionTree
 	name string

internal/cmd/detection.go

@@ -4,8 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/turbot/pipe-fittings/modconfig"
-	"github.com/turbot/powerpipe/internal/dashboardexecute"
 	"os"
 	"strings"
 
@@ -17,11 +15,14 @@ import (
 	"github.com/turbot/pipe-fittings/constants"
 	"github.com/turbot/pipe-fittings/error_helpers"
 	"github.com/turbot/pipe-fittings/export"
+	"github.com/turbot/pipe-fittings/modconfig"
 	"github.com/turbot/pipe-fittings/statushooks"
 	"github.com/turbot/pipe-fittings/workspace"
 	localcmdconfig "github.com/turbot/powerpipe/internal/cmdconfig"
 	localconstants "github.com/turbot/powerpipe/internal/constants"
-	"github.com/turbot/powerpipe/internal/initialisation"
+	"github.com/turbot/powerpipe/internal/controldisplay"
+	"github.com/turbot/powerpipe/internal/controlinit"
+	"github.com/turbot/powerpipe/internal/dashboardexecute"
 	"github.com/turbot/powerpipe/internal/resources"
 	"github.com/turbot/steampipe-plugin-sdk/v5/logging"
 )
@@ -32,7 +33,7 @@ type DetectionTarget interface {
 }
 
 // variable used to assign the output mode flag
-var detectionOutputMode = localconstants.DetectionOutputModeSnapshotShort
+var detectionOutputMode = localconstants.CheckOutputModeText
 
 func detectionRunCmd[T DetectionTarget]() *cobra.Command {
 	typeName := resources.GenericTypeToBlockType[T]()
@@ -63,9 +64,9 @@ func detectionRunCmd[T DetectionTarget]() *cobra.Command {
 		AddVarFlag(enumflag.New(&updateStrategy, constants.ArgPull, constants.ModUpdateStrategyIds, enumflag.EnumCaseInsensitive),
 			constants.ArgPull,
 			fmt.Sprintf("Update strategy; one of: %s", strings.Join(constants.FlagValues(constants.ModUpdateStrategyIds), ", "))).
-		AddVarFlag(enumflag.New(&detectionOutputMode, constants.ArgOutput, localconstants.DetectionOutputModeIds, enumflag.EnumCaseInsensitive),
+		AddVarFlag(enumflag.New(&detectionOutputMode, constants.ArgOutput, localconstants.CheckOutputModeIds, enumflag.EnumCaseInsensitive),
 			constants.ArgOutput,
-			fmt.Sprintf("Output format; one of: %s", strings.Join(constants.FlagValues(localconstants.DetectionOutputModeIds), ", "))).
+			fmt.Sprintf("Output format; one of: %s", strings.Join(constants.FlagValues(localconstants.CheckOutputModeIds), ", "))).
 		AddBoolFlag(constants.ArgProgress, true, "Display detection execution progress respected when a detection name argument is passed").
 		AddBoolFlag(constants.ArgSnapshot, false, "Create snapshot in Turbot Pipes with the default (workspace) visibility").
 		AddBoolFlag(constants.ArgShare, false, "Create snapshot in Turbot Pipes with 'anyone_with_link' visibility").
@@ -89,8 +90,7 @@ func detectionRun[T DetectionTarget](cmd *cobra.Command, args []string) {
 
 // tactical - to support callint benchmark run and calling either control or dashboard execution flow,
 // we must support calling this from the check command, AFTER the initdata has been fetched
-func detectionRunWithInitData[T DetectionTarget](cmd *cobra.Command, initData *initialisation.InitData, args []string) {
-
+func detectionRunWithInitData[T DetectionTarget](cmd *cobra.Command, initData *controlinit.InitData, args []string) {
 	ctx := cmd.Context()
 
 	// there can only be a single arg - cobra will validate
@@ -121,8 +121,15 @@ func detectionRunWithInitData[T DetectionTarget](cmd *cobra.Command, initData *i
 
 	statushooks.SetStatus(ctx, "Initializing…")
 	if initData == nil {
-		initData = initialisation.NewInitData[T](ctx, cmd, detectionName)
+		initData = controlinit.NewInitData[T](ctx, cmd, detectionName)
+	}
+
+	if initData.Result.Error != nil {
+		exitCode = constants.ExitCodeInitializationFailed
+		error_helpers.ShowError(ctx, initData.Result.Error)
+		return
 	}
+	defer initData.Cleanup(ctx)
 
 	if len(viper.GetStringSlice(constants.ArgExport)) > 0 {
 		err := initData.RegisterExporters(detectionExporters()...)
@@ -135,10 +142,6 @@ func detectionRunWithInitData[T DetectionTarget](cmd *cobra.Command, initData *i
 
 	statushooks.Done(ctx)
 
-	// shutdown the service on exit
-	defer initData.Cleanup(ctx)
-	error_helpers.FailOnError(initData.Result.Error)
-
 	// if there is a usage warning we display it
 	initData.Result.DisplayMessages()
 
@@ -150,8 +153,15 @@ func detectionRunWithInitData[T DetectionTarget](cmd *cobra.Command, initData *i
 
 	snap, err := dashboardexecute.GenerateSnapshot(ctx, initData.Workspace, target, inputs)
 	error_helpers.FailOnError(err)
+
+	tree, err := controldisplay.SnapshotToExecutionTree(ctx, snap, initData.Workspace, target)
+	error_helpers.FailOnError(err)
+
+	err = displayDetectionResults(ctx, tree, initData.OutputFormatter)
+	error_helpers.FailOnError(err)
+
 	// display the snapshot result (if needed)
-	displaySnapshot(snap)
+	//displaySnapshot(snap)
 
 	// upload the snapshot (if needed)
 	err = publishSnapshotIfNeeded(ctx, snap)

internal/cmdconfig/cmd_targets.go

@@ -45,7 +45,7 @@ func ResolveTargets[T modconfig.ModTreeItem](cmdArgs []string, w *pworkspace.Pow
 //     in this case, convert into a query and add to workspace (to allow for simple snapshot generation)
 //
 // TODO K add unit test
-// TODO once we remove DetectionBenvhmarks this should return []T
+// TODO once we remove DetectionBechmarks this should return []T
 // https://github.com/turbot/powerpipe/issues/609
 func resolveSingleTarget[T modconfig.ModTreeItem](cmdArg string, w *pworkspace.PowerpipeWorkspace) ([]modconfig.ModTreeItem, error) {
 	typeName := resources.GenericTypeToBlockType[T]()
@@ -59,7 +59,7 @@ func resolveSingleTarget[T modconfig.ModTreeItem](cmdArg string, w *pworkspace.P
 	if helpers.IsNil(target) {
 		return nil, fmt.Errorf("'%s.%s' not found in %s (%s)", typeName, cmdArg, w.Mod.Name(), w.Path)
 	}
-	// TODO KAI CHECK QUERY ARGS LOGIC HERE
+	// TODO K CHECK QUERY ARGS LOGIC HERE
 	//if queryArgs != nil {
 	//	return nil, sperr.New("benchmarks do not support query args")
 	//}