Skip to content

Commit

Permalink
Update pipe fittings to v2.0.0-rc.1
Browse files Browse the repository at this point in the history
  • Loading branch information
kaidaguerre committed Jan 29, 2025
1 parent 96abbdd commit 479ea05
Show file tree
Hide file tree
Showing 156 changed files with 458 additions and 456 deletions.
5 changes: 2 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ module github.com/turbot/powerpipe

go 1.23.2

replace github.com/turbot/pipe-fittings => ../pipe-fittings

require (
github.com/Masterminds/semver/v3 v3.3.0
github.com/briandowns/spinner v1.23.0 // indirect
Expand All @@ -23,7 +21,7 @@ require (
github.com/spf13/viper v1.19.0
github.com/stevenle/topsort v0.2.0
github.com/turbot/go-kit v0.10.0-rc.0
github.com/turbot/pipe-fittings v1.6.6
github.com/turbot/pipe-fittings/v2 v2.0.0-rc.1
github.com/turbot/steampipe-plugin-sdk/v5 v5.11.0
github.com/turbot/terraform-components v0.0.0-20231213122222-1f3526cab7a7 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
Expand Down Expand Up @@ -207,6 +205,7 @@ require (
github.com/tklauser/go-sysconf v0.3.9 // indirect
github.com/tklauser/numcpus v0.3.0 // indirect
github.com/tkrajina/go-reflector v0.5.6 // indirect
github.com/turbot/pipe-fittings v1.6.0 // indirect
github.com/turbot/pipes-sdk-go v0.9.1 // indirect
github.com/turbot/steampipe-plugin-code v0.7.0 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
Expand Down
4 changes: 4 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,10 @@ github.com/tkrajina/go-reflector v0.5.6 h1:hKQ0gyocG7vgMD2M3dRlYN6WBBOmdoOzJ6njQ
github.com/tkrajina/go-reflector v0.5.6/go.mod h1:ECbqLgccecY5kPmPmXg1MrHW585yMcDkVl6IvJe64T4=
github.com/turbot/go-kit v0.10.0-rc.0 h1:kd+jp2ibbIV33Hc8SsMAN410Dl9Pz6SJ40axbKUlSoA=
github.com/turbot/go-kit v0.10.0-rc.0/go.mod h1:fFQqR59I5z5JeeBLfK1PjSifn4Oprs3NiQx0CxeSJxs=
github.com/turbot/pipe-fittings v1.6.0 h1:sn4OJPQQR0fggKMNUuyvShJipZG/Ze5jR48Hl12Eokg=
github.com/turbot/pipe-fittings v1.6.0/go.mod h1:1nlRVh18QkYy9eq5pW9gpnoE2VgnQW0Y2zKzrH8Q4kI=
github.com/turbot/pipe-fittings/v2 v2.0.0-rc.1 h1:G7PpOmolqab5Pf+LKmKrHZ8OJd7ifJm3KqgxIngPXJo=
github.com/turbot/pipe-fittings/v2 v2.0.0-rc.1/go.mod h1:4srBITqYs/VWpgpqjQmJejJ3akkPVRueCHQa9CiETr0=
github.com/turbot/pipes-sdk-go v0.9.1 h1:2yRojY2wymvJn6NQyE6A0EDFV267MNe+yDLxPVvsBwM=
github.com/turbot/pipes-sdk-go v0.9.1/go.mod h1:Mb+KhvqqEdRbz/6TSZc2QWDrMa5BN3E4Xw+gPt2TRkc=
github.com/turbot/steampipe-plugin-code v0.7.0 h1:SROYIo/TI/Q/YNfXK+sAIS71umypUFm1Uz851TmoJkM=
Expand Down
12 changes: 6 additions & 6 deletions internal/cmd/check.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ import (
"github.com/spf13/viper"
"github.com/thediveo/enumflag/v2"
"github.com/turbot/go-kit/helpers"
"github.com/turbot/pipe-fittings/cmdconfig"
"github.com/turbot/pipe-fittings/constants"
"github.com/turbot/pipe-fittings/contexthelpers"
"github.com/turbot/pipe-fittings/error_helpers"
"github.com/turbot/pipe-fittings/statushooks"
"github.com/turbot/pipe-fittings/utils"
"github.com/turbot/pipe-fittings/v2/cmdconfig"
"github.com/turbot/pipe-fittings/v2/constants"
"github.com/turbot/pipe-fittings/v2/contexthelpers"
"github.com/turbot/pipe-fittings/v2/error_helpers"
"github.com/turbot/pipe-fittings/v2/statushooks"
"github.com/turbot/pipe-fittings/v2/utils"
localcmdconfig "github.com/turbot/powerpipe/internal/cmdconfig"
localconstants "github.com/turbot/powerpipe/internal/constants"
"github.com/turbot/powerpipe/internal/controldisplay"
Expand Down
22 changes: 11 additions & 11 deletions internal/cmd/dashboard.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ import (
"github.com/spf13/viper"
"github.com/thediveo/enumflag/v2"
"github.com/turbot/go-kit/helpers"
"github.com/turbot/pipe-fittings/cmdconfig"
"github.com/turbot/pipe-fittings/constants"
"github.com/turbot/pipe-fittings/contexthelpers"
"github.com/turbot/pipe-fittings/error_helpers"
"github.com/turbot/pipe-fittings/export"
"github.com/turbot/pipe-fittings/modconfig"
"github.com/turbot/pipe-fittings/pipes"
"github.com/turbot/pipe-fittings/schema"
"github.com/turbot/pipe-fittings/statushooks"
"github.com/turbot/pipe-fittings/steampipeconfig"
"github.com/turbot/pipe-fittings/workspace"
"github.com/turbot/pipe-fittings/v2/cmdconfig"
"github.com/turbot/pipe-fittings/v2/constants"
"github.com/turbot/pipe-fittings/v2/contexthelpers"
"github.com/turbot/pipe-fittings/v2/error_helpers"
"github.com/turbot/pipe-fittings/v2/export"
"github.com/turbot/pipe-fittings/v2/modconfig"
"github.com/turbot/pipe-fittings/v2/pipes"
"github.com/turbot/pipe-fittings/v2/schema"
"github.com/turbot/pipe-fittings/v2/statushooks"
"github.com/turbot/pipe-fittings/v2/steampipeconfig"
"github.com/turbot/pipe-fittings/v2/workspace"
localcmdconfig "github.com/turbot/powerpipe/internal/cmdconfig"
localconstants "github.com/turbot/powerpipe/internal/constants"
"github.com/turbot/powerpipe/internal/controlstatus"
Expand Down
14 changes: 7 additions & 7 deletions internal/cmd/detection.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ import (
"github.com/spf13/viper"
"github.com/thediveo/enumflag/v2"
"github.com/turbot/go-kit/helpers"
"github.com/turbot/pipe-fittings/cmdconfig"
"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"
"github.com/turbot/pipe-fittings/v2/cmdconfig"
"github.com/turbot/pipe-fittings/v2/constants"
"github.com/turbot/pipe-fittings/v2/error_helpers"
"github.com/turbot/pipe-fittings/v2/export"
"github.com/turbot/pipe-fittings/v2/modconfig"
"github.com/turbot/pipe-fittings/v2/statushooks"
"github.com/turbot/pipe-fittings/v2/workspace"
localcmdconfig "github.com/turbot/powerpipe/internal/cmdconfig"
localconstants "github.com/turbot/powerpipe/internal/constants"
"github.com/turbot/powerpipe/internal/controldisplay"
Expand Down
8 changes: 4 additions & 4 deletions internal/cmd/login.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import (
"bufio"
"context"
"fmt"
"github.com/turbot/pipe-fittings/pipes"
"github.com/turbot/pipe-fittings/v2/pipes"
"log"
"os"

"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/turbot/pipe-fittings/cmdconfig"
"github.com/turbot/pipe-fittings/constants"
"github.com/turbot/pipe-fittings/error_helpers"
"github.com/turbot/pipe-fittings/v2/cmdconfig"
"github.com/turbot/pipe-fittings/v2/constants"
"github.com/turbot/pipe-fittings/v2/error_helpers"
"github.com/turbot/steampipe-plugin-sdk/v5/sperr"
)

Expand Down
20 changes: 10 additions & 10 deletions internal/cmd/mod.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ import (
"github.com/spf13/viper"
"github.com/thediveo/enumflag/v2"
"github.com/turbot/go-kit/helpers"
"github.com/turbot/pipe-fittings/app_specific"
"github.com/turbot/pipe-fittings/backend"
"github.com/turbot/pipe-fittings/cmdconfig"
"github.com/turbot/pipe-fittings/constants"
"github.com/turbot/pipe-fittings/error_helpers"
"github.com/turbot/pipe-fittings/modconfig"
"github.com/turbot/pipe-fittings/modinstaller"
"github.com/turbot/pipe-fittings/parse"
"github.com/turbot/pipe-fittings/plugin"
"github.com/turbot/pipe-fittings/utils"
"github.com/turbot/pipe-fittings/v2/app_specific"
"github.com/turbot/pipe-fittings/v2/backend"
"github.com/turbot/pipe-fittings/v2/cmdconfig"
"github.com/turbot/pipe-fittings/v2/constants"
"github.com/turbot/pipe-fittings/v2/error_helpers"
"github.com/turbot/pipe-fittings/v2/modconfig"
"github.com/turbot/pipe-fittings/v2/modinstaller"
"github.com/turbot/pipe-fittings/v2/parse"
"github.com/turbot/pipe-fittings/v2/plugin"
"github.com/turbot/pipe-fittings/v2/utils"
localcmdconfig "github.com/turbot/powerpipe/internal/cmdconfig"
localconstants "github.com/turbot/powerpipe/internal/constants"
"github.com/turbot/powerpipe/internal/db_client"
Expand Down
12 changes: 6 additions & 6 deletions internal/cmd/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import (
"github.com/spf13/viper"
"github.com/thediveo/enumflag/v2"
"github.com/turbot/go-kit/helpers"
"github.com/turbot/pipe-fittings/cmdconfig"
"github.com/turbot/pipe-fittings/constants"
"github.com/turbot/pipe-fittings/error_helpers"
"github.com/turbot/pipe-fittings/export"
"github.com/turbot/pipe-fittings/steampipeconfig"
"github.com/turbot/pipe-fittings/workspace"
"github.com/turbot/pipe-fittings/v2/cmdconfig"
"github.com/turbot/pipe-fittings/v2/constants"
"github.com/turbot/pipe-fittings/v2/error_helpers"
"github.com/turbot/pipe-fittings/v2/export"
"github.com/turbot/pipe-fittings/v2/steampipeconfig"
"github.com/turbot/pipe-fittings/v2/workspace"
localcmdconfig "github.com/turbot/powerpipe/internal/cmdconfig"
localconstants "github.com/turbot/powerpipe/internal/constants"
"github.com/turbot/powerpipe/internal/dashboardexecute"
Expand Down
12 changes: 6 additions & 6 deletions internal/cmd/resource_cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (

"github.com/spf13/cobra"
"github.com/thediveo/enumflag/v2"
"github.com/turbot/pipe-fittings/cmdconfig"
"github.com/turbot/pipe-fittings/constants"
"github.com/turbot/pipe-fittings/error_helpers"
"github.com/turbot/pipe-fittings/modconfig"
"github.com/turbot/pipe-fittings/schema"
"github.com/turbot/pipe-fittings/utils"
"github.com/turbot/pipe-fittings/v2/cmdconfig"
"github.com/turbot/pipe-fittings/v2/constants"
"github.com/turbot/pipe-fittings/v2/error_helpers"
"github.com/turbot/pipe-fittings/v2/modconfig"
"github.com/turbot/pipe-fittings/v2/schema"
"github.com/turbot/pipe-fittings/v2/utils"
localconstants "github.com/turbot/powerpipe/internal/constants"
"github.com/turbot/powerpipe/internal/display"
"github.com/turbot/powerpipe/internal/resources"
Expand Down
14 changes: 7 additions & 7 deletions internal/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import (
"github.com/mattn/go-isatty"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/turbot/pipe-fittings/app_specific"
"github.com/turbot/pipe-fittings/cmdconfig"
"github.com/turbot/pipe-fittings/constants"
"github.com/turbot/pipe-fittings/error_helpers"
"github.com/turbot/pipe-fittings/modconfig"
"github.com/turbot/pipe-fittings/statushooks"
"github.com/turbot/pipe-fittings/utils"
"github.com/turbot/pipe-fittings/v2/app_specific"
"github.com/turbot/pipe-fittings/v2/cmdconfig"
"github.com/turbot/pipe-fittings/v2/constants"
"github.com/turbot/pipe-fittings/v2/error_helpers"
"github.com/turbot/pipe-fittings/v2/modconfig"
"github.com/turbot/pipe-fittings/v2/statushooks"
"github.com/turbot/pipe-fittings/v2/utils"
localconstants "github.com/turbot/powerpipe/internal/constants"
"github.com/turbot/powerpipe/internal/resources"
)
Expand Down
8 changes: 4 additions & 4 deletions internal/cmd/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (

"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/turbot/pipe-fittings/cmdconfig"
"github.com/turbot/pipe-fittings/constants"
"github.com/turbot/pipe-fittings/error_helpers"
"github.com/turbot/pipe-fittings/utils"
"github.com/turbot/pipe-fittings/v2/cmdconfig"
"github.com/turbot/pipe-fittings/v2/constants"
"github.com/turbot/pipe-fittings/v2/error_helpers"
"github.com/turbot/pipe-fittings/v2/utils"
localcmdconfig "github.com/turbot/powerpipe/internal/cmdconfig"
localconstants "github.com/turbot/powerpipe/internal/constants"
"github.com/turbot/powerpipe/internal/dashboardassets"
Expand Down
16 changes: 8 additions & 8 deletions internal/cmdconfig/app_specific.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ import (
"github.com/Masterminds/semver/v3"
"github.com/spf13/viper"
"github.com/turbot/go-kit/files"
"github.com/turbot/pipe-fittings/app_specific"
"github.com/turbot/pipe-fittings/app_specific_connection"
"github.com/turbot/pipe-fittings/cmdconfig"
"github.com/turbot/pipe-fittings/connection"
"github.com/turbot/pipe-fittings/error_helpers"
"github.com/turbot/pipe-fittings/filepaths"
"github.com/turbot/pipe-fittings/modconfig"
"github.com/turbot/pipe-fittings/parse"
"github.com/turbot/pipe-fittings/v2/app_specific"
"github.com/turbot/pipe-fittings/v2/app_specific_connection"
"github.com/turbot/pipe-fittings/v2/cmdconfig"
"github.com/turbot/pipe-fittings/v2/connection"
"github.com/turbot/pipe-fittings/v2/error_helpers"
"github.com/turbot/pipe-fittings/v2/filepaths"
"github.com/turbot/pipe-fittings/v2/modconfig"
"github.com/turbot/pipe-fittings/v2/parse"
pparse "github.com/turbot/powerpipe/internal/parse"
"github.com/turbot/powerpipe/internal/resources"
)
Expand Down
22 changes: 11 additions & 11 deletions internal/cmdconfig/cmd_hooks.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/turbot/go-kit/helpers"
"github.com/turbot/pipe-fittings/app_specific"
"github.com/turbot/pipe-fittings/cmdconfig"
"github.com/turbot/pipe-fittings/connection"
"github.com/turbot/pipe-fittings/constants"
"github.com/turbot/pipe-fittings/error_helpers"
"github.com/turbot/pipe-fittings/filepaths"
"github.com/turbot/pipe-fittings/parse"
"github.com/turbot/pipe-fittings/pipes"
"github.com/turbot/pipe-fittings/task"
"github.com/turbot/pipe-fittings/utils"
"github.com/turbot/pipe-fittings/workspace_profile"
"github.com/turbot/pipe-fittings/v2/app_specific"
"github.com/turbot/pipe-fittings/v2/cmdconfig"
"github.com/turbot/pipe-fittings/v2/connection"
"github.com/turbot/pipe-fittings/v2/constants"
"github.com/turbot/pipe-fittings/v2/error_helpers"
"github.com/turbot/pipe-fittings/v2/filepaths"
"github.com/turbot/pipe-fittings/v2/parse"
"github.com/turbot/pipe-fittings/v2/pipes"
"github.com/turbot/pipe-fittings/v2/task"
"github.com/turbot/pipe-fittings/v2/utils"
"github.com/turbot/pipe-fittings/v2/workspace_profile"
"github.com/turbot/powerpipe/internal/logger"
"github.com/turbot/powerpipe/internal/powerpipeconfig"
"github.com/turbot/steampipe-plugin-sdk/v5/plugin"
Expand Down
6 changes: 3 additions & 3 deletions internal/cmdconfig/cmd_targets.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (

"github.com/spf13/viper"
"github.com/turbot/go-kit/helpers"
"github.com/turbot/pipe-fittings/constants"
"github.com/turbot/pipe-fittings/modconfig"
"github.com/turbot/pipe-fittings/workspace"
"github.com/turbot/pipe-fittings/v2/constants"
"github.com/turbot/pipe-fittings/v2/modconfig"
"github.com/turbot/pipe-fittings/v2/workspace"
"github.com/turbot/powerpipe/internal/resources"
pworkspace "github.com/turbot/powerpipe/internal/workspace"
"github.com/turbot/steampipe-plugin-sdk/v5/sperr"
Expand Down
2 changes: 1 addition & 1 deletion internal/cmdconfig/diagnostics.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"sort"
"strings"

"github.com/turbot/pipe-fittings/error_helpers"
"github.com/turbot/pipe-fittings/v2/error_helpers"
"github.com/turbot/powerpipe/internal/constants"

"github.com/spf13/viper"
Expand Down
2 changes: 1 addition & 1 deletion internal/cmdconfig/flag.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package cmdconfig

import (
"github.com/spf13/cobra"
"github.com/turbot/pipe-fittings/cmdconfig"
"github.com/turbot/pipe-fittings/v2/cmdconfig"
)

// TODO temp until new pipe-fittings release
Expand Down
8 changes: 4 additions & 4 deletions internal/cmdconfig/mappings.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package cmdconfig

import (
"github.com/spf13/cobra"
"github.com/turbot/pipe-fittings/app_specific"
"github.com/turbot/pipe-fittings/cmdconfig"
"github.com/turbot/pipe-fittings/constants"
"github.com/turbot/pipe-fittings/filepaths"
"github.com/turbot/pipe-fittings/v2/app_specific"
"github.com/turbot/pipe-fittings/v2/cmdconfig"
"github.com/turbot/pipe-fittings/v2/constants"
"github.com/turbot/pipe-fittings/v2/filepaths"
localconstants "github.com/turbot/powerpipe/internal/constants"
"golang.org/x/exp/maps"
)
Expand Down
10 changes: 5 additions & 5 deletions internal/cmdconfig/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (

"github.com/spf13/viper"
filehelpers "github.com/turbot/go-kit/files"
"github.com/turbot/pipe-fittings/connection"
"github.com/turbot/pipe-fittings/constants"
"github.com/turbot/pipe-fittings/error_helpers"
"github.com/turbot/pipe-fittings/pipes"
"github.com/turbot/pipe-fittings/steampipeconfig"
"github.com/turbot/pipe-fittings/v2/connection"
"github.com/turbot/pipe-fittings/v2/constants"
"github.com/turbot/pipe-fittings/v2/error_helpers"
"github.com/turbot/pipe-fittings/v2/pipes"
"github.com/turbot/pipe-fittings/v2/steampipeconfig"
"github.com/turbot/powerpipe/internal/powerpipeconfig"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/constants/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package constants
import (
"fmt"

"github.com/turbot/pipe-fittings/constants"
"github.com/turbot/pipe-fittings/v2/constants"
)

type ErrorNoModDefinition struct{}
Expand Down
2 changes: 1 addition & 1 deletion internal/constants/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package constants

import (
"github.com/thediveo/enumflag/v2"
"github.com/turbot/pipe-fittings/constants"
"github.com/turbot/pipe-fittings/v2/constants"
)

type OutputMode enumflag.Flag
Expand Down
4 changes: 2 additions & 2 deletions internal/controldisplay/color_scheme.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"reflect"

"github.com/logrusorgru/aurora"
"github.com/turbot/pipe-fittings/constants"
"github.com/turbot/pipe-fittings/utils"
"github.com/turbot/pipe-fittings/v2/constants"
"github.com/turbot/pipe-fittings/v2/utils"
)

type colorFunc func(interface{}) aurora.Value
Expand Down
2 changes: 1 addition & 1 deletion internal/controldisplay/control.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/spf13/viper"
typehelpers "github.com/turbot/go-kit/types"
"github.com/turbot/pipe-fittings/constants"
"github.com/turbot/pipe-fittings/v2/constants"
"github.com/turbot/powerpipe/internal/controlexecute"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/controldisplay/control_exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"io"

"github.com/turbot/pipe-fittings/contexthelpers"
"github.com/turbot/pipe-fittings/export"
"github.com/turbot/pipe-fittings/v2/contexthelpers"
"github.com/turbot/pipe-fittings/v2/export"
"github.com/turbot/powerpipe/internal/controlexecute"
"github.com/turbot/powerpipe/internal/dashboardexecute"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/controldisplay/control_result.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/spf13/viper"
"github.com/turbot/go-kit/helpers"
"github.com/turbot/pipe-fittings/constants"
"github.com/turbot/pipe-fittings/v2/constants"
"github.com/turbot/powerpipe/internal/controlexecute"
)

Expand Down
Loading

0 comments on commit 479ea05

Please sign in to comment.