Skip to content

Commit

Permalink
Updating imports to use joeabbey
Browse files Browse the repository at this point in the history
  • Loading branch information
joeabbey committed Oct 8, 2018
1 parent cff7d89 commit 9d79e64
Show file tree
Hide file tree
Showing 46 changed files with 57 additions and 57 deletions.
4 changes: 2 additions & 2 deletions cmd/dtr.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (

log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/thebsdbox/diver/pkg/dtr"
"github.com/joeabbey/diver/pkg/dtr"

"github.com/thebsdbox/diver/pkg/dtr/types"
"github.com/joeabbey/diver/pkg/dtr/types"
)

var dtrClient dtr.Client
Expand Down
2 changes: 1 addition & 1 deletion cmd/dtr_settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/thebsdbox/diver/pkg/dtr"
"github.com/joeabbey/diver/pkg/dtr"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/dtr_settings_set.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cmd
import (
log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/thebsdbox/diver/pkg/dtr"
"github.com/joeabbey/diver/pkg/dtr"
)

var enable bool
Expand Down
2 changes: 1 addition & 1 deletion cmd/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"

"github.com/thebsdbox/diver/pkg/store"
"github.com/joeabbey/diver/pkg/store"
)

var storeClient store.Client
Expand Down
2 changes: 1 addition & 1 deletion cmd/ucp.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"

"github.com/spf13/cobra"
"github.com/thebsdbox/diver/pkg/ucp"
"github.com/joeabbey/diver/pkg/ucp"

log "github.com/Sirupsen/logrus"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/ucp_auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package cmd
import (
log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/thebsdbox/diver/pkg/ucp"
"github.com/thebsdbox/diver/pkg/ucp/types"
"github.com/joeabbey/diver/pkg/ucp"
"github.com/joeabbey/diver/pkg/ucp/types"
)

var auth ucptypes.Account
Expand Down
4 changes: 2 additions & 2 deletions cmd/ucp_auth_grants.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/thebsdbox/diver/pkg/ucp"
"github.com/thebsdbox/diver/pkg/ucp/types"
"github.com/joeabbey/diver/pkg/ucp"
"github.com/joeabbey/diver/pkg/ucp/types"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/ucp_auth_org.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/thebsdbox/diver/pkg/ucp"
"github.com/thebsdbox/diver/pkg/ucp/types"
"github.com/joeabbey/diver/pkg/ucp"
"github.com/joeabbey/diver/pkg/ucp/types"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/ucp_auth_roles.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/thebsdbox/diver/pkg/ucp"
"github.com/joeabbey/diver/pkg/ucp"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/ucp_auth_teams.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package cmd
import (
log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/thebsdbox/diver/pkg/ucp"
"github.com/thebsdbox/diver/pkg/ucp/types"
"github.com/joeabbey/diver/pkg/ucp"
"github.com/joeabbey/diver/pkg/ucp/types"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/ucp_auth_users.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/thebsdbox/diver/pkg/ucp"
"github.com/thebsdbox/diver/pkg/ucp/types"
"github.com/joeabbey/diver/pkg/ucp"
"github.com/joeabbey/diver/pkg/ucp/types"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/ucp_build.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cmd
import (
log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/thebsdbox/diver/pkg/ucp"
"github.com/joeabbey/diver/pkg/ucp"
)

var bld ucp.BuildPlan
Expand Down
2 changes: 1 addition & 1 deletion cmd/ucp_client_bundles.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/thebsdbox/diver/pkg/ucp"
"github.com/joeabbey/diver/pkg/ucp"
)

var username string
Expand Down
4 changes: 2 additions & 2 deletions cmd/ucp_collections.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"os"
"text/tabwriter"

"github.com/thebsdbox/diver/pkg/ucp/types"
"github.com/joeabbey/diver/pkg/ucp/types"

log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/thebsdbox/diver/pkg/ucp"
"github.com/joeabbey/diver/pkg/ucp"
)

var newCollection ucptypes.Collection
Expand Down
2 changes: 1 addition & 1 deletion cmd/ucp_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/thebsdbox/diver/pkg/ucp"
"github.com/joeabbey/diver/pkg/ucp"
)

var path string
Expand Down
2 changes: 1 addition & 1 deletion cmd/ucp_containers.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/thebsdbox/diver/pkg/ucp"
"github.com/joeabbey/diver/pkg/ucp"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/ucp_interlock.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/thebsdbox/diver/pkg/ucp"
"github.com/thebsdbox/diver/pkg/ucp/types"
"github.com/joeabbey/diver/pkg/ucp"
"github.com/joeabbey/diver/pkg/ucp/types"
)

