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

slack-vitess-r14.0.5: backport vitessio/vitess#10956, use go 1.20.4 #85

Closed

Conversation

timvaillancourt
Copy link
Member

@timvaillancourt timvaillancourt commented May 23, 2023

Description

  1. Backport upstream PR: Cleanup usage of go.rice in favor of go:embed vitessio/vitess#10956
  2. Use go 1.19 1.20 to resolve security tickets

Related Issue(s)

vitessio#10956

Checklist

  • "Backport to:" labels have been added if this change should be back-ported
  • Tests were added or are not required
  • Did the new or modified tests pass consistently locally and on the CI
  • Documentation was added or is not required

Deployment Notes

dbussink and others added 2 commits May 23, 2023 17:04
* Cleanup usage of go.rice in favor of go:embed

The usage of go.rice predates the availability of go:embed, but we
should switch to using go:embed instead to ship specific assets like
config files that we need.

go.rice is also incompatible with Go 1.19 and while it might see a fix
in the future, it seems better to go with the recommended Go approach
that is available these days.

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>

* Move vtctld to also use `go embed` instead of go.rice

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>

* Remove last rice-box related comments

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>

* Remove config moving

This right now breaks building the actual tests since the tests might
also end up loading the regular code which has a `go embed` and refers
to the package with the config embeds.

This doesn't mean that the config isn't properly included in the
binaries. Also with using `go embed` we have a build time dependency on
the files and we always know the latest is included, so we don't have
the issue of potentially outdated files either.

All in all, it seems simplest to remove this logic and trust that Go
itself works as advertised.

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
@salesforce-cla
Copy link

Thanks for the contribution! Before we can merge this, we need @dbussink to sign the Salesforce Inc. Contributor License Agreement.

@maksimov maksimov force-pushed the pr-10956-slack-vitess-r14.0.5 branch from 50b94ae to 697c6f7 Compare May 25, 2023 22:29
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
@timvaillancourt timvaillancourt changed the title slack-vitess-r14.0.5: backport vitessio/vitess#10956, use go 1.19 slack-vitess-r14.0.5: backport vitessio/vitess#10956, use go 1.20.4 May 26, 2023
@timvaillancourt timvaillancourt marked this pull request as ready for review May 26, 2023 10:17
@timvaillancourt timvaillancourt requested a review from a team as a code owner May 26, 2023 10:18
@maksimov maksimov force-pushed the pr-10956-slack-vitess-r14.0.5 branch 5 times, most recently from fab07b3 to 7ebbc4f Compare June 7, 2023 14:06
@maksimov maksimov force-pushed the pr-10956-slack-vitess-r14.0.5 branch from 7ebbc4f to 7d4955e Compare June 7, 2023 19:23
@github-actions
Copy link

github-actions bot commented Jul 8, 2023

This PR is being marked as stale because it has been open for 30 days with no activity. To rectify, you may do any of the following:

  • Push additional commits to the associated branch.
  • Remove the stale label.
  • Add a comment indicating why it is not stale.

If no action is taken within 7 days, this PR will be closed.

@github-actions github-actions bot added the Stale label Jul 8, 2023
@github-actions
Copy link

This PR was closed because it has been stale for 7 days with no activity.

@github-actions github-actions bot closed this Jul 15, 2023
@timvaillancourt timvaillancourt deleted the pr-10956-slack-vitess-r14.0.5 branch August 15, 2023 22:29
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants