Skip to content

bump aws-sdk-go to v1.12.30#2359

Merged
Ninir merged 1 commit into
hashicorp:masterfrom
Puneeth-n:chore/aws-sdk-go-1.12.30
Nov 21, 2017
Merged

bump aws-sdk-go to v1.12.30#2359
Ninir merged 1 commit into
hashicorp:masterfrom
Puneeth-n:chore/aws-sdk-go-1.12.30

Conversation

@Puneeth-n

Copy link
Copy Markdown
Contributor

commands used: govendor fetch github.com/aws/aws-sdk-go/...@v1.12.30

@Ninir Ninir added the dependencies Used to indicate dependency changes. label Nov 20, 2017
@Ninir

Ninir commented Nov 20, 2017

Copy link
Copy Markdown
Contributor

Hi @Puneeth-n

Thanks for the work here!

I'm pretty annoyed by a small edge-case i'm encountering...

Using your branch and running the command again, I have 2 modified files:

	deleted:    vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error_other.go
	modified:   vendor/vendor.json

In vendor.json, here is the change (checksum of the release changing):

-                       "checksumSHA1": "9GvAyILJ7g+VUg8Ef5DsT5GuYsg=",
+                       "checksumSHA1": "86TEBLzyjsUoovbC0M1YwsKB7zo=",

However, briefly looking, the file vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error_other.go do is present in the repository so can't really tell what is happening right now. Could you re-run the update command and tell me what happens?

Thanks!

@Ninir Ninir added the waiting-response Maintainers are waiting on response from community or contributor. label Nov 20, 2017
@Puneeth-n

Copy link
Copy Markdown
Contributor Author

@Ninir Sure. I will do it right away.

@Puneeth-n

Puneeth-n commented Nov 20, 2017

Copy link
Copy Markdown
Contributor Author

@Ninir, I am not sure why you are getting this.

I cloned the repo fresh again,

  1. git clean -fdx

  2. docker run --rm -it -v $(pwd):/go/src/github.com/terraform-providers/terraform-provider-aws -w /go/src/github.com/terraform-providers/terraform-provider-aws golang:latest bash

  3. go get -u github.com/kardianos/govendor

  4. govendor fetch github.com/aws/aws-sdk-go/...@v1.12.30 from the root of the project

git status

On branch master
Your branch is up-to-date with 'upstream/master'.
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go
	modified:   vendor/github.com/aws/aws-sdk-go/aws/version.go
	modified:   vendor/github.com/aws/aws-sdk-go/private/protocol/json/jsonutil/build.go
	modified:   vendor/github.com/aws/aws-sdk-go/private/protocol/json/jsonutil/unmarshal.go
	modified:   vendor/github.com/aws/aws-sdk-go/private/protocol/rest/build.go
	modified:   vendor/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go
	modified:   vendor/github.com/aws/aws-sdk-go/service/apigateway/api.go
	modified:   vendor/github.com/aws/aws-sdk-go/service/applicationautoscaling/api.go
	modified:   vendor/github.com/aws/aws-sdk-go/service/applicationautoscaling/doc.go
	modified:   vendor/github.com/aws/aws-sdk-go/service/databasemigrationservice/api.go
	modified:   vendor/github.com/aws/aws-sdk-go/service/ec2/api.go
	modified:   vendor/github.com/aws/aws-sdk-go/service/elbv2/api.go
	modified:   vendor/github.com/aws/aws-sdk-go/service/glue/api.go
	modified:   vendor/github.com/aws/aws-sdk-go/service/rds/api.go
	modified:   vendor/github.com/aws/aws-sdk-go/service/rds/doc.go
	modified:   vendor/github.com/aws/aws-sdk-go/service/route53/api.go
	modified:   vendor/github.com/aws/aws-sdk-go/service/route53/errors.go
	modified:   vendor/github.com/aws/aws-sdk-go/service/s3/api.go
	modified:   vendor/github.com/aws/aws-sdk-go/service/ses/api.go
	modified:   vendor/github.com/aws/aws-sdk-go/service/ses/errors.go
	modified:   vendor/github.com/aws/aws-sdk-go/service/sfn/api.go
	modified:   vendor/github.com/aws/aws-sdk-go/service/sfn/doc.go
	modified:   vendor/github.com/aws/aws-sdk-go/service/sfn/errors.go
	modified:   vendor/vendor.json