var interlockConfig ucptypes.InterlockConfig
Expand Down
4 changes: 2 additions & 2 deletions cmd/ucp_ldap.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (

log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/thebsdbox/diver/pkg/ucp"
"github.com/thebsdbox/diver/pkg/ucp/types"
"github.com/joeabbey/diver/pkg/ucp"
"github.com/joeabbey/diver/pkg/ucp/types"
)

// This are the configurable options for LDAP
Expand Down
2 changes: 1 addition & 1 deletion cmd/ucp_login.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/thebsdbox/diver/pkg/ucp"
"github.com/joeabbey/diver/pkg/ucp"
)

var session int
Expand Down
2 changes: 1 addition & 1 deletion cmd/ucp_networks.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/thebsdbox/diver/pkg/ucp"
"github.com/joeabbey/diver/pkg/ucp"
)

var force bool
Expand Down
2 changes: 1 addition & 1 deletion cmd/ucp_nodes.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/thebsdbox/diver/pkg/ucp"
"github.com/joeabbey/diver/pkg/ucp"
)

// Used to enable or disable orchestrator type
Expand Down
2 changes: 1 addition & 1 deletion cmd/ucp_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/api/types/swarm"
"github.com/spf13/cobra"
"github.com/thebsdbox/diver/pkg/ucp"
"github.com/joeabbey/diver/pkg/ucp"
)

var svc ucp.ServiceQuery
Expand Down
2 changes: 1 addition & 1 deletion cmd/ucp_support.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cmd
import (
log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/thebsdbox/diver/pkg/ucp"
"github.com/joeabbey/diver/pkg/ucp"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/ucp_swarm.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/thebsdbox/diver/pkg/ucp"
"github.com/joeabbey/diver/pkg/ucp"
)

// swarminfo
Expand Down
2 changes: 1 addition & 1 deletion cmd/ucp_update.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/thebsdbox/diver/pkg/ucp"
"github.com/joeabbey/diver/pkg/ucp"
)

// This is the ucp version that we will attempt to upgrade to
Expand Down
2 changes: 1 addition & 1 deletion docs/ucp/auth.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,4 @@ Deploy using Helm!

e.g MySQL deployment.

`helm install --name mysql stable/mysql`
`helm install --name mysql stable/mysql`
2 changes: 1 addition & 1 deletion docs/ucp/client-bundle.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ $ diver ucp client-bundle rm <ID>
```
$ diver ucp client-bundle rename <Bundle_ID> <new_label>
```
```
6 changes: 3 additions & 3 deletions docs/ucp/containers.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ The `containers list` command will return all containers across the entire clust
```
$ diver ucp containers list
Name ID Image Node
urchin.1.r7it6s218brkbnz427kruhkun 4a49c61d8ecdcc27 thebsdbox/urchin:1.2 docker01
urchin.1.r7it6s218brkbnz427kruhkun 4a49c61d8ecdcc27 joeabbey/urchin:1.2 docker01
k8s_tiller_tiller-deploy-7c66b75f7f-rcfjh_kube-system_4c8dc88a-9093-11e8-8455-0242ac11000b_1 a8bef9a7c5b1e0b7 gcr.io/kubernetes-helm/tiller docker03
dtr-scanningstore-be6fbea56f0a 6447966efb48a8a4 docker/dtr-postgres:2.5.2 docker02
dtr-notary-signer-be6fbea56f0a 9b55971453765f42 docker/dtr-notary-signer:2.5.2 docker02
Expand Down Expand Up @@ -52,11 +52,11 @@ root 2418 1596 0 Jul28 ? 00:00:26 /bin/postgreswrapper

### Watching Containers

