hcq/influx-cli
hcq/influx-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix bugs in new influx restore impl (#124)

Browse Source 
* fix: adjust restore-org logic to handle 404
* fix: overwrite org ID and name before restoring bucket
This commit is contained in:
Daniel Moran 2021-06-16 11:22:01 -04:00 committed by GitHub
parent 1dad2f5f72
commit 0ee555c6a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clients/restore/restore.go
View File

@ -198,6 +198,8 @@ func (c Client) partialRestore(ctx context.Context, params *Params) (err error)
return
}
}
bkt.OrganizationName = orgName
bkt.OrganizationID = orgIds[orgName]
// By the same reasoning as above, if new-bucket-name is non-empty we know
// filters must have been set to ensure we only match 1 bucket, so we can
@ -241,12 +243,16 @@ func (c Client) partialRestore(ctx context.Context, params *Params) (err error)
// restoreOrg gets the ID for the org with the given name, creating the org if it doesn't already exist.
func (c Client) restoreOrg(ctx context.Context, name string) (string, error) {
// NOTE: Our orgs API returns a 404 instead of an empty list when filtering by a specific name.
orgs, err := c.GetOrgs(ctx).Org(name).Execute()
if err != nil {
return "", fmt.Errorf("failed to check existence of organization %q: %w", name, err)
if apiErr, ok := err.(api.ApiError); !ok || apiErr.ErrorCode() != api.ERRORCODE_NOT_FOUND {
return "", fmt.Errorf("failed to check existence of organization %q: %w", name, err)
}
}
if len(orgs.GetOrgs()) == 0 {
// If we've gotten this far and err != nil, it means err was a 404.
if err != nil || len(orgs.GetOrgs()) == 0 {
// Create any missing orgs.
newOrg, err := c.PostOrgs(ctx).PostOrganizationRequest(api.PostOrganizationRequest{Name: name}).Execute()
if err != nil {