Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

Commit

Permalink
vendor/ dependency rationalization (#1340)
Browse files Browse the repository at this point in the history 
* rationalized vendor directory

- updated dependency declarations and version pinning (glide.lock)
- updated dependent code under vendor/
- added new `build-vendor` target to aid periodic rationalizations like this

* preferring build-binary

* testing

* delete sirupsen

* add sirupsen

* don’t need build-vendor
  • Loading branch information
@jackfrancis
jackfrancis authored Aug 23, 2017
1 parent eaad0b0 commit 7462573
Show file tree
Hide file tree
Showing 1,378 changed files with 616,371 additions and 7,618 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ jobs:
command: make test-style
- run:
name: Build binaries
command: make build
command: make build-binary
- run:
name: Run unit tests
command: make test
- store_test_results:
path: test/junit
- run:
name: Generate test coverage results
command: make build coverage
command: make coverage
non-k8s-pr-e2e:
working_directory: /go/src/github.com/Azure/acs-engine
docker:
Expand Down
5 changes: 3 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ build: generate
GOBIN=$(BINDIR) $(GO) install $(GOFLAGS) -ldflags '$(LDFLAGS)'
cd test/acs-engine-test; go build

build-binary: bootstrap generate
build-binary: generate
go build -v -ldflags "${LDFLAGS}" -o ${BINARY_DEST_DIR}/acs-engine .

# usage: make clean build-cross dist VERSION=v0.4.0
Expand Down Expand Up @@ -110,11 +110,12 @@ ifndef HAS_GOMETALINTER
go get -u github.com/alecthomas/gometalinter
gometalinter --install
endif
glide install
ifndef HAS_GINKGO
go get -u github.com/onsi/ginkgo/ginkgo
endif

build-vendor:
${DEV_ENV_CMD} rm -f glide.lock && rm -Rf vendor/ && glide --debug install --force

ci: bootstrap test-style build test lint
./scripts/coverage.sh --coveralls
Expand Down
2 changes: 1 addition & 1 deletion cmd/deploy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"strconv"
"time"

log "github.com/Sirupsen/logrus"
"github.com/leonelquinteros/gotext"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"

"encoding/json"
Expand Down
2 changes: 1 addition & 1 deletion cmd/deploy_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/Azure/acs-engine/pkg/api"
"github.com/Azure/acs-engine/pkg/armhelpers"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)