This will present a colour coded output on memory usage of all containers that are running in a swarm cluster.. (using [urchin](http://github.com/thebsdbox/urchin) to hit memory reservations in the demo below)
This will present a colour coded output on memory usage of all containers that are running in a swarm cluster.. (using [urchin](http://github.com/joeabbey/urchin) to hit memory reservations in the demo below)


```
./diver ucp containers top
```

![](container-top.jpg)
![](container-top.jpg)
2 changes: 1 addition & 1 deletion docs/ucp/services.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ INFO[0000] Inspecting service [urchin]
ID: p59zsqz20308wr9p8y9sp7ieg
Version: 19222
Name: urchin
Image: thebsdbox/urchin:1.2@sha256:fbadb7d721cd9faabdead81323a02deb1a05993e3e60c0762eb249bed2d168d3
Image: joeabbey/urchin:1.2@sha256:fbadb7d721cd9faabdead81323a02deb1a05993e3e60c0762eb249bed2d168d3
Cmd: /urchin
Args: -w 8080
Labels:
Expand Down
2 changes: 1 addition & 1 deletion docs/ucp/upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ INFO[0000] The procedure will begin in 10 seconds, press ctrl+c to cancel
INFO[0022] Upgrade procedure has begun succesfully
```

**NOTE** The only method to watch the upgrade process is to access the UCP node that the upgrade started on and find the `ucp-agent:x.x.x` that corresponds to the upgrade version and use `docker logs --follow`.
**NOTE** The only method to watch the upgrade process is to access the UCP node that the upgrade started on and find the `ucp-agent:x.x.x` that corresponds to the upgrade version and use `docker logs --follow`.
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"strconv"

"github.com/thebsdbox/diver/cmd"
"github.com/joeabbey/diver/cmd"
)

// Version is populated from the Makefile and is tied to the release TAG
Expand Down
2 changes: 1 addition & 1 deletion pkg/dtr/dtrInfo.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os"
"text/tabwriter"

"github.com/thebsdbox/diver/pkg/dtr/types"
"github.com/joeabbey/diver/pkg/dtr/types"
)

func (c *Client) dtrClusterStatus() (*dtrtypes.DTRCluster, error) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/dtr/dtrRepositories.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"

log "github.com/Sirupsen/logrus"
"github.com/thebsdbox/diver/pkg/dtr/types"
"github.com/joeabbey/diver/pkg/dtr/types"
)

//ListAllRepositories -
Expand Down
2 changes: 1 addition & 1 deletion pkg/dtr/dtrSettings.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"

log "github.com/Sirupsen/logrus"
"github.com/thebsdbox/diver/pkg/dtr/types"
"github.com/joeabbey/diver/pkg/dtr/types"
)

//DTRCreateRepoOnPush - This will toggle the functionality to enable repositories to be created on push
Expand Down
2 changes: 1 addition & 1 deletion pkg/dtr/dtrWebhooks.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"

log "github.com/Sirupsen/logrus"
"github.com/thebsdbox/diver/pkg/dtr/types"
"github.com/joeabbey/diver/pkg/dtr/types"
)

//ListWebhooks -
Expand Down
2 changes: 1 addition & 1 deletion pkg/ucp/ucpAuth.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strconv"

log "github.com/Sirupsen/logrus"
"github.com/thebsdbox/diver/pkg/ucp/types"
"github.com/joeabbey/diver/pkg/ucp/types"
)

// AuthStatus - will return the current logged in user
Expand Down
2 changes: 1 addition & 1 deletion pkg/ucp/ucpClientBundles.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os"

log "github.com/Sirupsen/logrus"
"github.com/thebsdbox/diver/pkg/ucp/types"
"github.com/joeabbey/diver/pkg/ucp/types"
)

// GetClientBundle - will download the UCP Client Bundle
Expand Down
2 changes: 1 addition & 1 deletion pkg/ucp/ucpCollections.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"fmt"

"github.com/thebsdbox/diver/pkg/ucp/types"
"github.com/joeabbey/diver/pkg/ucp/types"

log "github.com/Sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/ucp/ucpConfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"io/ioutil"

log "github.com/Sirupsen/logrus"
"github.com/thebsdbox/diver/pkg/ucp/types"
"github.com/joeabbey/diver/pkg/ucp/types"
)

//ListConfigs - This will return a list of services
Expand Down
2 changes: 1 addition & 1 deletion pkg/ucp/ucpContainers.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"fmt"

"github.com/thebsdbox/diver/pkg/ucp/types"
"github.com/joeabbey/diver/pkg/ucp/types"

"github.com/docker/docker/api/types"

Expand Down
2 changes: 1 addition & 1 deletion pkg/ucp/ucpHRM.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"

log "github.com/Sirupsen/logrus"
"github.com/thebsdbox/diver/pkg/ucp/types"
"github.com/joeabbey/diver/pkg/ucp/types"
)

// ConfigureHRM - This will toggle the functionality to enable Image Scanning
Expand Down
Loading

0 comments on commit 9d79e64

Please sign in to comment.