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

build: revert deletion of influx CLI code #21919

Merged
merged 6 commits into from Jul 22, 2021
Merged

build: revert deletion of influx CLI code #21919

merged 6 commits into from Jul 22, 2021

Conversation

danxmoran
Copy link
Contributor

@danxmoran danxmoran commented Jul 22, 2021

(Mostly) reverts #21877

Best reviewed commit-by-commit:

  1. d064cf6 is a mostly-clean git revert. There were some conflicts in go.mod and code under cmd/influxd where things got cleaned up after the CLI was deleted; I edited the revert-patch to not change those spots
  2. b0bff1d Bumps the CLI dependency to pull in bugfixes around interactive I/O
  3. e66d76c Re-deletes our hacky go-input-based functions for interactive I/O, replacing those usages with calls to utilities from the new CLI. This should fix problems users were hitting in powershell
  4. 41141e8 Deletes pkg/csv2lp, which was copied verbatim to influx-cli
  5. 932a4a4 Deletes pkg/jsonnet, which was copied verbatim to influx-cli

@danxmoran danxmoran requested a review from a team as a code owner July 22, 2021 14:24
@williamhbaker williamhbaker self-requested a review July 22, 2021 18:09
@danxmoran
Copy link
Contributor Author

danxmoran commented Jul 22, 2021

Ugh, that's probably caused by this line, which I added to work around this issue while the fix was still unreleased. I'll open an issue in influx-cli because it's going to hit there too; hopefully upgrading survey and switching HorizontalAbsolute to NextLine will make it work

@williamhbaker
Copy link
Contributor

Ugh, that's probably caused by this line, which I added to work around this issue while the fix was still unreleased. I'll open an issue in influx-cli because it's going to hit there too; hopefully upgrading survey and switching HorizontalAbsolute to NextLine will make it work

Sounds good...definitely a big improvement over the previous version which didn't work at all on powershell!

@williamhbaker
Copy link
Contributor

Speaking of previous versions...are you going to make any CHANGELOG updates with this? There's some bugfixes for sure. Not sure how that will work with the code that fixed the bug being in a separate repo though.

@danxmoran
Copy link
Contributor Author

are you going to make any CHANGELOG updates with this?

Yes, I'll make a note about fixing the interactive I/O on powershell. I think that'll be the only bugfix from this... other bugs that got fixed in the new influx-cli code didn't get ported back here

@danxmoran danxmoran merged commit c1eac88 into 2.0 Jul 22, 2021
@danxmoran danxmoran deleted the dm-revert-rm-cli-2.0 branch July 22, 2021 21:12
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.

None yet

2 participants