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

Cleanup usage of go.rice in favor of go:embed #10956

Merged
merged 4 commits into from
Aug 9, 2022

Conversation

dbussink
Copy link
Contributor

@dbussink dbussink commented Aug 8, 2022

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.

Right now is still a WIP since it doesn't remove the usage in vtctld yet where we package the UI assets. Want to see first what the fallout of this looks like on CI.

Related Issue(s)

Was also mentioned before in the Go 1.16 upgrade but never tackled since: #7572 (comment)

Checklist

  • "Backport me!" label has been added if this change should be backported
  • Tests were added or are not required
  • Documentation was added or is not required

@vitess-bot
Copy link
Contributor

vitess-bot bot commented Aug 8, 2022

Review Checklist

Hello reviewers! 👋 Please follow this checklist when reviewing this Pull Request.

General

  • Ensure that the Pull Request has a descriptive title.
  • If this is a change that users need to know about, please apply the release notes (needs details) label so that merging is blocked unless the summary release notes document is included.
  • If a new flag is being introduced, review whether it is really needed. The flag names should be clear and intuitive (as far as possible), and the flag's help should be descriptive.
  • If a workflow is added or modified, each items in Jobs should be named in order to mark it as required. If the workflow should be required, the GitHub Admin should be notified.

Bug fixes

  • There should be at least one unit or end-to-end test.
  • The Pull Request description should either include a link to an issue that describes the bug OR an actual description of the bug and how to reproduce, along with a description of the fix.

Non-trivial changes

  • There should be some code comments as to why things are implemented the way they are.

New/Existing features

  • Should be documented, either by modifying the existing documentation or creating new documentation.
  • New features should have a link to a feature request issue or an RFC that documents the use cases, corner cases and test cases.

Backward compatibility

  • Protobuf changes should be wire-compatible.
  • Changes to _vt tables and RPCs need to be backward compatible.
  • vtctl command output order should be stable and awk-able.

Copy link
Member

@mdlayher mdlayher left a comment

Choose a reason for hiding this comment

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

LGTM, solid cleanup.

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>
Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
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>
@dbussink dbussink force-pushed the dbussink/remove-go-rice branch from 667391d to 16c6431 Compare August 9, 2022 07:08
@dbussink dbussink changed the title WIP: Cleanup usage of go.rice in favor of go:embed Cleanup usage of go.rice in favor of go:embed Aug 9, 2022
@dbussink dbussink marked this pull request as ready for review August 9, 2022 07:09
Copy link
Member

@GuptaManan100 GuptaManan100 left a comment

Choose a reason for hiding this comment

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

Looks good to me

@GuptaManan100 GuptaManan100 merged commit a56442a into vitessio:main Aug 9, 2022
@GuptaManan100 GuptaManan100 deleted the dbussink/remove-go-rice branch August 9, 2022 08:45
dbussink added a commit to dbussink/vitess that referenced this pull request Aug 9, 2022
Accidentally added in vitessio#10956

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
ajm188 pushed a commit that referenced this pull request Aug 10, 2022
Accidentally added in #10956

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
systay pushed a commit to planetscale/vitess that referenced this pull request Aug 19, 2022
…sio#937)

* 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>
timvaillancourt pushed a commit to slackhq/vitess that referenced this pull request May 23, 2023
* 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>
maksimov pushed a commit to slackhq/vitess that referenced this pull request May 26, 2023
* 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>
maksimov pushed a commit to slackhq/vitess that referenced this pull request Jun 13, 2023
* 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>
maksimov added a commit to slackhq/vitess that referenced this pull request Aug 10, 2023
* Cleanup usage of go.rice in favor of go:embed (vitessio#10956)

* 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>

* fix vtrootbin

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the build to 1.19.10

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the workflows to 1.19.10

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the docker image to 1.19.10

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the bootstrap version to get docker to go 1.20.5

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* use 1.18.7 for static checks

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* lower the build version requirement to allow static checks to pass

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* experiment with using old and new Go for a single workflow

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* use old and new Go for a upgrade/downgrade workflows

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* set -buildvcs=false

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* address build errors

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* Revert "fix parameter name (#93)" (#100)

This reverts commit 76159fd.

* apply patch 12178 to v14 (#102)

Signed-off-by: Priya Bibra <pbibra@slack-corp.com>
Signed-off-by: 'Priya Bibra' <pbibra@slack-corp.com>

* more workflows to use self-hosted runner

* even more workflows to use self-hosted runner

* partially switch upgrade-downgrade to self-hosted runner

* Ejortegau/larger runners (#115)

* Empty commit to trigger CI

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>

* `slack-vitess-r14.0.5-dsdefense`: use larger runner

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Use runner group instead

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Rename group

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Move more jobs to runner group

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* use vitess-ubuntu20 runner group

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Rever change of runner type for e2e ERS PRS new features heavy test

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>

---------

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Revert change of runner type for shardedrecovery_stress_verticalsplit_heavy. (#116)

We do this because the test is taking a lot longer & failing in some cases with
the larger runner.

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>

* `slack-vitess-r14.0.5`: use dedicated larger runner (#113)

* `slack-vitess-r14.0.5`: use dedicated larger runner

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* fix fileNameFromPosition

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* empty commit

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* empty commit

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

---------

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* `slack-vitess-r14.0.5`: allow conn overrides in consul topo (#111)

* `slack-vitess-r14.0.5`: allow conn overrides in consul topo

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* fix e2e test

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

---------

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

---------

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>
Signed-off-by: Priya Bibra <pbibra@slack-corp.com>
Signed-off-by: 'Priya Bibra' <pbibra@slack-corp.com>
Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Co-authored-by: Dirkjan Bussink <d.bussink@gmail.com>
Co-authored-by: Roderick Yao <roderick.yao@slack-corp.com>
Co-authored-by: pbibra <pbibra@slack-corp.com>
Co-authored-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>
Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com>
maksimov added a commit to slackhq/vitess that referenced this pull request Sep 13, 2023
* Cleanup usage of go.rice in favor of go:embed (vitessio#10956)

* 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>

* fix vtrootbin

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the build to 1.19.10

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the workflows to 1.19.10

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the docker image to 1.19.10

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the bootstrap version to get docker to go 1.20.5

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* use 1.18.7 for static checks

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* lower the build version requirement to allow static checks to pass

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* experiment with using old and new Go for a single workflow

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* use old and new Go for a upgrade/downgrade workflows

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* set -buildvcs=false

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* address build errors

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* Revert "fix parameter name (#93)" (#100)

This reverts commit 76159fd.

* apply patch 12178 to v14 (#102)

Signed-off-by: Priya Bibra <pbibra@slack-corp.com>
Signed-off-by: 'Priya Bibra' <pbibra@slack-corp.com>

* more workflows to use self-hosted runner

* even more workflows to use self-hosted runner

* partially switch upgrade-downgrade to self-hosted runner

* Ejortegau/larger runners (#115)

* Empty commit to trigger CI

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>

* `slack-vitess-r14.0.5-dsdefense`: use larger runner

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Use runner group instead

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Rename group

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Move more jobs to runner group

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* use vitess-ubuntu20 runner group

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Rever change of runner type for e2e ERS PRS new features heavy test

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>

---------

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Revert change of runner type for shardedrecovery_stress_verticalsplit_heavy. (#116)

We do this because the test is taking a lot longer & failing in some cases with
the larger runner.

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>

* `slack-vitess-r14.0.5`: use dedicated larger runner (#113)

* `slack-vitess-r14.0.5`: use dedicated larger runner

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* fix fileNameFromPosition

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* empty commit

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* empty commit

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

---------

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* `slack-vitess-r14.0.5`: allow conn overrides in consul topo (#111)

* `slack-vitess-r14.0.5`: allow conn overrides in consul topo

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* fix e2e test

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

---------

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

---------

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>
Signed-off-by: Priya Bibra <pbibra@slack-corp.com>
Signed-off-by: 'Priya Bibra' <pbibra@slack-corp.com>
Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Co-authored-by: Dirkjan Bussink <d.bussink@gmail.com>
Co-authored-by: Roderick Yao <roderick.yao@slack-corp.com>
Co-authored-by: pbibra <pbibra@slack-corp.com>
Co-authored-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>
Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com>
maksimov added a commit to slackhq/vitess that referenced this pull request Sep 13, 2023
* Cleanup usage of go.rice in favor of go:embed (vitessio#10956)

* 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>

* fix vtrootbin

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the build to 1.19.10

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the workflows to 1.19.10

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the docker image to 1.19.10

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the bootstrap version to get docker to go 1.20.5

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* use 1.18.7 for static checks

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* lower the build version requirement to allow static checks to pass

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* experiment with using old and new Go for a single workflow

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* use old and new Go for a upgrade/downgrade workflows

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* set -buildvcs=false

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* address build errors

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* Revert "fix parameter name (#93)" (#100)

This reverts commit 76159fd.

* apply patch 12178 to v14 (#102)

Signed-off-by: Priya Bibra <pbibra@slack-corp.com>
Signed-off-by: 'Priya Bibra' <pbibra@slack-corp.com>

* more workflows to use self-hosted runner

* even more workflows to use self-hosted runner

* partially switch upgrade-downgrade to self-hosted runner

* Ejortegau/larger runners (#115)

* Empty commit to trigger CI

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>

* `slack-vitess-r14.0.5-dsdefense`: use larger runner

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Use runner group instead

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Rename group

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Move more jobs to runner group

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* use vitess-ubuntu20 runner group

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Rever change of runner type for e2e ERS PRS new features heavy test

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>

---------

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Revert change of runner type for shardedrecovery_stress_verticalsplit_heavy. (#116)

We do this because the test is taking a lot longer & failing in some cases with
the larger runner.

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>

* `slack-vitess-r14.0.5`: use dedicated larger runner (#113)

* `slack-vitess-r14.0.5`: use dedicated larger runner

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* fix fileNameFromPosition

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* empty commit

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* empty commit

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

---------

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* `slack-vitess-r14.0.5`: allow conn overrides in consul topo (#111)

* `slack-vitess-r14.0.5`: allow conn overrides in consul topo

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* fix e2e test

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

---------

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

---------

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>
Signed-off-by: Priya Bibra <pbibra@slack-corp.com>
Signed-off-by: 'Priya Bibra' <pbibra@slack-corp.com>
Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Co-authored-by: Dirkjan Bussink <d.bussink@gmail.com>
Co-authored-by: Roderick Yao <roderick.yao@slack-corp.com>
Co-authored-by: pbibra <pbibra@slack-corp.com>
Co-authored-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>
Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com>
maksimov added a commit to slackhq/vitess that referenced this pull request Sep 18, 2023
* Upgrade go slack vitess r14.0.5 (#91)

* Cleanup usage of go.rice in favor of go:embed (vitessio#10956)

* 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>

* fix vtrootbin

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the build to 1.19.10

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the workflows to 1.19.10

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the docker image to 1.19.10

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the bootstrap version to get docker to go 1.20.5

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* use 1.18.7 for static checks

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* lower the build version requirement to allow static checks to pass

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* experiment with using old and new Go for a single workflow

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* use old and new Go for a upgrade/downgrade workflows

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* set -buildvcs=false

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* address build errors

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* Revert "fix parameter name (#93)" (#100)

This reverts commit 76159fd.

* apply patch 12178 to v14 (#102)

Signed-off-by: Priya Bibra <pbibra@slack-corp.com>
Signed-off-by: 'Priya Bibra' <pbibra@slack-corp.com>

* more workflows to use self-hosted runner

* even more workflows to use self-hosted runner

* partially switch upgrade-downgrade to self-hosted runner

* Ejortegau/larger runners (#115)

* Empty commit to trigger CI

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>

* `slack-vitess-r14.0.5-dsdefense`: use larger runner

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Use runner group instead

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Rename group

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Move more jobs to runner group

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* use vitess-ubuntu20 runner group

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Rever change of runner type for e2e ERS PRS new features heavy test

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>

---------

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Revert change of runner type for shardedrecovery_stress_verticalsplit_heavy. (#116)

We do this because the test is taking a lot longer & failing in some cases with
the larger runner.

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>

* `slack-vitess-r14.0.5`: use dedicated larger runner (#113)

* `slack-vitess-r14.0.5`: use dedicated larger runner

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* fix fileNameFromPosition

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* empty commit

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* empty commit

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

---------

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* `slack-vitess-r14.0.5`: allow conn overrides in consul topo (#111)

* `slack-vitess-r14.0.5`: allow conn overrides in consul topo

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* fix e2e test

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

---------

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

---------

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>
Signed-off-by: Priya Bibra <pbibra@slack-corp.com>
Signed-off-by: 'Priya Bibra' <pbibra@slack-corp.com>
Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Co-authored-by: Dirkjan Bussink <d.bussink@gmail.com>
Co-authored-by: Roderick Yao <roderick.yao@slack-corp.com>
Co-authored-by: pbibra <pbibra@slack-corp.com>
Co-authored-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>
Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Upgrade go slack vitess r14.0.5 (#91)

* Cleanup usage of go.rice in favor of go:embed (vitessio#10956)

* 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>

* fix vtrootbin

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the build to 1.19.10

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the workflows to 1.19.10

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the docker image to 1.19.10

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* update the bootstrap version to get docker to go 1.20.5

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* use 1.18.7 for static checks

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* lower the build version requirement to allow static checks to pass

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* experiment with using old and new Go for a single workflow

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* use old and new Go for a upgrade/downgrade workflows

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* set -buildvcs=false

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* address build errors

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

* Revert "fix parameter name (#93)" (#100)

This reverts commit 76159fd.

* apply patch 12178 to v14 (#102)

Signed-off-by: Priya Bibra <pbibra@slack-corp.com>
Signed-off-by: 'Priya Bibra' <pbibra@slack-corp.com>

* more workflows to use self-hosted runner

* even more workflows to use self-hosted runner

* partially switch upgrade-downgrade to self-hosted runner

* Ejortegau/larger runners (#115)

* Empty commit to trigger CI

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>

* `slack-vitess-r14.0.5-dsdefense`: use larger runner

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Use runner group instead

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Rename group

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Move more jobs to runner group

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* use vitess-ubuntu20 runner group

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Rever change of runner type for e2e ERS PRS new features heavy test

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>

---------

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Revert change of runner type for shardedrecovery_stress_verticalsplit_heavy. (#116)

We do this because the test is taking a lot longer & failing in some cases with
the larger runner.

Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>

* `slack-vitess-r14.0.5`: use dedicated larger runner (#113)

* `slack-vitess-r14.0.5`: use dedicated larger runner

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* fix fileNameFromPosition

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* empty commit

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* empty commit

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

---------

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* `slack-vitess-r14.0.5`: allow conn overrides in consul topo (#111)

* `slack-vitess-r14.0.5`: allow conn overrides in consul topo

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* fix e2e test

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

---------

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

---------

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>
Signed-off-by: Priya Bibra <pbibra@slack-corp.com>
Signed-off-by: 'Priya Bibra' <pbibra@slack-corp.com>
Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Co-authored-by: Dirkjan Bussink <d.bussink@gmail.com>
Co-authored-by: Roderick Yao <roderick.yao@slack-corp.com>
Co-authored-by: pbibra <pbibra@slack-corp.com>
Co-authored-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>
Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Cleaning up bad merge

* Fixing the build cmds

---------

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>
Signed-off-by: Priya Bibra <pbibra@slack-corp.com>
Signed-off-by: 'Priya Bibra' <pbibra@slack-corp.com>
Signed-off-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Co-authored-by: Dirkjan Bussink <d.bussink@gmail.com>
Co-authored-by: Roderick Yao <roderick.yao@slack-corp.com>
Co-authored-by: pbibra <pbibra@slack-corp.com>
Co-authored-by: Eduardo J. Ortega U <5791035+ejortegau@users.noreply.github.com>
Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com>
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.

4 participants