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.

Sign up for GitHub

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

Jump to bottom

feat: return new operator token during backup overwrite #22629

Merged
merged 3 commits into from
Oct 7, 2021
Merged

feat: return new operator token during backup overwrite #22629

merged 3 commits into from
Oct 7, 2021

Conversation

lesam
Copy link
Contributor

@lesam lesam commented Oct 6, 2021

Partial fix for #20749

danxmoran
danxmoran reviewed Oct 6, 2021
View reviewed changes
http/restore_service.go
response := make(map[string]string)
response["token"] = operatorToken.Token

h.api.Respond(w, r, http.StatusOK, response)
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you update the OPENAPI_SHA constant in scripts/fetch-swagger.sh to be d6f9073685dfb58e36f20c2ed351cf872ad31a86 (current HEAD of openapi master) so the swagger will include the description of this new response?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

After I made the change I realized that's one commit back from the latest, but it has the stuff we want.

@lesam lesam requested a review from danxmoran October 6, 2021 21:13
@danxmoran
Copy link
Contributor

Was about to approve when I remembered we have an e2e test for backup/restore at cmd/influxd/launcher/backup_restore_test.go. The test also exercises the CLI logic (it uses the CLI as a dependency to actually run the backup/restore) so it'd be a good sanity-check that everything is working as expected.

Before we merge this or influxdata-influx-cli#297, could we:

  1. Bump the CLI dependency to the HEAD of the use-token branch from the CLI
  2. Update the full-restore e2e test to remove this line so the auth token for the 2nd test server doesn't match the 1st
  3. Check that everything works as expected?

lesam
lesam commented Oct 7, 2021
View reviewed changes
go.mod
// The next time Flux updates its Arrow dependency, we will see checkptr test failures,
// if that version does not include PR 8112. In that event, someone (perhaps Mark R again)
// will need to apply the change in 8112 on top of the newer version of Arrow.
replace github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db => github.com/influxdata/arrow/go/arrow v0.0.0-20200917142114-986e413c1705
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We don't depend on the af6fa24be0db anymore, and arrow has merged the noted PR upstream

@lesam lesam force-pushed the return-token branch 2 times, most recently from 79b8e44 to 7196e35 Compare October 7, 2021 12:25
@lesam lesam merged commit a02782c into influxdata:master Oct 7, 2021
@williamhbaker williamhbaker mentioned this pull request Oct 21, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danxmoran danxmoran danxmoran approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@lesam @danxmoran