Skip to content

Commit

Permalink
Vendoring cleanup (#21)
Browse files Browse the repository at this point in the history
* Use github.com/sirupsen/logrus, rather than github.com/Sirupsen/logrus

See: sirupsen/logrus@202f255
* Officially changed name to lower-case

And:
sirupsen/logrus@0afea37
sirupsen/logrus#451 (comment)

* Pin against a stable version of github.com/urfave/cli

* Move to govendor

* Run govendor sync, and check in vendored code
  • Loading branch information
sargun authored and robzienert committed Feb 8, 2018
1 parent 6748c1b commit 0723bea
Show file tree
Hide file tree
Showing 347 changed files with 177,870 additions and 51 deletions.
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
# Output of the go coverage tool, specifically when used with LiteIDE
*.out

# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
.glide/

vendor
build

.vscode
Expand Down
4 changes: 2 additions & 2 deletions actions.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
"io/ioutil"
"time"

"github.com/Sirupsen/logrus"
"github.com/ghodss/yaml"
"github.com/mitchellh/mapstructure"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/spinnaker/roer/spinnaker"
"github.com/urfave/cli"
"gopkg.in/urfave/cli.v1"
)

// PipelineSaveAction creates the ActionFunc for saving pipeline configurations.
Expand Down
13 changes: 6 additions & 7 deletions cmd/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,16 @@ import (
"errors"
"os"

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
"github.com/spinnaker/roer"
"github.com/spinnaker/roer/spinnaker"
"github.com/urfave/cli"
"gopkg.in/urfave/cli.v1"
)

// NewRoer returns a new instance of the OSS roer application
func NewRoer(version string, clientConfig spinnaker.ClientConfig) *cli.App {
cli.VersionFlag.Name = "version"
cli.HelpFlag.Name = "help"
cli.HelpFlag.Hidden = true
cli.VersionFlag = cli.BoolFlag{Name: "version"}
cli.HelpFlag = cli.BoolFlag{Name: "help", Usage: "Show Help", Hidden: true}

app := cli.NewApp()
app.Name = "roer"
Expand Down Expand Up @@ -48,7 +47,7 @@ func NewRoer(version string, clientConfig spinnaker.ClientConfig) *cli.App {
return nil
},
Action: roer.PipelineSaveJsonAction(clientConfig),
},
},
{
Name: "list",
Usage: "list all the pipelines in an application",
Expand All @@ -73,7 +72,7 @@ func NewRoer(version string, clientConfig spinnaker.ClientConfig) *cli.App {
},
Action: roer.PipelineGetConfigAction(clientConfig),
},
{
{
Name: "delete",
Usage: "delete a pipeline",
ArgsUsage: "[application] [pipelineName]",
Expand Down
2 changes: 1 addition & 1 deletion cmd/roer/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"os"

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
"github.com/spinnaker/roer/cmd"
"github.com/spinnaker/roer/spinnaker"
)
Expand Down
20 changes: 0 additions & 20 deletions glide.lock

This file was deleted.

12 changes: 0 additions & 12 deletions glide.yaml

This file was deleted.

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

"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
)

func prettyPrintJSON(j []byte) {
Expand Down
2 changes: 1 addition & 1 deletion spinnaker/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (

"strconv"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions spinnaker/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"os"
"time"

"github.com/Sirupsen/logrus"
"github.com/pkg/errors"
"github.com/urfave/cli"
"github.com/sirupsen/logrus"
"gopkg.in/urfave/cli.v1"
)

// HTTPClientFactory creates a new http.Client from the cli.Context
Expand Down
2 changes: 1 addition & 1 deletion spinnaker/model.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package spinnaker

import (
"github.com/Sirupsen/logrus"
"github.com/mitchellh/mapstructure"
"github.com/sirupsen/logrus"
)

// M allows certain responses to contain untyped data (most Spinnaker interfaces)
Expand Down
50 changes: 50 additions & 0 deletions vendor/github.com/ghodss/yaml/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

121 changes: 121 additions & 0 deletions vendor/github.com/ghodss/yaml/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0723bea

Please sign in to comment.