Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove vendor folder #635

Merged
merged 2 commits into from
Oct 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ aws-cni
aws-k8s-agent
portmap
cni-metrics-helper/cni-metrics-helper
vendor/*
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ clean:
rm -f cni-metrics-helper/cni-metrics-helper
rm -f portmap

files := $(shell find . -path ./vendor -prune -or -not -name 'mock_publisher.go' -name '*.go' -print)
files := $(shell find . -not -name 'mock_publisher.go' -name '*.go' -print)
unformatted = $(shell goimports -l $(files))

format :
Expand Down
1 change: 0 additions & 1 deletion client/health-check/grpc_health_probe.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,3 @@ func main() {
}
log.Printf("status: %v", resp.GetStatus().String())
}

30 changes: 15 additions & 15 deletions ipamd/ipamd_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -436,18 +436,18 @@ func TestIPAMContext_nodeIPPoolTooLow(t *testing.T) {
defer ctrl.Finish()

type fields struct {
maxIPsPerENI int
warmENITarget int
warmIPTarget int
datastore *datastore.DataStore
maxIPsPerENI int
warmENITarget int
warmIPTarget int
datastore *datastore.DataStore
}

tests := []struct {
name string
fields fields
want bool
}{
{"Test new ds, all defaults", fields{14, 1, 0, datastore.NewDataStore()}, true},
{"Test new ds, all defaults", fields{14, 1, 0, datastore.NewDataStore()}, true},
{"Test new ds, 0 ENIs", fields{14, 0, 0, datastore.NewDataStore()}, true},
{"Test new ds, 3 warm IPs", fields{14, 0, 3, datastore.NewDataStore()}, true},
{"Test 3 unused IPs, 1 warm", fields{3, 1, 1, datastoreWith3FreeIPs()}, false},
Expand All @@ -459,16 +459,16 @@ func TestIPAMContext_nodeIPPoolTooLow(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
c := &IPAMContext{
awsClient: mockAWS,
dataStore: tt.fields.datastore,
k8sClient: mockK8S,
useCustomNetworking: false,
eniConfig: mockENIConfig,
networkClient: mockNetwork,
maxIPsPerENI: tt.fields.maxIPsPerENI,
maxENI: -1,
warmENITarget: tt.fields.warmENITarget,
warmIPTarget: tt.fields.warmIPTarget,
awsClient: mockAWS,
dataStore: tt.fields.datastore,
k8sClient: mockK8S,
useCustomNetworking: false,
eniConfig: mockENIConfig,
networkClient: mockNetwork,
maxIPsPerENI: tt.fields.maxIPsPerENI,
maxENI: -1,
warmENITarget: tt.fields.warmENITarget,
warmIPTarget: tt.fields.warmIPTarget,
}
if got := c.nodeIPPoolTooLow(); got != tt.want {
t.Errorf("nodeIPPoolTooLow() = %v, want %v", got, tt.want)
Expand Down
2 changes: 1 addition & 1 deletion main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func Test_copyFileContents(t *testing.T) {
dst := os.TempDir() + "/" + tt.args.dst

err := copyFileContents(tt.args.src, dst)
if err != nil {
if err != nil {
if !tt.wantErr {
t.Errorf("copyFileContents() error = %v, wantErr %v", err, tt.wantErr)
}
Expand Down
16 changes: 0 additions & 16 deletions pkg/httpwrapper/generate_mocks.go

This file was deleted.

38 changes: 0 additions & 38 deletions pkg/httpwrapper/httpwrapper.go

This file was deleted.

59 changes: 0 additions & 59 deletions pkg/httpwrapper/mocks/httpresp_mocks.go

This file was deleted.

61 changes: 0 additions & 61 deletions pkg/httpwrapper/mocks/httpwrapper_mocks.go

This file was deleted.

16 changes: 0 additions & 16 deletions pkg/ioutilwrapper/generate_mocks.go

This file was deleted.

37 changes: 0 additions & 37 deletions pkg/ioutilwrapper/ioutil.go

This file was deleted.

61 changes: 0 additions & 61 deletions pkg/ioutilwrapper/mocks/ioutilwrapper_mocks.go

This file was deleted.

10 changes: 5 additions & 5 deletions pkg/networkutils/network_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ import (
)

const (
testMAC1 = "01:23:45:67:89:a0"
testMAC2 = "01:23:45:67:89:a1"
testTable = 10
testeniIP = "10.10.10.20"
testeniSubnet = "10.10.0.0/16"
testMAC1 = "01:23:45:67:89:a0"
testMAC2 = "01:23:45:67:89:a1"
testTable = 10
testeniIP = "10.10.10.20"
testeniSubnet = "10.10.0.0/16"
// Default MTU of ENI and veth
// defined in plugins/routed-eni/driver/driver.go, pkg/networkutils/network.go
testMTU = 9001
Expand Down
1 change: 1 addition & 0 deletions pkg/utils/retry/retry.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ package retry

import (
"context"

"github.com/aws/amazon-vpc-cni-k8s/pkg/utils/ttime"
)

Expand Down
Loading