Skip to content

Commit

Permalink
upgrade to version 2.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
gsalhov authored and gsalhov committed Aug 30, 2022
1 parent b4f4aae commit b97a78b
Show file tree
Hide file tree
Showing 50 changed files with 179 additions and 178 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ build:
go build \
-tags="containers_image_openpgp exclude_graphdriver_devicemapper exclude_graphdriver_btrfs" \
-o bin/darwin/cbctl \
-ldflags "-X 'gitlab.bit9.local/octarine/cbctl/internal/version.version=${version}' \
-X 'gitlab.bit9.local/octarine/cbctl/internal/version.buildDate=${build_date}'" \
-ldflags "-X 'github.com/vmware/carbon-black-cloud-container-cli/internal/version.version=${version}' \
-X 'github.com/vmware/carbon-black-cloud-container-cli/internal/version.buildDate=${build_date}'" \
main.go

# build binary for linux
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
go build \
-tags="containers_image_openpgp exclude_graphdriver_devicemapper exclude_graphdriver_btrfs" \
-o bin/linux/cbctl \
-ldflags "-X 'gitlab.bit9.local/octarine/cbctl/internal/version.version=${version}' \
-X 'gitlab.bit9.local/octarine/cbctl/internal/version.buildDate=${build_date}'" \
-ldflags "-X 'github.com/vmware/carbon-black-cloud-container-cli/internal/version.version=${version}' \
-X 'github.com/vmware/carbon-black-cloud-container-cli/internal/version.buildDate=${build_date}'" \
main.go


Expand Down
2 changes: 0 additions & 2 deletions auth/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
Extract the username and password from docker config json for the appropriate registry.
Returns empty strings for anonymous authentication when a registry entry isn't found.

Vendored from <https://gitlab.eng.vmware.com/vulnerability-scanning-enablement/snyk-scanner-integration/-/tree/main/images/scanner/auth>.

## Build