Untracked files:
  (use "git add <file>..." to include in what will be committed)

	vendor/github.com/aws/aws-sdk-go/private/protocol/jsonvalue.go

  1. git add vendor/github.com/aws/aws-sdk-go/private/protocol/jsonvalue.go
  2. git commit -am "blah blah blah"

I did the same steps on my existing PR branch too. Nothing was deleted nor modified.

➜  terraform-provider-aws git:(b615080) git status
HEAD detached at origin/chore/aws-sdk-go-1.12.30
nothing to commit, working tree clean

@Ninir

Ninir commented Nov 20, 2017

Copy link
Copy Markdown
Contributor

That's really weird... doing it on the master branch results in the same behaviour as yours.
However on your branch it brings what I exposed earlier.

Could you run govendor -version so that we try to understand what is happening here? mine is v1.0.8.

Thanks!

@Puneeth-n

Copy link
Copy Markdown
Contributor Author
root@642ea7df57c7:/go/src/github.com/terraform-providers/terraform-provider-aws# govendor --version
v1.0.9

@Puneeth-n

Copy link
Copy Markdown
Contributor Author

@Ninir Are you running it on my old PR or this PR?

@Puneeth-n

Copy link
Copy Markdown
Contributor Author

@Ninir I found the issue. It has to do with govendor version v1.0.8 for some reason.

I manually installed govendor v1.0.8 and could reproduce your issue. However, I am not sure why it is happening.

root@642ea7df57c7:/go/src/github.com/terraform-providers/terraform-provider-aws# govendor --version
v1.0.8

govendor fetch github.com/aws/aws-sdk-go/...@v1.12.30

➜  terraform-provider-aws git:(chore/aws-sdk-go-1.12.30) ✗ git status
On branch chore/aws-sdk-go-1.12.30
Your branch is ahead of 'upstream/master' by 1 commit.
  (use "git push" to publish your local commits)
Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	deleted:    vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error_other.go
	modified:   vendor/vendor.json
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error_other.go b/vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error_other.go
deleted file mode 100644
index daf9eca..0000000
--- a/vendor/github.com/aws/aws-sdk-go/aws/request/connection_reset_error_other.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// +build appengine plan9
-
-package request
-
-import (
-       "strings"
-)
-
-func isErrConnectionReset(err error) bool {
-       return strings.Contains(err.Error(), "connection reset")
-}
diff --git a/vendor/vendor.json b/vendor/vendor.json
index f5d38eb..e1bb5b2 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -253,7 +253,7 @@
                        "versionExact": "v1.12.30"
                },
                {
-                       "checksumSHA1": "9GvAyILJ7g+VUg8Ef5DsT5GuYsg=",
+                       "checksumSHA1": "86TEBLzyjsUoovbC0M1YwsKB7zo=",
                        "path": "github.com/aws/aws-sdk-go/aws/request",
                        "revision": "e4f7e38b704e3ed0acc4a7f8196b777696f6f1f3",
                        "revisionTime": "2017-11-17T22:19:00Z",
(END)

@Ninir

Ninir commented Nov 20, 2017

Copy link
Copy Markdown
Contributor

@Puneeth-n Thanks for the investigation ;)

Was able to check it also on my side with govendor 1.0.9. Will merge once the AWS provider 1.3.1 is released.

Thanks! :)

@Ninir Ninir removed the waiting-response Maintainers are waiting on response from community or contributor. label Nov 20, 2017
@Puneeth-n

Copy link
Copy Markdown
Contributor Author

@Ninir Thanks :) BTW Can you please let me know if the SFN#2349 is ok and when it will be merged?

@Ninir Ninir merged commit 55d333c into hashicorp:master Nov 21, 2017
@ghost

ghost commented Apr 10, 2020

Copy link
Copy Markdown

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!

@ghost ghost locked and limited conversation to collaborators Apr 10, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

dependencies Used to indicate dependency changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants