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

Pr 10956 slack vitess r12.0.5 #88

Closed
wants to merge 14 commits into from

Conversation

maksimov
Copy link
Collaborator

Description

Related Issue(s)

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 26, 2023 11:15
* 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: 'Stanislav Maksimov' <smaksimov@slack-corp.com>
… version change

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.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.

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>
Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>
Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>
Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>
Signed-off-by: Stanislav Maksimov <smaksimov@slack-corp.com>
Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>
Signed-off-by: Stanislav Maksimov <smaksimov@slack-corp.com>
Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>
@maksimov maksimov force-pushed the pr-10956-slack-vitess-r12.0.5 branch from ece4cdb to 002abf5 Compare May 29, 2023 18:31
Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>
Signed-off-by: Stanislav Maksimov <smaksimov@slack-corp.com>
Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>
@maksimov maksimov force-pushed the pr-10956-slack-vitess-r12.0.5 branch from 7355cd4 to db4048c Compare May 31, 2023 22:03
Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>
@maksimov maksimov force-pushed the pr-10956-slack-vitess-r12.0.5 branch from db4048c to 4503298 Compare May 31, 2023 23:05
Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>
@maksimov maksimov closed this Jun 16, 2023
@maksimov maksimov deleted the pr-10956-slack-vitess-r12.0.5 branch June 16, 2023 10:25
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.

2 participants