```sh
Expand Down
12 changes: 6 additions & 6 deletions cmd/auth/set.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/spf13/viper"
keyring "github.com/zalando/go-keyring"
"gitlab.bit9.local/octarine/cbctl/internal/bus"
"gitlab.bit9.local/octarine/cbctl/internal/config"
"gitlab.bit9.local/octarine/cbctl/internal/terminalui"
"gitlab.bit9.local/octarine/cbctl/internal/util/printtool"
"gitlab.bit9.local/octarine/cbctl/pkg/cberr"
"github.com/vmware/carbon-black-cloud-container-cli/internal/bus"
"github.com/vmware/carbon-black-cloud-container-cli/internal/config"
"github.com/vmware/carbon-black-cloud-container-cli/internal/terminalui"
"github.com/vmware/carbon-black-cloud-container-cli/internal/util/printtool"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/cberr"
"github.com/zalando/go-keyring"
)

const numArgs = 2
Expand Down
20 changes: 10 additions & 10 deletions cmd/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ import (
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"gitlab.bit9.local/octarine/cbctl/cmd/auth"
configcmd "gitlab.bit9.local/octarine/cbctl/cmd/config"
"gitlab.bit9.local/octarine/cbctl/cmd/image"
"gitlab.bit9.local/octarine/cbctl/cmd/k8sobject"
"gitlab.bit9.local/octarine/cbctl/cmd/user"
"gitlab.bit9.local/octarine/cbctl/cmd/version"
"gitlab.bit9.local/octarine/cbctl/internal"
"gitlab.bit9.local/octarine/cbctl/internal/bus"
"gitlab.bit9.local/octarine/cbctl/internal/config"
"gitlab.bit9.local/octarine/cbctl/pkg/cberr"
"github.com/vmware/carbon-black-cloud-container-cli/cmd/auth"
configcmd "github.com/vmware/carbon-black-cloud-container-cli/cmd/config"
"github.com/vmware/carbon-black-cloud-container-cli/cmd/image"
"github.com/vmware/carbon-black-cloud-container-cli/cmd/k8sobject"
"github.com/vmware/carbon-black-cloud-container-cli/cmd/user"
"github.com/vmware/carbon-black-cloud-container-cli/cmd/version"
"github.com/vmware/carbon-black-cloud-container-cli/internal"
"github.com/vmware/carbon-black-cloud-container-cli/internal/bus"
"github.com/vmware/carbon-black-cloud-container-cli/internal/config"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/cberr"
)

var defaultConfigHome string
Expand Down
2 changes: 1 addition & 1 deletion cmd/cmd_internal_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"bytes"
"testing"

keyring "github.com/zalando/go-keyring"
"github.com/zalando/go-keyring"
)

func TestCommandLineHelpText(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions cmd/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import (
"github.com/manifoldco/promptui"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"gitlab.bit9.local/octarine/cbctl/internal"
"gitlab.bit9.local/octarine/cbctl/internal/bus"
"gitlab.bit9.local/octarine/cbctl/internal/config"
"gitlab.bit9.local/octarine/cbctl/internal/terminalui"
"gitlab.bit9.local/octarine/cbctl/internal/util/printtool"
"gitlab.bit9.local/octarine/cbctl/pkg/cberr"
"github.com/vmware/carbon-black-cloud-container-cli/internal"
"github.com/vmware/carbon-black-cloud-container-cli/internal/bus"
"github.com/vmware/carbon-black-cloud-container-cli/internal/config"
"github.com/vmware/carbon-black-cloud-container-cli/internal/terminalui"
"github.com/vmware/carbon-black-cloud-container-cli/internal/util/printtool"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/cberr"
)

const numArgs = 2
Expand Down
4 changes: 2 additions & 2 deletions cmd/image/image.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package image

import (
"github.com/spf13/cobra"
"gitlab.bit9.local/octarine/cbctl/pkg/presenter"
"gitlab.bit9.local/octarine/cbctl/pkg/scan"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/presenter"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/scan"
)

type (
Expand Down
16 changes: 8 additions & 8 deletions cmd/image/packages.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import (

"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"gitlab.bit9.local/octarine/cbctl/internal"
"gitlab.bit9.local/octarine/cbctl/internal/bus"
"gitlab.bit9.local/octarine/cbctl/internal/terminalui"
"gitlab.bit9.local/octarine/cbctl/internal/util/printtool"
"gitlab.bit9.local/octarine/cbctl/pkg/cberr"
"gitlab.bit9.local/octarine/cbctl/pkg/model/image"
"gitlab.bit9.local/octarine/cbctl/pkg/presenter"
"gitlab.bit9.local/octarine/cbctl/pkg/scan"
"github.com/vmware/carbon-black-cloud-container-cli/internal"
"github.com/vmware/carbon-black-cloud-container-cli/internal/bus"
"github.com/vmware/carbon-black-cloud-container-cli/internal/terminalui"
"github.com/vmware/carbon-black-cloud-container-cli/internal/util/printtool"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/cberr"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/model/image"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/presenter"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/scan"
)

// PackagesCmd will print the image sbom.
Expand Down
22 changes: 11 additions & 11 deletions cmd/image/scan.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@ package image
import (
"context"
"fmt"
"gitlab.bit9.local/octarine/cbctl/pkg/model/layers"
"sync"

"github.com/docker/docker/api/types"
"github.com/docker/docker/client"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"gitlab.bit9.local/octarine/cbctl/internal"
"gitlab.bit9.local/octarine/cbctl/internal/bus"
"gitlab.bit9.local/octarine/cbctl/internal/config"
"gitlab.bit9.local/octarine/cbctl/internal/terminalui"
"gitlab.bit9.local/octarine/cbctl/internal/util/printtool"
"gitlab.bit9.local/octarine/cbctl/pkg/cberr"
"gitlab.bit9.local/octarine/cbctl/pkg/model/image"
"gitlab.bit9.local/octarine/cbctl/pkg/presenter"
"gitlab.bit9.local/octarine/cbctl/pkg/scan"
"github.com/vmware/carbon-black-cloud-container-cli/internal"
"github.com/vmware/carbon-black-cloud-container-cli/internal/bus"
"github.com/vmware/carbon-black-cloud-container-cli/internal/config"
"github.com/vmware/carbon-black-cloud-container-cli/internal/terminalui"
"github.com/vmware/carbon-black-cloud-container-cli/internal/util/printtool"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/cberr"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/model/image"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/model/layers"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/presenter"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/scan"
)

var scanHandler *scan.Handler
Expand Down Expand Up @@ -109,7 +109,7 @@ func actualScan(input string, handler *scan.Handler, buildStep, namespace string
}

if errLayers != nil {
// Not directly exposed to customers so we don't treat this as fatal error yet
// Not directly exposed to customers, so we don't treat this as fatal error yet
logrus.WithError(errLayers).Debugln(fmt.Sprintf("failed to calculate layers for image"))
}

Expand Down
22 changes: 11 additions & 11 deletions cmd/image/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ import (
"fmt"

"github.com/spf13/cobra"
"gitlab.bit9.local/octarine/cbctl/internal"
"gitlab.bit9.local/octarine/cbctl/internal/bus"
"gitlab.bit9.local/octarine/cbctl/internal/config"
"gitlab.bit9.local/octarine/cbctl/internal/terminalui"
"gitlab.bit9.local/octarine/cbctl/internal/util/printtool"
"gitlab.bit9.local/octarine/cbctl/internal/util/tabletool"
"gitlab.bit9.local/octarine/cbctl/pkg/cberr"
"gitlab.bit9.local/octarine/cbctl/pkg/model/image"
"gitlab.bit9.local/octarine/cbctl/pkg/presenter"
"gitlab.bit9.local/octarine/cbctl/pkg/scan"
"gitlab.bit9.local/octarine/cbctl/pkg/validate"
"github.com/vmware/carbon-black-cloud-container-cli/internal"
"github.com/vmware/carbon-black-cloud-container-cli/internal/bus"
"github.com/vmware/carbon-black-cloud-container-cli/internal/config"
"github.com/vmware/carbon-black-cloud-container-cli/internal/terminalui"
"github.com/vmware/carbon-black-cloud-container-cli/internal/util/printtool"
"github.com/vmware/carbon-black-cloud-container-cli/internal/util/tabletool"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/cberr"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/model/image"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/presenter"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/scan"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/validate"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/k8sobject/k8sobject.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package k8sobject

import (
"github.com/spf13/cobra"
"gitlab.bit9.local/octarine/cbctl/pkg/presenter"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/presenter"
)

type (
Expand Down
12 changes: 6 additions & 6 deletions cmd/k8sobject/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
"fmt"

"github.com/spf13/cobra"
"gitlab.bit9.local/octarine/cbctl/internal/bus"
"gitlab.bit9.local/octarine/cbctl/internal/config"
"gitlab.bit9.local/octarine/cbctl/internal/terminalui"
"gitlab.bit9.local/octarine/cbctl/pkg/cberr"
"gitlab.bit9.local/octarine/cbctl/pkg/presenter"
"gitlab.bit9.local/octarine/cbctl/pkg/validate"
"github.com/vmware/carbon-black-cloud-container-cli/internal/bus"
"github.com/vmware/carbon-black-cloud-container-cli/internal/config"
"github.com/vmware/carbon-black-cloud-container-cli/internal/terminalui"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/cberr"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/presenter"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/validate"
)

var (
Expand Down
12 changes: 6 additions & 6 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import (

"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"gitlab.bit9.local/octarine/cbctl/internal"
"gitlab.bit9.local/octarine/cbctl/internal/bus"
"gitlab.bit9.local/octarine/cbctl/internal/config"
"gitlab.bit9.local/octarine/cbctl/internal/util/memorytool"
"gitlab.bit9.local/octarine/cbctl/internal/version"
"gitlab.bit9.local/octarine/cbctl/pkg/cberr"
"github.com/vmware/carbon-black-cloud-container-cli/internal"
"github.com/vmware/carbon-black-cloud-container-cli/internal/bus"
"github.com/vmware/carbon-black-cloud-container-cli/internal/config"
"github.com/vmware/carbon-black-cloud-container-cli/internal/util/memorytool"
"github.com/vmware/carbon-black-cloud-container-cli/internal/version"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/cberr"
)

var ctx, cancel = context.WithCancel(context.Background())
Expand Down
6 changes: 3 additions & 3 deletions cmd/user/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"reflect"

"github.com/spf13/cobra"
"gitlab.bit9.local/octarine/cbctl/internal/bus"
"gitlab.bit9.local/octarine/cbctl/internal/config"
"gitlab.bit9.local/octarine/cbctl/internal/terminalui"
"github.com/vmware/carbon-black-cloud-container-cli/internal/bus"
"github.com/vmware/carbon-black-cloud-container-cli/internal/config"
"github.com/vmware/carbon-black-cloud-container-cli/internal/terminalui"
)

// AddCmd will return the user add sub command.
Expand Down
8 changes: 4 additions & 4 deletions cmd/user/del.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (

"github.com/manifoldco/promptui"
"github.com/spf13/cobra"
keyring "github.com/zalando/go-keyring"
"gitlab.bit9.local/octarine/cbctl/internal/bus"
"gitlab.bit9.local/octarine/cbctl/internal/config"
"gitlab.bit9.local/octarine/cbctl/internal/terminalui"
"github.com/vmware/carbon-black-cloud-container-cli/internal/bus"
"github.com/vmware/carbon-black-cloud-container-cli/internal/config"
"github.com/vmware/carbon-black-cloud-container-cli/internal/terminalui"
"github.com/zalando/go-keyring"
)

// DelCmd will return the user delete sub command.
Expand Down
8 changes: 4 additions & 4 deletions cmd/user/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"github.com/manifoldco/promptui"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"gitlab.bit9.local/octarine/cbctl/internal/bus"
"gitlab.bit9.local/octarine/cbctl/internal/config"
"gitlab.bit9.local/octarine/cbctl/internal/terminalui"
"gitlab.bit9.local/octarine/cbctl/pkg/cberr"
"github.com/vmware/carbon-black-cloud-container-cli/internal/bus"
"github.com/vmware/carbon-black-cloud-container-cli/internal/config"
"github.com/vmware/carbon-black-cloud-container-cli/internal/terminalui"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/cberr"
)

// ListCmd will return the user list sub command.
Expand Down
10 changes: 5 additions & 5 deletions cmd/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package version

import (
"github.com/spf13/cobra"
"gitlab.bit9.local/octarine/cbctl/internal"
"gitlab.bit9.local/octarine/cbctl/internal/bus"
"gitlab.bit9.local/octarine/cbctl/internal/terminalui"
"gitlab.bit9.local/octarine/cbctl/internal/util/printtool"
"gitlab.bit9.local/octarine/cbctl/internal/version"
"github.com/vmware/carbon-black-cloud-container-cli/internal"
"github.com/vmware/carbon-black-cloud-container-cli/internal/bus"
"github.com/vmware/carbon-black-cloud-container-cli/internal/terminalui"
"github.com/vmware/carbon-black-cloud-container-cli/internal/util/printtool"
"github.com/vmware/carbon-black-cloud-container-cli/internal/version"
)

// Cmd will return the version command.
Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module gitlab.bit9.local/octarine/cbctl
module github.com/vmware/carbon-black-cloud-container-cli

go 1.18

Expand Down Expand Up @@ -50,7 +50,7 @@ require (
github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b // indirect
github.com/containers/ocicrypt v1.1.3 // indirect
github.com/containers/storage v1.24.8 // indirect
github.com/danieljoos/wincred v1.1.0 // indirect
github.com/danieljoos/wincred v1.1.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/cli v20.10.12+incompatible // indirect
github.com/docker/distribution v2.8.0+incompatible // indirect
Expand Down Expand Up @@ -110,7 +110,7 @@ require (
github.com/prometheus/procfs v0.7.3 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/scylladb/go-set v1.0.3-0.20200225121959-cc7b2070d91e // indirect
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d // indirect
github.com/smartystreets/assertions v1.0.0 // indirect
github.com/spdx/tools-golang v0.2.0 // indirect
github.com/spf13/afero v1.8.2 // indirect
github.com/spf13/cast v1.4.1 // indirect
Expand Down
7 changes: 5 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,9 @@ github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1S
github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s=
github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8=
github.com/daixiang0/gci v0.2.9/go.mod h1:+4dZ7TISfSmqfAGv59ePaHfNzgGtIkHAhhdKggP1JAc=
github.com/danieljoos/wincred v1.1.0 h1:3RNcEpBg4IhIChZdFRSdlQt1QjCp1sMAPIrOnm7Yf8g=
github.com/danieljoos/wincred v1.1.0/go.mod h1:XYlo+eRTsVA9aHGp7NGjFkPla4m+DCL7hqDjlFjiygg=
github.com/danieljoos/wincred v1.1.1 h1:FgOybUqUGGwgBz+ga92qD4f/ZPvuPryRjashrk/p9IA=
github.com/danieljoos/wincred v1.1.1/go.mod h1:gSBQmTx6G0VmLowygiA7ZD0p0E09HJ68vta8z/RT2d0=
github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
Expand Down Expand Up @@ -971,8 +972,9 @@ github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic
github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/sivchari/tenv v1.4.7/go.mod h1:5nF+bITvkebQVanjU6IuMbvIot/7ReNsUV7I5NbprB0=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
github.com/smartystreets/assertions v1.0.0 h1:UVQPSSmc3qtTi+zPPkCXvZX9VvW/xT/NsRvKfwY81a8=
github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=
github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
Expand Down Expand Up @@ -1019,6 +1021,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
github.com/stretchr/objx v0.3.0 h1:NGXK3lHquSN08v5vWalVI/L8XU9hdzE/G6xsrze47As=
github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
github.com/stretchr/testify v0.0.0-20170130113145-4d4bfba8f1d1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
Expand Down
6 changes: 3 additions & 3 deletions internal/bus/event.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package bus
import (
"fmt"

"gitlab.bit9.local/octarine/cbctl/internal"
"gitlab.bit9.local/octarine/cbctl/pkg/cberr"
"github.com/vmware/carbon-black-cloud-container-cli/internal"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/cberr"
)

// EventType is the type of an event message.
// EventType is the type of event message.
type EventType string

// All the event types for the bus.
Expand Down
6 changes: 3 additions & 3 deletions internal/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (

"github.com/sirupsen/logrus"
"github.com/spf13/viper"
keyring "github.com/zalando/go-keyring"
"gitlab.bit9.local/octarine/cbctl/internal"
"gitlab.bit9.local/octarine/cbctl/pkg/cberr"
"github.com/vmware/carbon-black-cloud-container-cli/internal"
"github.com/vmware/carbon-black-cloud-container-cli/pkg/cberr"
"github.com/zalando/go-keyring"
)

var (
Expand Down
Loading

0 comments on commit b97a78b

Please sign in to comment.