const ExampleAPIModel = `{
Expand Down
2 changes: 1 addition & 1 deletion cmd/generate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/Azure/acs-engine/pkg/acsengine"
"github.com/Azure/acs-engine/pkg/api"
"github.com/Azure/acs-engine/pkg/i18n"
log "github.com/Sirupsen/logrus"
"github.com/leonelquinteros/gotext"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/root.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/Azure/acs-engine/pkg/armhelpers"

"github.com/Azure/go-autorest/autorest/azure"
log "github.com/Sirupsen/logrus"
"github.com/satori/go.uuid"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
flag "github.com/spf13/pflag"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/upgrade.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/Azure/acs-engine/pkg/operations/kubernetesupgrade"
"github.com/leonelquinteros/gotext"

log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/version.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cmd

import (
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/version_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package cmd
import (
"fmt"

logtest "github.com/Sirupsen/logrus/hooks/test"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
logtest "github.com/sirupsen/logrus/hooks/test"
)

var _ = Describe("the version command", func() {
Expand Down
64 changes: 51 additions & 13 deletions glide.lock
View file

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

13 changes: 7 additions & 6 deletions glide.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,22 @@ import:
- autorest/azure
- autorest/to
- autorest/date
- package: github.com/Sirupsen/logrus
version: v0.11.5
repo: https://github.com/sirupsen/logrus
- package: github.com/sirupsen/logrus
version: v1.0.3
- package: github.com/ghodss/yaml
version: v1.0.0
- package: github.com/mitchellh/go-homedir
version: b8bc1bf767474819792c23f32d8286a45736f1c6
- package: github.com/prometheus/common
version: 61f87aac8082fa8c3c5655c7608d7478d46ac2ad # update this every release cycle
subpackages:
- log
- package: github.com/satori/go.uuid
version: v1.1.0
- package: github.com/spf13/cobra
version: 4cdb38c072b86bf795d2c81de50784d9fdd6eb77
- package: github.com/spf13/pflag
version: v1.0.0
- package: github.com/leonelquinteros/gotext
version: a735812a72672008b3902f8b2bc1302166a9a8ea
- package: gopkg.in/go-playground/validator.v9
Expand All @@ -42,6 +43,7 @@ import:
- package: github.com/go-playground/universal-translator
version: v0.16.0
- package: golang.org/x/crypto
version: eb71ad9bd329b5ac0fd0148dd99bd62e8be8e035 # update this every release cycle
subpackages:
- ssh
- package: github.com/alexcesaro/statsd
Expand All @@ -53,8 +55,7 @@ import:
- package: github.com/imdario/mergo
version: ^0.2.2
testImport:
# glide isn't able to mutually reconcile pinned versions of these deps
- package: github.com/onsi/gomega
- package: github.com/onsi/ginkgo
version: v1.3.1
- package: github.com/kelseyhightower/envconfig
version: ~1.3.0
- package: github.com/kelseyhightower/envconfig
2 changes: 1 addition & 1 deletion main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package main

import (
"github.com/Azure/acs-engine/cmd"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/acsengine/engine.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"strings"
"text/template"

//log "github.com/Sirupsen/logrus"
//log "github.com/sirupsen/logrus"
"github.com/Azure/acs-engine/pkg/api"
"github.com/Azure/acs-engine/pkg/i18n"
"github.com/Masterminds/semver"
Expand Down
2 changes: 1 addition & 1 deletion pkg/acsengine/filesaver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"path"

"github.com/Azure/acs-engine/pkg/i18n"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)

// FileSaver represents the object that save string or byte data to file
Expand Down
2 changes: 1 addition & 1 deletion pkg/acsengine/pki.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"net"
"time"

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

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/acsengine/ssh.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"io"

"github.com/Azure/acs-engine/pkg/i18n"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"golang.org/x/crypto/ssh"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/acsengine/tenantid.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/Azure/azure-sdk-for-go/arm/resources/subscriptions"
"github.com/Azure/go-autorest/autorest/azure"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)

// GetTenantID figures out the AAD tenant ID of the subscription by making an
Expand Down
2 changes: 1 addition & 1 deletion pkg/acsengine/transform.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/Azure/acs-engine/pkg/i18n"
"github.com/Azure/azure-sdk-for-go/arm/compute"
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/acsengine/transform_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"testing"

"github.com/Azure/acs-engine/pkg/i18n"
"github.com/Sirupsen/logrus"
. "github.com/onsi/gomega"
"github.com/sirupsen/logrus"
)

func TestNormalizeForVMSSScaling(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/apiloader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/Azure/acs-engine/pkg/api/v20170701"
"github.com/Azure/acs-engine/pkg/api/vlabs"
"github.com/Azure/acs-engine/pkg/i18n"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)

// Apiloader represents the object that loads api model
Expand Down
2 changes: 1 addition & 1 deletion pkg/armhelpers/azureclient.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"github.com/Azure/go-autorest/autorest/adal"
"github.com/Azure/go-autorest/autorest/azure"
"github.com/Azure/go-autorest/autorest/to"
log "github.com/Sirupsen/logrus"
"github.com/mitchellh/go-homedir"
log "github.com/sirupsen/logrus"

"github.com/Azure/acs-engine/pkg/acsengine"
"github.com/Azure/azure-sdk-for-go/arm/disk"
Expand Down
2 changes: 1 addition & 1 deletion pkg/armhelpers/deployments.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package armhelpers
import (
"github.com/Azure/azure-sdk-for-go/arm/resources/resources"
"github.com/Azure/go-autorest/autorest"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)

// DeployTemplate implements the TemplateDeployer interface for the AzureClient client
Expand Down
2 changes: 1 addition & 1 deletion pkg/armhelpers/graph.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/Azure/azure-sdk-for-go/arm/graphrbac"
"github.com/Azure/go-autorest/autorest/date"
"github.com/Azure/go-autorest/autorest/to"
log "github.com/Sirupsen/logrus"
"github.com/satori/go.uuid"
log "github.com/sirupsen/logrus"
)

const (
Expand Down
Loading

0 comments on commit 7462573

Please sign in to comment.