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

[Backport 2.x] Backporting commits to 2.x #400

Merged
merged 11 commits into from
Oct 23, 2023
Merged

Conversation

VachaShah
Copy link
Collaborator

@VachaShah VachaShah commented Oct 19, 2023

Description

Backporting diff commits from main to 2.x
2.x...main

And bumping client version to 2.4.0

Issues Resolved

List any issues this PR will resolve, e.g. Closes [...].

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

tannerjones4075 and others added 10 commits October 19, 2023 20:22
* Updating DEVELOPER_GUIDE.md file to include docker build instructions

Signed-off-by: Tanner Jones <[email protected]>

* Updating DEVELOPER_GUIDE.md file to include docker build instructions

Signed-off-by: Tanner Jones <[email protected]>

* Updating DEVELOPER_GUIDE.md file and CHANGELOG

Signed-off-by: Tanner Jones <[email protected]>

* Removed link from localhost:9200

Signed-off-by: Tanner Jones <[email protected]>

---------

Signed-off-by: Tanner Jones <[email protected]>
Signed-off-by: Vacha Shah <[email protected]>
…oject#387)

* Bump github.com/aws/aws-sdk-go from 1.45.20 to 1.45.24

Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.45.20 to 1.45.24.
- [Release notes](https://github.com/aws/aws-sdk-go/releases)
- [Commits](aws/aws-sdk-go@v1.45.20...v1.45.24)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update changelog

Signed-off-by: dependabot[bot] <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
…roject#388)

* Bump github.com/aws/aws-sdk-go-v2 from 1.21.0 to 1.21.1

Bumps [github.com/aws/aws-sdk-go-v2](https://github.com/aws/aws-sdk-go-v2) from 1.21.0 to 1.21.1.
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](aws/aws-sdk-go-v2@v1.21.0...v1.21.1)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go-v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update changelog

Signed-off-by: dependabot[bot] <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
…nsearch-project#389)

* Bump github.com/aws/aws-sdk-go-v2/config from 1.18.43 to 1.18.44

Bumps [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) from 1.18.43 to 1.18.44.
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](aws/aws-sdk-go-v2@config/v1.18.43...config/v1.18.44)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go-v2/config
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update changelog

Signed-off-by: dependabot[bot] <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
* Bump golang.org/x/net from 0.7.0 to 0.17.0

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.7.0 to 0.17.0.
- [Commits](golang/net@v0.7.0...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update changelog

Signed-off-by: dependabot[bot] <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
…ts on all branches (opensearch-project#392)

* .github: run test workflows for all branches, test against 2.9,2.10

Signed-off-by: Jakob Hahn <[email protected]>

* Makefile: use docker golangci-lint, run integration test on `.` folder, change coverage generation

Signed-off-by: Jakob Hahn <[email protected]>

* Update DEVELOPER_GUIDE

Signed-off-by: Jakob Hahn <[email protected]>

---------

Signed-off-by: Jakob Hahn <[email protected]>
Signed-off-by: Vacha Shah <[email protected]>
* Updated linter version to 1.54.2

Signed-off-by: Tanner Jones <[email protected]>

* Updated CHANGELOG.md

Signed-off-by: Tanner Jones <[email protected]>

* Updated CHANGELOG.md

Signed-off-by: Tanner Jones <[email protected]>

* Updated CHANGELOG.md - moved linter update to Dependencies Bumps

Signed-off-by: Tanner Jones <[email protected]>

---------

Signed-off-by: Tanner Jones <[email protected]>
Signed-off-by: Daniel (dB.) Doubrovkine <[email protected]>
Co-authored-by: Daniel (dB.) Doubrovkine <[email protected]>
Signed-off-by: Vacha Shah <[email protected]>
* deprecated legacy REST API /_template

Signed-off-by: Tanner Jones <[email protected]>

* deprecated legacy REST API /_template

Signed-off-by: Tanner Jones <[email protected]>

* removed deprecated header at the top of the doc

Signed-off-by: Tanner Jones <[email protected]>

* added deprecated notes to the CHANGELOG.md

Signed-off-by: Tanner Jones <[email protected]>

* Corrected deprecation statement

Signed-off-by: Tanner Jones <[email protected]>

* Update CHANGELOG.md

Co-authored-by: Jakob <[email protected]>
Signed-off-by: Tanner Jones <[email protected]>

* Updated deprecated message on api.indices.put_template.go

Signed-off-by: Tanner Jones <[email protected]>

* Added deprecated message on api.indices.exists_template.go

Signed-off-by: Tanner Jones <[email protected]>

* Added deprecated message on api.indices.delete_template.go

Signed-off-by: Tanner Jones <[email protected]>

* Added deprecated message on api.indices.get_template.go

Signed-off-by: Tanner Jones <[email protected]>

* Updated deprecated message on api.indices.exists_template.go and added back in IndicesExistsTemplate that was delete by mistake

Signed-off-by: Tanner Jones <[email protected]>

---------

Signed-off-by: Tanner Jones <[email protected]>
Signed-off-by: Tanner Jones <[email protected]>
Co-authored-by: Jakob <[email protected]>
Signed-off-by: Vacha Shah <[email protected]>
…search-project#398)

* Bump github.com/aws/aws-sdk-go-v2/config from 1.18.44 to 1.19.0

Bumps [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) from 1.18.44 to 1.19.0.
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/v1.19.0/CHANGELOG.md)
- [Commits](aws/aws-sdk-go-v2@config/v1.18.44...v1.19.0)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go-v2/config
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update changelog

Signed-off-by: dependabot[bot] <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
…oject#397)

* Bump github.com/aws/aws-sdk-go from 1.45.24 to 1.45.26

Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.45.24 to 1.45.26.
- [Release notes](https://github.com/aws/aws-sdk-go/releases)
- [Commits](aws/aws-sdk-go@v1.45.24...v1.45.26)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update changelog

Signed-off-by: dependabot[bot] <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
@dblock dblock merged commit 8f11c2d into opensearch-project:2.x Oct 23, 2023
45 checks passed
@VachaShah VachaShah deleted the 2.x branch October 23, 2023 17:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants