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

Jump to bottom

Aerospike backend update #12165

Merged
merged 13 commits into from Nov 29, 2021
Merged

Aerospike backend update #12165

merged 13 commits into from Nov 29, 2021

Conversation

reugn
Copy link
Contributor

@reugn reugn commented Jul 24, 2021

No description provided.

@vercel vercel bot temporarily deployed to Preview – vault July 24, 2021 13:20 Inactive
@vercel vercel bot temporarily deployed to Preview – vault-storybook July 24, 2021 13:20 Inactive
@reugn
Copy link
Contributor Author

reugn commented Jul 24, 2021

@ncabatoff could you please assist with the changelog entry failure in tests.

@ncabatoff
Copy link
Collaborator

@ncabatoff could you please assist with the changelog entry failure in tests.

Actually, in this case the check is correctly reporting a problem. You're making changes to production code, which should be reflected in the changelog. Please create a changelog entry in your PR, as per https://github.com/hashicorp/vault/blob/main/CONTRIBUTING.md#changelog-entries .

@vercel vercel bot temporarily deployed to Preview – vault July 24, 2021 15:53 Inactive
@vercel vercel bot temporarily deployed to Preview – vault-storybook July 24, 2021 15:53 Inactive
@reugn reugn mentioned this pull request Jul 24, 2021
Closed
@calvn calvn added this to the 1.8.1 milestone Jul 26, 2021
@calvn calvn modified the milestones: 1.8.1, 1.8.2 Aug 3, 2021
@calvn
Copy link
Member

calvn commented Aug 3, 2021

@reugn can you run go mod tidy to clean up the go.sum file?

@mladlow
Copy link
Collaborator

mladlow commented Aug 16, 2021

@calvn I was poking around a little prepping for 1.8.2. Is that still the right milestone for this PR? If so, can you merge and backport it if @reugn's updates look good to you?

calvn
calvn reviewed Aug 16, 2021
View reviewed changes
go.mod Outdated
@@ -53,7 +53,7 @@ require (
github.com/go-sql-driver/mysql v1.5.0
github.com/go-test/deep v1.0.7
github.com/gocql/gocql v0.0.0-20210401103645-80ab1e13e309
github.com/golang/protobuf v1.4.2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@briankassouf or @ncabatoff do you see any potential issues with the protobuf bump here and below?

@mladlow mladlow modified the milestones: 1.8.2, 1.9 Aug 18, 2021
@reugn
Merge commit '51957e15383bf05bc7cbe2c11002c92c9e8ac59f' into aerospik…
48cf299 
…e_backend_update

# Conflicts:
#	go.mod
#	go.sum
@vercel vercel bot temporarily deployed to Preview – vault-storybook September 13, 2021 06:34 Inactive
@vercel vercel bot temporarily deployed to Preview – vault September 13, 2021 06:34 Inactive
@AndrewSav AndrewSav mentioned this pull request Sep 14, 2021
Closed
@mladlow mladlow removed this from the 1.9 milestone Nov 1, 2021
@calvn calvn added this to the 1.9.1 milestone Nov 1, 2021
@calvn
Copy link
Member

calvn commented Nov 1, 2021

@reugn would it be possible for you to resolve the merge conflicts on the go.mod and go.sum files?

@reugn
Merge commit '915414d32ba651d79df1693c84e8d349ee39cca7' into aerospik…
324bb64 
…e_backend_update

# Conflicts:
#	go.mod
#	go.sum
@reugn
Copy link
Contributor Author

reugn commented Nov 2, 2021

@calvn resolved.

@calvn calvn mentioned this pull request Nov 10, 2021
Closed
@reugn
Copy link
Contributor Author

reugn commented Nov 13, 2021

@calvn what is the difference with #13008?

@calvn
Copy link
Member

calvn commented Nov 18, 2021

Hey @reugn we were trying to get this in for 1.9 but due to logistics and code freeze, this didn't make it. We wanted to get this updated all the way to v5.6.0 back then, but it looks like you've gone ahead and done that since, so #13008 can be closed. I am trying to see if we can get this in for 1.9.1.

@reugn
Copy link
Contributor Author

reugn commented Nov 18, 2021

Sure @calvn. Let me know if you need anything else before you merge this.

@calvn
Copy link
Member

calvn commented Nov 18, 2021

@reugn we should be good to have this in for 1.9.1, but just to double-check on this since there's been a lot of changes in go.mod/go.sum recently, can you merge main in and run go mod tidy once again?

calvn
calvn reviewed Nov 18, 2021
View reviewed changes
.gitignore Outdated Show resolved Hide resolved
@vercel vercel bot temporarily deployed to Preview – vault November 19, 2021 09:36 Inactive
@vercel vercel bot temporarily deployed to Preview – vault-storybook November 19, 2021 09:36 Inactive
@vercel vercel bot temporarily deployed to Preview – vault November 19, 2021 09:42 Inactive
@vercel vercel bot temporarily deployed to Preview – vault-storybook November 19, 2021 09:50 Inactive
@calvn calvn merged commit eee6d62 into hashicorp:main Nov 29, 2021
calvn pushed a commit that referenced this pull request Nov 29, 2021
@reugn @calvn
Aerospike backend update (#12165)
c895ecc 
* upgrade aerospike-client-go to v5.2.0

* use strings.Contains to check an error

* add changelog file

* go mod tidy

* go mod tidy

* update the changelog

* revert .gitignore update

* go mod tidy
calvn added a commit that referenced this pull request Nov 29, 2021
@calvn @reugn
Aerospike backend update (#12165) (#13296)
90e1bca 
* upgrade aerospike-client-go to v5.2.0

* use strings.Contains to check an error

* add changelog file

* go mod tidy

* go mod tidy

* update the changelog

* revert .gitignore update

* go mod tidy

Co-authored-by: Eugene R <yrizhkov@aerospike.com>
qk4l pushed a commit to qk4l/vault that referenced this pull request Feb 4, 2022
@reugn
Aerospike backend update (hashicorp#12165)
0e6ba1d 
* upgrade aerospike-client-go to v5.2.0

* use strings.Contains to check an error

* add changelog file

* go mod tidy

* go mod tidy

* update the changelog

* revert .gitignore update

* go mod tidy
@thiskevinwang thiskevinwang mentioned this pull request Apr 25, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@calvn calvn calvn approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.9.1
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@reugn @ncabatoff @calvn @mladlow