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

Commit 7462573

Browse files
jackfrancisjackfrancis
authored
vendor/ dependency rationalization (#1340)
* 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
1 parent eaad0b0 commit 7462573

File tree

1,378 files changed

+616371
-7618
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,378 files changed

+616371
-7618
lines changed

‎.circleci/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ jobs:
1717
command: make test-style
1818
- run:
1919
name: Build binaries
20-
command: make build
20+
command: make build-binary
2121
- run:
2222
name: Run unit tests
2323
command: make test
2424
- store_test_results:
2525
path: test/junit
2626
- run:
2727
name: Generate test coverage results
28-
command: make build coverage
28+
command: make coverage
2929
non-k8s-pr-e2e:
3030
working_directory: /go/src/github.com/Azure/acs-engine
3131
docker:

‎Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ build: generate
4040
GOBIN=$(BINDIR) $(GO) install $(GOFLAGS) -ldflags '$(LDFLAGS)'
4141
cd test/acs-engine-test; go build
4242

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

4646
# usage: make clean build-cross dist VERSION=v0.4.0
@@ -110,11 +110,12 @@ ifndef HAS_GOMETALINTER
110110
go get -u github.com/alecthomas/gometalinter
111111
gometalinter --install
112112
endif
113-
glide install
114113
ifndef HAS_GINKGO
115114
go get -u github.com/onsi/ginkgo/ginkgo
116115
endif
117116

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

119120
ci: bootstrap test-style build test lint
120121
./scripts/coverage.sh --coveralls

‎cmd/deploy.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"strconv"
99
"time"
1010

11-
log "github.com/Sirupsen/logrus"
1211
"github.com/leonelquinteros/gotext"
12+
log "github.com/sirupsen/logrus"
1313
"github.com/spf13/cobra"
1414

1515
"encoding/json"

‎cmd/deploy_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"github.com/Azure/acs-engine/pkg/api"
1111
"github.com/Azure/acs-engine/pkg/armhelpers"
12-
log "github.com/Sirupsen/logrus"
12+
log "github.com/sirupsen/logrus"
1313
)
1414

