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.

Sign up for GitHub

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

CA: Updating AWS-SDK-Go to 1.26.6 #2750

Closed
wants to merge 1 commit into from
Closed

CA: Updating AWS-SDK-Go to 1.26.6 #2750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions cluster-autoscaler/cloudprovider/aws/aws_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package aws

import (
"encoding/json"
"fmt"
"io"
"net/http"
Expand All @@ -28,6 +29,7 @@ import (
"testing"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/ec2metadata"
"github.com/aws/aws-sdk-go/service/autoscaling"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -56,13 +58,13 @@ func TestGetRegion(t *testing.T) {
expected1 := "the-shire-1"
os.Setenv(key, expected1)
assert.Equal(t, expected1, getRegion())
// Ensure without environment variable, EC2 Metadata used... and it merely
// chops the last character off the Availability Zone.
// Ensure without environment variable, EC2 Metadata is used.
expected2 := "mordor-2"
expected2a := expected2 + "a"
expectedjson := ec2metadata.EC2InstanceIdentityDocument{Region: expected2}
js, _ := json.Marshal(expectedjson)
os.Unsetenv(key)
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.Write([]byte(expected2a))
w.Write(js)
}))
cfg := aws.NewConfig().WithEndpoint(server.URL)
assert.Equal(t, expected2, getRegion(cfg))
Expand Down
55 changes: 28 additions & 27 deletions cluster-autoscaler/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ require (
github.com/Azure/azure-sdk-for-go v35.0.0+incompatible
github.com/Azure/go-autorest/autorest v0.9.0
github.com/Azure/go-autorest/autorest/adal v0.5.0
github.com/Azure/go-autorest/autorest/date v0.1.0
github.com/Azure/go-autorest/autorest/to v0.2.0
github.com/aws/aws-sdk-go v1.23.18
github.com/aws/aws-sdk-go v1.26.6
github.com/digitalocean/godo v1.27.0
github.com/ghodss/yaml v1.0.0
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af
Expand Down Expand Up @@ -70,7 +71,7 @@ replace (
github.com/armon/consul-api => github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6
github.com/asaskevich/govalidator => github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a
github.com/auth0/go-jwt-middleware => github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7
github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.23.18
github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.26.6
github.com/bazelbuild/bazel-gazelle => github.com/bazelbuild/bazel-gazelle v0.19.1-0.20191105222053-70208cbdc798
github.com/bazelbuild/buildtools => github.com/bazelbuild/buildtools v0.0.0-20190917191645-69366ca98f89
github.com/bazelbuild/rules_go => github.com/bazelbuild/rules_go v0.0.0-20190719190356-6dae44dc5cab
Expand Down Expand Up @@ -391,35 +392,35 @@ replace (
gotest.tools/gotestsum => gotest.tools/gotestsum v0.3.5
grpc.go4.org => grpc.go4.org v0.0.0-20170609214715-11d0a25b4919
honnef.co/go/tools => honnef.co/go/tools v0.0.1-2019.2.2
k8s.io/api => /tmp/ca-update-vendor.Mm8E/kubernetes/staging/src/k8s.io/api
k8s.io/apiextensions-apiserver => /tmp/ca-update-vendor.Mm8E/kubernetes/staging/src/k8s.io/apiextensions-apiserver
k8s.io/apimachinery => /tmp/ca-update-vendor.Mm8E/kubernetes/staging/src/k8s.io/apimachinery
k8s.io/apiserver => /tmp/ca-update-vendor.Mm8E/kubernetes/staging/src/k8s.io/apiserver
k8s.io/cli-runtime => /tmp/ca-update-vendor.Mm8E/kubernetes/staging/src/k8s.io/cli-runtime
k8s.io/client-go => /tmp/ca-update-vendor.Mm8E/kubernetes/staging/src/k8s.io/client-go
k8s.io/cloud-provider => /tmp/ca-update-vendor.Mm8E/kubernetes/staging/src/k8s.io/cloud-provider
k8s.io/cluster-bootstrap => /tmp/ca-update-vendor.Mm8E/kubernetes/staging/src/k8s.io/cluster-bootstrap
k8s.io/code-generator => /tmp/ca-update-vendor.Mm8E/kubernetes/staging/src/k8s.io/code-generator
k8s.io/component-base => /tmp/ca-update-vendor.Mm8E/kubernetes/staging/src/k8s.io/component-base
k8s.io/cri-api => /tmp/ca-update-vendor.Mm8E/kubernetes/staging/src/k8s.io/cri-api
k8s.io/csi-translation-lib => /tmp/ca-update-vendor.Mm8E/kubernetes/staging/src/k8s.io/csi-translation-lib
k8s.io/api => /tmp/ca-update-vendor.eHTc/kubernetes/staging/src/k8s.io/api
k8s.io/apiextensions-apiserver => /tmp/ca-update-vendor.eHTc/kubernetes/staging/src/k8s.io/apiextensions-apiserver
k8s.io/apimachinery => /tmp/ca-update-vendor.eHTc/kubernetes/staging/src/k8s.io/apimachinery
k8s.io/apiserver => /tmp/ca-update-vendor.eHTc/kubernetes/staging/src/k8s.io/apiserver
k8s.io/cli-runtime => /tmp/ca-update-vendor.eHTc/kubernetes/staging/src/k8s.io/cli-runtime
k8s.io/client-go => /tmp/ca-update-vendor.eHTc/kubernetes/staging/src/k8s.io/client-go
k8s.io/cloud-provider => /tmp/ca-update-vendor.eHTc/kubernetes/staging/src/k8s.io/cloud-provider
k8s.io/cluster-bootstrap => /tmp/ca-update-vendor.eHTc/kubernetes/staging/src/k8s.io/cluster-bootstrap
k8s.io/code-generator => /tmp/ca-update-vendor.eHTc/kubernetes/staging/src/k8s.io/code-generator
k8s.io/component-base => /tmp/ca-update-vendor.eHTc/kubernetes/staging/src/k8s.io/component-base
k8s.io/cri-api => /tmp/ca-update-vendor.eHTc/kubernetes/staging/src/k8s.io/cri-api
k8s.io/csi-translation-lib => /tmp/ca-update-vendor.eHTc/kubernetes/staging/src/k8s.io/csi-translation-lib
k8s.io/gengo => k8s.io/gengo v0.0.0-20190822140433-26a664648505
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v1.0.0
k8s.io/kube-aggregator => /tmp/ca-update-vendor.Mm8E/kubernetes/staging/src/k8s.io/kube-aggregator
k8s.io/kube-controller-manager => /tmp/ca-update-vendor.Mm8E/kubernetes/staging/src/k8s.io/kube-controller-manager
k8s.io/kube-aggregator => /tmp/ca-update-vendor.eHTc/kubernetes/staging/src/k8s.io/kube-aggregator
k8s.io/kube-controller-manager => /tmp/ca-update-vendor.eHTc/kubernetes/staging/src/k8s.io/kube-controller-manager
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
k8s.io/kube-proxy => /tmp/ca-update-vendor.Mm8E/kubernetes/staging/src/k8s.io/kube-proxy
k8s.io/kube-scheduler => /tmp/ca-update-vendor.Mm8E/kubernetes/staging/src/k8s.io/kube-scheduler
k8s.io/kubectl => /tmp/ca-update-vendor.Mm8E/kubernetes/staging/src/k8s.io/kubectl
k8s.io/kubelet => /tmp/ca-update-vendor.Mm8E/kubernetes/staging/src/k8s.io/kubelet
k8s.io/legacy-cloud-providers => /tmp/ca-update-vendor.Mm8E/kubernetes/staging/src/k8s.io/legacy-cloud-providers
k8s.io/metrics => /tmp/ca-update-vendor.Mm8E/kubernetes/staging/src/k8s.io/metrics
k8s.io/node-api => /tmp/ca-update-vendor.Mm8E/kubernetes/staging/src/k8s.io/node-api
k8s.io/kube-proxy => /tmp/ca-update-vendor.eHTc/kubernetes/staging/src/k8s.io/kube-proxy
k8s.io/kube-scheduler => /tmp/ca-update-vendor.eHTc/kubernetes/staging/src/k8s.io/kube-scheduler
k8s.io/kubectl => /tmp/ca-update-vendor.eHTc/kubernetes/staging/src/k8s.io/kubectl
k8s.io/kubelet => /tmp/ca-update-vendor.eHTc/kubernetes/staging/src/k8s.io/kubelet
k8s.io/legacy-cloud-providers => /tmp/ca-update-vendor.eHTc/kubernetes/staging/src/k8s.io/legacy-cloud-providers
k8s.io/metrics => /tmp/ca-update-vendor.eHTc/kubernetes/staging/src/k8s.io/metrics
k8s.io/node-api => /tmp/ca-update-vendor.eHTc/kubernetes/staging/src/k8s.io/node-api
k8s.io/repo-infra => k8s.io/repo-infra v0.0.1-alpha.1
k8s.io/sample-apiserver => /tmp/ca-update-vendor.Mm8E/kubernetes/staging/src/k8s.io/sample-apiserver
k8s.io/sample-cli-plugin => /tmp/ca-update-vendor.Mm8E/kubernetes/staging/src/k8s.io/sample-cli-plugin
k8s.io/sample-controller => /tmp/ca-update-vendor.Mm8E/kubernetes/staging/src/k8s.io/sample-controller
k8s.io/sample-apiserver => /tmp/ca-update-vendor.eHTc/kubernetes/staging/src/k8s.io/sample-apiserver
k8s.io/sample-cli-plugin => /tmp/ca-update-vendor.eHTc/kubernetes/staging/src/k8s.io/sample-cli-plugin
k8s.io/sample-controller => /tmp/ca-update-vendor.eHTc/kubernetes/staging/src/k8s.io/sample-controller
k8s.io/system-validators => k8s.io/system-validators v1.0.4
k8s.io/utils => k8s.io/utils v0.0.0-20191114184206-e782cd3c129f
modernc.org/cc => modernc.org/cc v1.0.0
Expand All @@ -441,4 +442,4 @@ replace github.com/digitalocean/godo => github.com/digitalocean/godo v1.27.0

replace github.com/rancher/go-rancher => github.com/rancher/go-rancher v0.1.0

replace k8s.io/kubernetes => /tmp/ca-update-vendor.Mm8E/kubernetes
replace k8s.io/kubernetes => /tmp/ca-update-vendor.eHTc/kubernetes
2 changes: 1 addition & 1 deletion cluster-autoscaler/go.mod-extra
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.12
require (
github.com/digitalocean/godo v1.27.0
github.com/rancher/go-rancher v0.1.0
github.com/aws/aws-sdk-go v1.23.18
github.com/aws/aws-sdk-go v1.26.6
)

replace (
Expand Down
4 changes: 2 additions & 2 deletions cluster-autoscaler/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7 h1:irR1cO6eek3n5uquIVaRAsQmZnlsfPuHNz31cXo4eyk=
github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7/go.mod h1:LWMyo4iOLWXHGdBki7NIht1kHru/0wM179h+d3g8ATM=
github.com/aws/aws-sdk-go v1.23.18 h1:ADU/y1EO8yPzUJJYjcvJ0V9/suezxPh0u6hb5bSYIGQ=
github.com/aws/aws-sdk-go v1.23.18/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aws/aws-sdk-go v1.26.6 h1:LinjO5+t9K/TyrZbSU1BaVJ5wIG3DlX5SffZ32Eg+kU=
github.com/aws/aws-sdk-go v1.26.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/bazelbuild/bazel-gazelle v0.19.1-0.20191105222053-70208cbdc798/go.mod h1:rPwzNHUqEzngx1iVBfO/2X2npKaT3tqPqqHW6rVsn/A=
github.com/bazelbuild/buildtools v0.0.0-20190917191645-69366ca98f89/go.mod h1:5JP0TXzWDHXv8qvxRC4InIazwdyDseBDbzESUMKk1yU=
github.com/bazelbuild/rules_go v0.0.0-20190719190356-6dae44dc5cab/go.mod h1:MC23Dc/wkXEyk3Wpq6lCqz0ZAYOZDw2DR5y3N1q2i7M=
Expand Down
2 changes: 1 addition & 1 deletion cluster-autoscaler/vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go
View file
Open in desktop

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

3 changes: 2 additions & 1 deletion cluster-autoscaler/vendor/github.com/aws/aws-sdk-go/aws/client/client.go
View file
Open in desktop

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

121 changes: 96 additions & 25 deletions cluster-autoscaler/vendor/github.com/aws/aws-sdk-go/aws/client/default_retryer.go
View file
Open in desktop

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

1 change: 1 addition & 0 deletions cluster-autoscaler/vendor/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go
View file
Open in desktop

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

28 changes: 28 additions & 0 deletions cluster-autoscaler/vendor/github.com/aws/aws-sdk-go/aws/client/no_op_retryer.go
View file
Open in desktop

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

Loading