1515
const ExampleAPIModel = `{

‎cmd/generate.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"github.com/Azure/acs-engine/pkg/acsengine"
99
"github.com/Azure/acs-engine/pkg/api"
1010
"github.com/Azure/acs-engine/pkg/i18n"
11-
log "github.com/Sirupsen/logrus"
1211
"github.com/leonelquinteros/gotext"
12+
log "github.com/sirupsen/logrus"
1313
"github.com/spf13/cobra"
1414
)
1515

‎cmd/root.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"github.com/Azure/acs-engine/pkg/armhelpers"
77

88
"github.com/Azure/go-autorest/autorest/azure"
9-
log "github.com/Sirupsen/logrus"
109
"github.com/satori/go.uuid"
10+
log "github.com/sirupsen/logrus"
1111
"github.com/spf13/cobra"
1212
flag "github.com/spf13/pflag"
1313
)

‎cmd/upgrade.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/Azure/acs-engine/pkg/operations/kubernetesupgrade"
1414
"github.com/leonelquinteros/gotext"
1515

16-
log "github.com/Sirupsen/logrus"
16+
log "github.com/sirupsen/logrus"
1717
"github.com/spf13/cobra"
1818
)
1919

‎cmd/version.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package cmd
22

33
import (
4-
log "github.com/Sirupsen/logrus"
4+
log "github.com/sirupsen/logrus"
55
"github.com/spf13/cobra"
66
)
77

‎cmd/version_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package cmd
33
import (
44
"fmt"
55

6-
logtest "github.com/Sirupsen/logrus/hooks/test"
76
. "github.com/onsi/ginkgo"
87
. "github.com/onsi/gomega"
8+
logtest "github.com/sirupsen/logrus/hooks/test"
99
)
1010

1111
var _ = Describe("the version command", func() {

‎glide.lock

+51-13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎glide.yaml

+7-6
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,22 @@ import:
1818
- autorest/azure
1919
- autorest/to
2020
- autorest/date
21-
- package: github.com/Sirupsen/logrus
22-
version: v0.11.5
23-
repo: https://github.com/sirupsen/logrus
21+
- package: github.com/sirupsen/logrus
22+
version: v1.0.3
2423
- package: github.com/ghodss/yaml
2524
version: v1.0.0
2625
- package: github.com/mitchellh/go-homedir
2726
version: b8bc1bf767474819792c23f32d8286a45736f1c6
2827
- package: github.com/prometheus/common
28+
version: 61f87aac8082fa8c3c5655c7608d7478d46ac2ad # update this every release cycle
2929
subpackages:
3030
- log
3131
- package: github.com/satori/go.uuid
3232
version: v1.1.0
3333
- package: github.com/spf13/cobra
3434
version: 4cdb38c072b86bf795d2c81de50784d9fdd6eb77
3535
- package: github.com/spf13/pflag
36+
version: v1.0.0
3637
- package: github.com/leonelquinteros/gotext
3738
version: a735812a72672008b3902f8b2bc1302166a9a8ea
3839
- package: gopkg.in/go-playground/validator.v9
@@ -42,6 +43,7 @@ import:
4243
- package: github.com/go-playground/universal-translator
4344
version: v0.16.0
4445
- package: golang.org/x/crypto
46+
version: eb71ad9bd329b5ac0fd0148dd99bd62e8be8e035 # update this every release cycle
4547
subpackages:
4648
- ssh
4749
- package: github.com/alexcesaro/statsd
@@ -53,8 +55,7 @@ import:
5355
- package: github.com/imdario/mergo
5456
version: ^0.2.2
5557
testImport:
58+
# glide isn't able to mutually reconcile pinned versions of these deps
5659
- package: github.com/onsi/gomega
5760
- package: github.com/onsi/ginkgo
58-
version: v1.3.1
59-
- package: github.com/kelseyhightower/envconfig
60-
version: ~1.3.0
61+
- package: github.com/kelseyhightower/envconfig

‎main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package main
22

33
import (
44
"github.com/Azure/acs-engine/cmd"
5-
log "github.com/Sirupsen/logrus"
5+
log "github.com/sirupsen/logrus"
66
)
77

88
func main() {

‎pkg/acsengine/engine.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"strings"
1616
"text/template"
1717

18-
//log "github.com/Sirupsen/logrus"
18+
//log "github.com/sirupsen/logrus"
1919
"github.com/Azure/acs-engine/pkg/api"
2020
"github.com/Azure/acs-engine/pkg/i18n"
2121
"github.com/Masterminds/semver"

‎pkg/acsengine/filesaver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"path"
77

88
"github.com/Azure/acs-engine/pkg/i18n"
9-
log "github.com/Sirupsen/logrus"
9+
log "github.com/sirupsen/logrus"
1010
)
1111

1212
// FileSaver represents the object that save string or byte data to file

‎pkg/acsengine/pki.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"net"
1414
"time"
1515

16-
log "github.com/Sirupsen/logrus"
16+
log "github.com/sirupsen/logrus"
1717
)
1818

1919
const (

‎pkg/acsengine/ssh.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"io"
88

99
"github.com/Azure/acs-engine/pkg/i18n"
10-
log "github.com/Sirupsen/logrus"
10+
log "github.com/sirupsen/logrus"
1111
"golang.org/x/crypto/ssh"
1212
)
1313

‎pkg/acsengine/tenantid.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"github.com/Azure/azure-sdk-for-go/arm/resources/subscriptions"
99
"github.com/Azure/go-autorest/autorest/azure"
10-
log "github.com/Sirupsen/logrus"
10+
log "github.com/sirupsen/logrus"
1111
)
1212

1313
// GetTenantID figures out the AAD tenant ID of the subscription by making an

‎pkg/acsengine/transform.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"github.com/Azure/acs-engine/pkg/i18n"
99
"github.com/Azure/azure-sdk-for-go/arm/compute"
10-
"github.com/Sirupsen/logrus"
10+
"github.com/sirupsen/logrus"
1111
)
1212

1313
const (

‎pkg/acsengine/transform_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"testing"
99

1010
"github.com/Azure/acs-engine/pkg/i18n"
11-
"github.com/Sirupsen/logrus"
1211
. "github.com/onsi/gomega"
12+
"github.com/sirupsen/logrus"
1313
)
1414

1515
func TestNormalizeForVMSSScaling(t *testing.T) {

‎pkg/api/apiloader.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/Azure/acs-engine/pkg/api/v20170701"
1313
"github.com/Azure/acs-engine/pkg/api/vlabs"
1414
"github.com/Azure/acs-engine/pkg/i18n"
15-
log "github.com/Sirupsen/logrus"
15+
log "github.com/sirupsen/logrus"
1616
)
1717

1818
// Apiloader represents the object that loads api model

‎pkg/armhelpers/azureclient.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"github.com/Azure/go-autorest/autorest/adal"
2424
"github.com/Azure/go-autorest/autorest/azure"
2525
"github.com/Azure/go-autorest/autorest/to"
26-
log "github.com/Sirupsen/logrus"
2726
"github.com/mitchellh/go-homedir"
27+
log "github.com/sirupsen/logrus"
2828

2929
"github.com/Azure/acs-engine/pkg/acsengine"
3030
"github.com/Azure/azure-sdk-for-go/arm/disk"

‎pkg/armhelpers/deployments.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package armhelpers
33
import (
44
"github.com/Azure/azure-sdk-for-go/arm/resources/resources"
55
"github.com/Azure/go-autorest/autorest"
6-
log "github.com/Sirupsen/logrus"
6+
log "github.com/sirupsen/logrus"
77
)
88

99
// DeployTemplate implements the TemplateDeployer interface for the AzureClient client

‎pkg/armhelpers/graph.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"github.com/Azure/azure-sdk-for-go/arm/graphrbac"
99
"github.com/Azure/go-autorest/autorest/date"
1010
"github.com/Azure/go-autorest/autorest/to"
11-
log "github.com/Sirupsen/logrus"
1211
"github.com/satori/go.uuid"
12+
log "github.com/sirupsen/logrus"
1313
)
1414

1515
const (

0 commit comments

Comments
 (0)