diff --git a/.circleci/config.yml b/.circleci/config.yml index e423ffd9ec..d65974d8ed 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -120,12 +120,12 @@ jobs: - run: make vet - run: make checkfmt - run: make checktidy - - run: GOTRACEBACK=all GO111MODULE=on gotestsum --format standard-verbose --junitfile /tmp/test-results/gotestsum.xml -- -race -count=1 ./... - # TODO add these checks to the Makefile - # - run: go get -v -t -d ./... - run: GO111MODULE=on go mod vendor # staticcheck looks in vendor for dependencies. - run: GO111MODULE=on go install honnef.co/go/tools/cmd/staticcheck # Install staticcheck from the version we specify in go.mod. - run: staticcheck ./... + - run: GOTRACEBACK=all GO111MODULE=on gotestsum --format standard-verbose --junitfile /tmp/test-results/gotestsum.xml -- -race -count=1 ./... + # TODO add these checks to the Makefile + # - run: go get -v -t -d ./... - save_cache: name: Saving GOCACHE diff --git a/authorizer/task.go b/authorizer/task.go index 751742169c..77e59cdeb0 100644 --- a/authorizer/task.go +++ b/authorizer/task.go @@ -6,7 +6,6 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/influxdb" - platform "github.com/influxdata/influxdb" platcontext "github.com/influxdata/influxdb/context" "github.com/influxdata/influxdb/kit/tracing" "github.com/influxdata/influxdb/query" @@ -16,8 +15,8 @@ import ( type authError struct { error - perm platform.Permission - auth platform.Authorizer + perm influxdb.Permission + auth influxdb.Authorizer } func (ae *authError) AuthzError() error { @@ -37,14 +36,14 @@ var ( ) type taskServiceValidator struct { - platform.TaskService + influxdb.TaskService preAuth query.PreAuthorizer logger *zap.Logger } // TaskService wraps ts and checks appropriate permissions before calling requested methods on ts. // Authorization failures are logged to the logger. -func NewTaskService(logger *zap.Logger, ts platform.TaskService, bs platform.BucketService) platform.TaskService { +func NewTaskService(logger *zap.Logger, ts influxdb.TaskService, bs influxdb.BucketService) influxdb.TaskService { return &taskServiceValidator{ TaskService: ts, preAuth: query.NewPreAuthorizer(bs), @@ -52,7 +51,7 @@ func NewTaskService(logger *zap.Logger, ts platform.TaskService, bs platform.Buc } } -func (ts *taskServiceValidator) FindTaskByID(ctx context.Context, id platform.ID) (*platform.Task, error) { +func (ts *taskServiceValidator) FindTaskByID(ctx context.Context, id influxdb.ID) (*influxdb.Task, error) { span, ctx := tracing.StartSpanFromContext(ctx) defer span.Finish() @@ -62,7 +61,7 @@ func (ts *taskServiceValidator) FindTaskByID(ctx context.Context, id platform.ID return nil, err } - perm, err := platform.NewPermissionAtID(id, platform.ReadAction, platform.TasksResourceType, task.OrganizationID) + perm, err := influxdb.NewPermissionAtID(id, influxdb.ReadAction, influxdb.TasksResourceType, task.OrganizationID) if err != nil { return nil, err } @@ -76,7 +75,7 @@ func (ts *taskServiceValidator) FindTaskByID(ctx context.Context, id platform.ID return task, nil } -func (ts *taskServiceValidator) FindTasks(ctx context.Context, filter platform.TaskFilter) ([]*platform.Task, int, error) { +func (ts *taskServiceValidator) FindTasks(ctx context.Context, filter influxdb.TaskFilter) ([]*influxdb.Task, int, error) { span, ctx := tracing.StartSpanFromContext(ctx) defer span.Finish() @@ -95,9 +94,9 @@ func (ts *taskServiceValidator) FindTasks(ctx context.Context, filter platform.T } // Then, filter down to what the user is allowed to see. - tasks := make([]*platform.Task, 0, len(unauthenticatedTasks)) + tasks := make([]*influxdb.Task, 0, len(unauthenticatedTasks)) for _, t := range unauthenticatedTasks { - perm, err := platform.NewPermissionAtID(t.ID, platform.ReadAction, platform.TasksResourceType, t.OrganizationID) + perm, err := influxdb.NewPermissionAtID(t.ID, influxdb.ReadAction, influxdb.TasksResourceType, t.OrganizationID) if err != nil { continue } @@ -114,7 +113,7 @@ func (ts *taskServiceValidator) FindTasks(ctx context.Context, filter platform.T return tasks, len(tasks), nil } -func (ts *taskServiceValidator) CreateTask(ctx context.Context, t platform.TaskCreate) (*platform.Task, error) { +func (ts *taskServiceValidator) CreateTask(ctx context.Context, t influxdb.TaskCreate) (*influxdb.Task, error) { span, ctx := tracing.StartSpanFromContext(ctx) defer span.Finish() @@ -126,7 +125,7 @@ func (ts *taskServiceValidator) CreateTask(ctx context.Context, t platform.TaskC return nil, influxdb.ErrInvalidTaskType } - p, err := platform.NewPermission(platform.WriteAction, platform.TasksResourceType, t.OrganizationID) + p, err := influxdb.NewPermission(influxdb.WriteAction, influxdb.TasksResourceType, t.OrganizationID) if err != nil { return nil, err } @@ -143,7 +142,7 @@ func (ts *taskServiceValidator) CreateTask(ctx context.Context, t platform.TaskC return ts.TaskService.CreateTask(ctx, t) } -func (ts *taskServiceValidator) UpdateTask(ctx context.Context, id platform.ID, upd platform.TaskUpdate) (*platform.Task, error) { +func (ts *taskServiceValidator) UpdateTask(ctx context.Context, id influxdb.ID, upd influxdb.TaskUpdate) (*influxdb.Task, error) { span, ctx := tracing.StartSpanFromContext(ctx) defer span.Finish() @@ -153,7 +152,7 @@ func (ts *taskServiceValidator) UpdateTask(ctx context.Context, id platform.ID, return nil, err } - p, err := platform.NewPermissionAtID(id, platform.WriteAction, platform.TasksResourceType, task.OrganizationID) + p, err := influxdb.NewPermissionAtID(id, influxdb.WriteAction, influxdb.TasksResourceType, task.OrganizationID) if err != nil { return nil, err } @@ -173,7 +172,7 @@ func (ts *taskServiceValidator) UpdateTask(ctx context.Context, id platform.ID, return ts.TaskService.UpdateTask(ctx, id, upd) } -func (ts *taskServiceValidator) DeleteTask(ctx context.Context, id platform.ID) error { +func (ts *taskServiceValidator) DeleteTask(ctx context.Context, id influxdb.ID) error { span, ctx := tracing.StartSpanFromContext(ctx) defer span.Finish() @@ -183,7 +182,7 @@ func (ts *taskServiceValidator) DeleteTask(ctx context.Context, id platform.ID) return err } - p, err := platform.NewPermissionAtID(id, platform.WriteAction, platform.TasksResourceType, task.OrganizationID) + p, err := influxdb.NewPermissionAtID(id, influxdb.WriteAction, influxdb.TasksResourceType, task.OrganizationID) if err != nil { return err } @@ -197,7 +196,7 @@ func (ts *taskServiceValidator) DeleteTask(ctx context.Context, id platform.ID) return ts.TaskService.DeleteTask(ctx, id) } -func (ts *taskServiceValidator) FindLogs(ctx context.Context, filter platform.LogFilter) ([]*platform.Log, int, error) { +func (ts *taskServiceValidator) FindLogs(ctx context.Context, filter influxdb.LogFilter) ([]*influxdb.Log, int, error) { span, ctx := tracing.StartSpanFromContext(ctx) defer span.Finish() @@ -210,7 +209,7 @@ func (ts *taskServiceValidator) FindLogs(ctx context.Context, filter platform.Lo return ts.TaskService.FindLogs(ctx, filter) } -func (ts *taskServiceValidator) FindRuns(ctx context.Context, filter platform.RunFilter) ([]*platform.Run, int, error) { +func (ts *taskServiceValidator) FindRuns(ctx context.Context, filter influxdb.RunFilter) ([]*influxdb.Run, int, error) { span, ctx := tracing.StartSpanFromContext(ctx) defer span.Finish() @@ -220,7 +219,7 @@ func (ts *taskServiceValidator) FindRuns(ctx context.Context, filter platform.Ru return nil, -1, err } - perm, err := platform.NewPermissionAtID(task.ID, platform.ReadAction, platform.TasksResourceType, task.OrganizationID) + perm, err := influxdb.NewPermissionAtID(task.ID, influxdb.ReadAction, influxdb.TasksResourceType, task.OrganizationID) if err != nil { return nil, -1, err } @@ -235,7 +234,7 @@ func (ts *taskServiceValidator) FindRuns(ctx context.Context, filter platform.Ru return ts.TaskService.FindRuns(ctx, filter) } -func (ts *taskServiceValidator) FindRunByID(ctx context.Context, taskID, runID platform.ID) (*platform.Run, error) { +func (ts *taskServiceValidator) FindRunByID(ctx context.Context, taskID, runID influxdb.ID) (*influxdb.Run, error) { span, ctx := tracing.StartSpanFromContext(ctx) defer span.Finish() @@ -245,7 +244,7 @@ func (ts *taskServiceValidator) FindRunByID(ctx context.Context, taskID, runID p return nil, err } - p, err := platform.NewPermissionAtID(taskID, platform.ReadAction, platform.TasksResourceType, task.OrganizationID) + p, err := influxdb.NewPermissionAtID(taskID, influxdb.ReadAction, influxdb.TasksResourceType, task.OrganizationID) if err != nil { return nil, err } @@ -259,7 +258,7 @@ func (ts *taskServiceValidator) FindRunByID(ctx context.Context, taskID, runID p return ts.TaskService.FindRunByID(ctx, taskID, runID) } -func (ts *taskServiceValidator) CancelRun(ctx context.Context, taskID, runID platform.ID) error { +func (ts *taskServiceValidator) CancelRun(ctx context.Context, taskID, runID influxdb.ID) error { span, ctx := tracing.StartSpanFromContext(ctx) defer span.Finish() @@ -269,7 +268,7 @@ func (ts *taskServiceValidator) CancelRun(ctx context.Context, taskID, runID pla return err } - p, err := platform.NewPermissionAtID(taskID, platform.WriteAction, platform.TasksResourceType, task.OrganizationID) + p, err := influxdb.NewPermissionAtID(taskID, influxdb.WriteAction, influxdb.TasksResourceType, task.OrganizationID) if err != nil { return err } @@ -283,7 +282,7 @@ func (ts *taskServiceValidator) CancelRun(ctx context.Context, taskID, runID pla return ts.TaskService.CancelRun(ctx, taskID, runID) } -func (ts *taskServiceValidator) RetryRun(ctx context.Context, taskID, runID platform.ID) (*platform.Run, error) { +func (ts *taskServiceValidator) RetryRun(ctx context.Context, taskID, runID influxdb.ID) (*influxdb.Run, error) { span, ctx := tracing.StartSpanFromContext(ctx) defer span.Finish() @@ -297,7 +296,7 @@ func (ts *taskServiceValidator) RetryRun(ctx context.Context, taskID, runID plat return nil, ErrInactiveTask } - p, err := platform.NewPermissionAtID(taskID, platform.WriteAction, platform.TasksResourceType, task.OrganizationID) + p, err := influxdb.NewPermissionAtID(taskID, influxdb.WriteAction, influxdb.TasksResourceType, task.OrganizationID) if err != nil { return nil, err } @@ -311,7 +310,7 @@ func (ts *taskServiceValidator) RetryRun(ctx context.Context, taskID, runID plat return ts.TaskService.RetryRun(ctx, taskID, runID) } -func (ts *taskServiceValidator) ForceRun(ctx context.Context, taskID platform.ID, scheduledFor int64) (*platform.Run, error) { +func (ts *taskServiceValidator) ForceRun(ctx context.Context, taskID influxdb.ID, scheduledFor int64) (*influxdb.Run, error) { span, ctx := tracing.StartSpanFromContext(ctx) defer span.Finish() @@ -325,7 +324,7 @@ func (ts *taskServiceValidator) ForceRun(ctx context.Context, taskID platform.ID return nil, ErrInactiveTask } - p, err := platform.NewPermissionAtID(taskID, platform.WriteAction, platform.TasksResourceType, task.OrganizationID) + p, err := influxdb.NewPermissionAtID(taskID, influxdb.WriteAction, influxdb.TasksResourceType, task.OrganizationID) if err != nil { return nil, err } @@ -339,7 +338,7 @@ func (ts *taskServiceValidator) ForceRun(ctx context.Context, taskID platform.ID return ts.TaskService.ForceRun(ctx, taskID, scheduledFor) } -func (ts *taskServiceValidator) validatePermission(ctx context.Context, perm platform.Permission, loggerFields ...zap.Field) error { +func (ts *taskServiceValidator) validatePermission(ctx context.Context, perm influxdb.Permission, loggerFields ...zap.Field) error { auth, err := platcontext.GetAuthorizer(ctx) if err != nil { ts.logger.With(loggerFields...).Info("Failed to retrieve authorizer from context") @@ -359,7 +358,7 @@ func (ts *taskServiceValidator) validatePermission(ctx context.Context, perm pla return nil } -func (ts *taskServiceValidator) validateBucket(ctx context.Context, script string, orgID platform.ID, loggerFields ...zap.Field) error { +func (ts *taskServiceValidator) validateBucket(ctx context.Context, script string, orgID influxdb.ID, loggerFields ...zap.Field) error { auth, err := platcontext.GetAuthorizer(ctx) if err != nil { ts.logger.With(loggerFields...).Info("Failed to retrieve authorizer from context") @@ -368,10 +367,10 @@ func (ts *taskServiceValidator) validateBucket(ctx context.Context, script strin ast, err := flux.Parse(script) if err != nil { - return platform.NewError( - platform.WithErrorErr(err), - platform.WithErrorMsg("Failed to compile flux script."), - platform.WithErrorCode(platform.EInvalid)) + return influxdb.NewError( + influxdb.WithErrorErr(err), + influxdb.WithErrorMsg("Failed to compile flux script."), + influxdb.WithErrorCode(influxdb.EInvalid)) } if err := ts.preAuth.PreAuthorize(ctx, ast, auth, &orgID); err != nil { @@ -382,15 +381,15 @@ func (ts *taskServiceValidator) validateBucket(ctx context.Context, script strin zap.String("auth_id", auth.Identifier().String()), ) - // if error is already a platform error then return it - if perr, ok := err.(*platform.Error); ok { + // if error is already a influxdb.error then return it + if perr, ok := err.(*influxdb.Error); ok { return perr } - return platform.NewError( - platform.WithErrorErr(err), - platform.WithErrorMsg("Failed to create task."), - platform.WithErrorCode(platform.EUnauthorized)) + return influxdb.NewError( + influxdb.WithErrorErr(err), + influxdb.WithErrorMsg("Failed to create task."), + influxdb.WithErrorCode(influxdb.EUnauthorized)) } return nil diff --git a/authorizer/task_test.go b/authorizer/task_test.go index e2bb23aa8e..08f555fa85 100644 --- a/authorizer/task_test.go +++ b/authorizer/task_test.go @@ -7,7 +7,6 @@ import ( "testing" "github.com/influxdata/influxdb" - platform "github.com/influxdata/influxdb" "github.com/influxdata/influxdb/authorizer" pctx "github.com/influxdata/influxdb/context" "github.com/influxdata/influxdb/http" @@ -256,7 +255,7 @@ from(bucket:"holder") |> range(start:-5m) |> to(bucket:"holder", org:"thing")`, check: func(ctx context.Context, svc influxdb.TaskService) error { var ( expMsg = "Failed to create task." - expCode = platform.EUnauthorized + expCode = influxdb.EUnauthorized errfmt = "expected %q, got %q" _, err = svc.CreateTask(ctx, influxdb.TaskCreate{ OrganizationID: r.Org.ID, @@ -275,7 +274,7 @@ from(bucket:"bad") |> range(start:-5m) |> to(bucket:"bad", org:"thing")`, perr, ok := err.(*influxdb.Error) if !ok { - return fmt.Errorf(errfmt, &platform.Error{}, err) + return fmt.Errorf(errfmt, &influxdb.Error{}, err) } if perr.Code != expCode { @@ -304,7 +303,7 @@ from(bucket:"bad") |> range(start:-5m) |> to(bucket:"bad", org:"thing")`, var ( expMsg = "Failed to compile flux script." expErr = fmt.Errorf("error calling function \"to\": missing required keyword argument \"orgID\"") - expCode = platform.EInvalid + expCode = influxdb.EInvalid errfmt = "expected %q, got %q" _, err = svc.CreateTask(ctx, influxdb.TaskCreate{ OrganizationID: r.Org.ID, @@ -323,7 +322,7 @@ from(bucket:"bad") |> range(start:-5m) |> to(bucket:"bad")`, perr, ok := err.(*influxdb.Error) if !ok { - return fmt.Errorf(errfmt, &platform.Error{}, err) + return fmt.Errorf(errfmt, &influxdb.Error{}, err) } if perr.Code != expCode { @@ -496,7 +495,7 @@ from(bucket:"cows") |> range(start:-5m) |> to(bucket:"other_bucket", org:"other_ perr, ok := err.(*influxdb.Error) if !ok { - return fmt.Errorf("expected platform error, got %q of type %T", err, err) + return fmt.Errorf("expected influxdb.error, got %q of type %T", err, err) } if perr.Code != influxdb.EUnauthorized { @@ -507,9 +506,9 @@ from(bucket:"cows") |> range(start:-5m) |> to(bucket:"other_bucket", org:"other_ return fmt.Errorf(`expected "Failed to authorize.", got %q`, perr.Msg) } - cerr, ok := errors.Cause(perr.Err).(*platform.Error) + cerr, ok := errors.Cause(perr.Err).(*influxdb.Error) if !ok { - return fmt.Errorf("expected platform error, got %q of type %T", perr.Err, perr.Err) + return fmt.Errorf("expected influxdb.error, got %q of type %T", perr.Err, perr.Err) } if cerr.Code != influxdb.ENotFound { diff --git a/go.mod b/go.mod index 4b670e49be..70725b853e 100644 --- a/go.mod +++ b/go.mod @@ -88,20 +88,20 @@ require ( github.com/yudai/pp v2.0.1+incompatible // indirect go.uber.org/multierr v1.1.0 go.uber.org/zap v1.9.1 - golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 + golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4 - golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6 - golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e + golang.org/x/sync v0.0.0-20190423024810-112230192c58 + golang.org/x/sys v0.0.0-20190412213103-97732733099d golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 - golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89 + golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac google.golang.org/api v0.0.0-20181021000519-a2651947f503 google.golang.org/grpc v1.19.1 gopkg.in/editorconfig/editorconfig-core-go.v1 v1.3.0 // indirect gopkg.in/ini.v1 v1.42.0 // indirect gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5 gopkg.in/vmihailenco/msgpack.v2 v2.9.1 // indirect - honnef.co/go/tools v0.0.0-20190319011948-d116c56a00f3 + honnef.co/go/tools v0.0.0-20190812140558-8bd8df698242 // indirect labix.org/v2/mgo v0.0.0-20140701140051-000000000287 // indirect launchpad.net/gocheck v0.0.0-20140225173054-000000000087 // indirect ) diff --git a/go.sum b/go.sum index b2ffec9687..0322e0a008 100644 --- a/go.sum +++ b/go.sum @@ -145,6 +145,7 @@ github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4r github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.0.0 h1:b4Gk+7WdP/d3HZH8EJsZpvV7EtDOgaZLtnaNGIu1adA= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg= @@ -340,6 +341,7 @@ github.com/prometheus/common v0.0.0-20181020173914-7e9e6cabbd39 h1:Cto4X6SVMWRPB github.com/prometheus/common v0.0.0-20181020173914-7e9e6cabbd39/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/procfs v0.0.3 h1:CTwfnzjQ+8dS6MhHHu4YswVAD99sL2wjPqP+VkURmKE= github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk= github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= @@ -416,6 +418,8 @@ golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 h1:mKdxBk7AujPs8kU4m80U72 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529 h1:iMGN4xG0cnqj3t+zOM8wUB0BiPKHEwSxEZCvzcbZuvk= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20181112044915-a3060d491354 h1:6UAgZ8309zQ9+1iWkHzfszFguqzOdHGyGkd1HmhJ+UE= golang.org/x/exp v0.0.0-20181112044915-a3060d491354/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -423,6 +427,7 @@ golang.org/x/exp v0.0.0-20190121172915-509febef88a4 h1:c2HOrn5iMezYjSlGPncknSEr/ golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -443,6 +448,8 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6 h1:bjcUS9ztw9kFmmIxJInhon/0Is3p+EHBKNgquIzo1OI= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180903190138-2b024373dcd9/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -457,6 +464,8 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e h1:nFYrTHrdrAOpShe27kaFHjsqYSEQ0KWqdWLu3xuZJts= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db h1:6/JqlYfC1CCaLnGceQTI+sDGhC9UBSPAsBqI0Gun6kU= @@ -473,8 +482,8 @@ golang.org/x/tools v0.0.0-20181221154417-3ad2d988d5e2 h1:M7NLB69gFpUH4s6SJLwXiVs golang.org/x/tools v0.0.0-20181221154417-3ad2d988d5e2/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89 h1:iWXXYN3edZ3Nd/7I6Rt1sXrWVmhF9bgVtlEJ7BbH124= -golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac h1:MQEvx39qSf8vyrx3XRaOe+j1UDIzKwkYOVObRgGPVqI= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca h1:PupagGYwj8+I4ubCxcmcBRk3VlUWtTg5huQpZR9flmE= gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6 h1:4WsZyVtkthqrHTbDCJfiTs8IWNYE4uvsSDgaV6xpp+o= @@ -503,6 +512,7 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/editorconfig/editorconfig-core-go.v1 v1.3.0 h1:oxOEwvhxLMpWpN+0pb2r9TWrM0DCFBHxbuIlS27tmFg= gopkg.in/editorconfig/editorconfig-core-go.v1 v1.3.0/go.mod h1:s2mQFI9McjArkyCwyEwU//+luQENTnD/Lfb/7Sj3/kQ= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/ini.v1 v1.42.0 h1:7N3gPTt50s8GuLortA00n8AqRTk75qOP98+mTPpgzRk= @@ -534,8 +544,8 @@ honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20181108184350-ae8f1f9103cc h1:VdiEcF0DrrUbDdrLBceS0h7LE60ebD5yRYLLXi0ezIs= honnef.co/go/tools v0.0.0-20181108184350-ae8f1f9103cc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190319011948-d116c56a00f3 h1:XNmJXNdEHJ6ib8002TXvjYr8cjxBc0mmMoPsNQO4nsM= -honnef.co/go/tools v0.0.0-20190319011948-d116c56a00f3/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190812140558-8bd8df698242 h1:o4vydRJR8cV2rSlUkfP0aRbr0sOMX+iAdUTFbQV4goo= +honnef.co/go/tools v0.0.0-20190812140558-8bd8df698242/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= labix.org/v2/mgo v0.0.0-20140701140051-000000000287 h1:L0cnkNl4TfAXzvdrqsYEmxOHOCv2p5I3taaReO8BWFs= labix.org/v2/mgo v0.0.0-20140701140051-000000000287/go.mod h1:Lg7AYkt1uXJoR9oeSZ3W/8IXLdvOfIITgZnommstyz4= launchpad.net/gocheck v0.0.0-20140225173054-000000000087 h1:Izowp2XBH6Ya6rv+hqbceQyw/gSGoXfH/UPoTGduL54= diff --git a/http/query_handler.go b/http/query_handler.go index 19b46fddae..ae25dce436 100644 --- a/http/query_handler.go +++ b/http/query_handler.go @@ -19,7 +19,6 @@ import ( "github.com/influxdata/flux/iocounter" "github.com/influxdata/flux/parser" "github.com/influxdata/influxdb" - platform "github.com/influxdata/influxdb" pcontext "github.com/influxdata/influxdb/context" "github.com/influxdata/influxdb/http/metric" "github.com/influxdata/influxdb/kit/check" @@ -38,11 +37,11 @@ const ( // FluxBackend is all services and associated parameters required to construct // the FluxHandler. type FluxBackend struct { - platform.HTTPErrorHandler + influxdb.HTTPErrorHandler Logger *zap.Logger QueryEventRecorder metric.EventRecorder - OrganizationService platform.OrganizationService + OrganizationService influxdb.OrganizationService ProxyQueryService query.ProxyQueryService } @@ -66,11 +65,11 @@ type HTTPDialect interface { // FluxHandler implements handling flux queries. type FluxHandler struct { *httprouter.Router - platform.HTTPErrorHandler + influxdb.HTTPErrorHandler Logger *zap.Logger Now func() time.Time - OrganizationService platform.OrganizationService + OrganizationService influxdb.OrganizationService ProxyQueryService query.ProxyQueryService EventRecorder metric.EventRecorder @@ -108,7 +107,7 @@ func (h *FluxHandler) handleQuery(w http.ResponseWriter, r *http.Request) { // TODO(desa): I really don't like how we're recording the usage metrics here // Ideally this will be moved when we solve https://github.com/influxdata/influxdb/issues/13403 - var orgID platform.ID + var orgID influxdb.ID var requestBytes int sw := newStatusResponseWriter(w) w = sw @@ -135,7 +134,7 @@ func (h *FluxHandler) handleQuery(w http.ResponseWriter, r *http.Request) { } req, n, err := decodeProxyQueryRequest(ctx, r, a, h.OrganizationService) - if err != nil && err != platform.ErrAuthorizerNotSupported { + if err != nil && err != influxdb.ErrAuthorizerNotSupported { err := &influxdb.Error{ Code: influxdb.EInvalid, Msg: "failed to decode request body", @@ -195,8 +194,8 @@ func (h *FluxHandler) postFluxAST(w http.ResponseWriter, r *http.Request) { err := json.NewDecoder(r.Body).Decode(&request) if err != nil { - h.HandleHTTPError(ctx, &platform.Error{ - Code: platform.EInvalid, + h.HandleHTTPError(ctx, &influxdb.Error{ + Code: influxdb.EInvalid, Msg: "invalid json", Err: err, }, w) @@ -206,8 +205,8 @@ func (h *FluxHandler) postFluxAST(w http.ResponseWriter, r *http.Request) { pkg := parser.ParseSource(request.Query) if ast.Check(pkg) > 0 { err := ast.GetError(pkg) - h.HandleHTTPError(ctx, &platform.Error{ - Code: platform.EInvalid, + h.HandleHTTPError(ctx, &influxdb.Error{ + Code: influxdb.EInvalid, Msg: "invalid AST", Err: err, }, w) @@ -233,8 +232,8 @@ func (h *FluxHandler) postQueryAnalyze(w http.ResponseWriter, r *http.Request) { var req QueryRequest if err := json.NewDecoder(r.Body).Decode(&req); err != nil { - h.HandleHTTPError(ctx, &platform.Error{ - Code: platform.EInvalid, + h.HandleHTTPError(ctx, &influxdb.Error{ + Code: influxdb.EInvalid, Msg: "invalid json", Err: err, }, w) diff --git a/http/query_handler_test.go b/http/query_handler_test.go index 633174c900..3fbfb36b40 100644 --- a/http/query_handler_test.go +++ b/http/query_handler_test.go @@ -20,7 +20,6 @@ import ( "github.com/influxdata/flux/csv" "github.com/influxdata/flux/lang" "github.com/influxdata/influxdb" - platform "github.com/influxdata/influxdb" icontext "github.com/influxdata/influxdb/context" "github.com/influxdata/influxdb/http/metric" "github.com/influxdata/influxdb/inmem" @@ -130,7 +129,7 @@ func TestFluxService_Query(t *testing.T) { } func TestFluxQueryService_Query(t *testing.T) { - var orgID platform.ID + var orgID influxdb.ID orgID.DecodeFromString("aaaaaaaaaaaaaaaa") tests := []struct { name string @@ -438,17 +437,17 @@ func TestFluxService_Query_gzip(t *testing.T) { // orgService is just to mock out orgs by returning // the same org every time. orgService := &influxmock.OrganizationService{ - FindOrganizationByIDF: func(ctx context.Context, id platform.ID) (*platform.Organization, error) { - return &platform.Organization{ + FindOrganizationByIDF: func(ctx context.Context, id influxdb.ID) (*influxdb.Organization, error) { + return &influxdb.Organization{ ID: id, Name: id.String(), }, nil }, - FindOrganizationF: func(ctx context.Context, filter platform.OrganizationFilter) (*platform.Organization, error) { - return &platform.Organization{ - ID: platform.ID(1), - Name: platform.ID(1).String(), + FindOrganizationF: func(ctx context.Context, filter influxdb.OrganizationFilter) (*influxdb.Organization, error) { + return &influxdb.Organization{ + ID: influxdb.ID(1), + Name: influxdb.ID(1).String(), }, nil }, } @@ -467,11 +466,11 @@ func TestFluxService_Query_gzip(t *testing.T) { // authService is yet more test setup that returns an operator auth for any token. authService := &influxmock.AuthorizationService{ - FindAuthorizationByTokenFn: func(ctx context.Context, token string) (*platform.Authorization, error) { - return &platform.Authorization{ - ID: platform.ID(1), - OrgID: platform.ID(1), - Permissions: platform.OperPermissions(), + FindAuthorizationByTokenFn: func(ctx context.Context, token string) (*influxdb.Authorization, error) { + return &influxdb.Authorization{ + ID: influxdb.ID(1), + OrgID: influxdb.ID(1), + Permissions: influxdb.OperPermissions(), }, nil }, } @@ -569,17 +568,17 @@ func benchmarkQuery(b *testing.B, disableCompression bool) { // orgService is just to mock out orgs by returning // the same org every time. orgService := &influxmock.OrganizationService{ - FindOrganizationByIDF: func(ctx context.Context, id platform.ID) (*platform.Organization, error) { - return &platform.Organization{ + FindOrganizationByIDF: func(ctx context.Context, id influxdb.ID) (*influxdb.Organization, error) { + return &influxdb.Organization{ ID: id, Name: id.String(), }, nil }, - FindOrganizationF: func(ctx context.Context, filter platform.OrganizationFilter) (*platform.Organization, error) { - return &platform.Organization{ - ID: platform.ID(1), - Name: platform.ID(1).String(), + FindOrganizationF: func(ctx context.Context, filter influxdb.OrganizationFilter) (*influxdb.Organization, error) { + return &influxdb.Organization{ + ID: influxdb.ID(1), + Name: influxdb.ID(1).String(), }, nil }, } @@ -598,11 +597,11 @@ func benchmarkQuery(b *testing.B, disableCompression bool) { // authService is yet more test setup that returns an operator auth for any token. authService := &influxmock.AuthorizationService{ - FindAuthorizationByTokenFn: func(ctx context.Context, token string) (*platform.Authorization, error) { - return &platform.Authorization{ - ID: platform.ID(1), - OrgID: platform.ID(1), - Permissions: platform.OperPermissions(), + FindAuthorizationByTokenFn: func(ctx context.Context, token string) (*influxdb.Authorization, error) { + return &influxdb.Authorization{ + ID: influxdb.ID(1), + OrgID: influxdb.ID(1), + Permissions: influxdb.OperPermissions(), }, nil }, } diff --git a/http/task_service.go b/http/task_service.go index 25869d69fb..00a370f7ef 100644 --- a/http/task_service.go +++ b/http/task_service.go @@ -13,8 +13,7 @@ import ( "strings" "time" - influxdb "github.com/influxdata/influxdb" - platform "github.com/influxdata/influxdb" + "github.com/influxdata/influxdb" pcontext "github.com/influxdata/influxdb/context" "github.com/influxdata/influxdb/kit/tracing" "github.com/influxdata/influxdb/kv" @@ -26,16 +25,16 @@ import ( // TaskBackend is all services and associated parameters required to construct // the TaskHandler. type TaskBackend struct { - platform.HTTPErrorHandler + influxdb.HTTPErrorHandler Logger *zap.Logger - TaskService platform.TaskService - AuthorizationService platform.AuthorizationService - OrganizationService platform.OrganizationService - UserResourceMappingService platform.UserResourceMappingService - LabelService platform.LabelService - UserService platform.UserService - BucketService platform.BucketService + TaskService influxdb.TaskService + AuthorizationService influxdb.AuthorizationService + OrganizationService influxdb.OrganizationService + UserResourceMappingService influxdb.UserResourceMappingService + LabelService influxdb.LabelService + UserService influxdb.UserService + BucketService influxdb.BucketService } // NewTaskBackend returns a new instance of TaskBackend. @@ -56,16 +55,16 @@ func NewTaskBackend(b *APIBackend) *TaskBackend { // TaskHandler represents an HTTP API handler for tasks. type TaskHandler struct { *httprouter.Router - platform.HTTPErrorHandler + influxdb.HTTPErrorHandler logger *zap.Logger - TaskService platform.TaskService - AuthorizationService platform.AuthorizationService - OrganizationService platform.OrganizationService - UserResourceMappingService platform.UserResourceMappingService - LabelService platform.LabelService - UserService platform.UserService - BucketService platform.BucketService + TaskService influxdb.TaskService + AuthorizationService influxdb.AuthorizationService + OrganizationService influxdb.OrganizationService + UserResourceMappingService influxdb.UserResourceMappingService + LabelService influxdb.LabelService + UserService influxdb.UserService + BucketService influxdb.BucketService } const ( @@ -113,8 +112,8 @@ func NewTaskHandler(b *TaskBackend) *TaskHandler { memberBackend := MemberBackend{ HTTPErrorHandler: b.HTTPErrorHandler, Logger: b.Logger.With(zap.String("handler", "member")), - ResourceType: platform.TasksResourceType, - UserType: platform.Member, + ResourceType: influxdb.TasksResourceType, + UserType: influxdb.Member, UserResourceMappingService: b.UserResourceMappingService, UserService: b.UserService, } @@ -125,8 +124,8 @@ func NewTaskHandler(b *TaskBackend) *TaskHandler { ownerBackend := MemberBackend{ HTTPErrorHandler: b.HTTPErrorHandler, Logger: b.Logger.With(zap.String("handler", "member")), - ResourceType: platform.TasksResourceType, - UserType: platform.Owner, + ResourceType: influxdb.TasksResourceType, + UserType: influxdb.Owner, UserResourceMappingService: b.UserResourceMappingService, UserService: b.UserService, } @@ -144,7 +143,7 @@ func NewTaskHandler(b *TaskBackend) *TaskHandler { HTTPErrorHandler: b.HTTPErrorHandler, Logger: b.Logger.With(zap.String("handler", "label")), LabelService: b.LabelService, - ResourceType: platform.TasksResourceType, + ResourceType: influxdb.TasksResourceType, } h.HandlerFunc("GET", tasksIDLabelsPath, newGetLabelsHandler(labelBackend)) h.HandlerFunc("POST", tasksIDLabelsPath, newPostLabelHandler(labelBackend)) @@ -155,11 +154,11 @@ func NewTaskHandler(b *TaskBackend) *TaskHandler { type taskResponse struct { Links map[string]string `json:"links"` - Labels []platform.Label `json:"labels"` - platform.Task + Labels []influxdb.Label `json:"labels"` + influxdb.Task } -func newTaskResponse(t platform.Task, labels []*platform.Label) taskResponse { +func newTaskResponse(t influxdb.Task, labels []*influxdb.Label) taskResponse { response := taskResponse{ Links: map[string]string{ "self": fmt.Sprintf("/api/v2/tasks/%s", t.ID), @@ -170,7 +169,7 @@ func newTaskResponse(t platform.Task, labels []*platform.Label) taskResponse { "logs": fmt.Sprintf("/api/v2/tasks/%s/logs", t.ID), }, Task: t, - Labels: []platform.Label{}, + Labels: []influxdb.Label{}, } for _, l := range labels { @@ -180,7 +179,7 @@ func newTaskResponse(t platform.Task, labels []*platform.Label) taskResponse { return response } -func newTasksPagingLinks(basePath string, ts []*platform.Task, f platform.TaskFilter) *platform.PagingLinks { +func newTasksPagingLinks(basePath string, ts []*influxdb.Task, f influxdb.TaskFilter) *influxdb.PagingLinks { var self, next string u := url.URL{ Path: basePath, @@ -204,7 +203,7 @@ func newTasksPagingLinks(basePath string, ts []*platform.Task, f platform.TaskFi next = u.String() } - links := &platform.PagingLinks{ + links := &influxdb.PagingLinks{ Self: self, Next: next, } @@ -213,18 +212,18 @@ func newTasksPagingLinks(basePath string, ts []*platform.Task, f platform.TaskFi } type tasksResponse struct { - Links *platform.PagingLinks `json:"links"` + Links *influxdb.PagingLinks `json:"links"` Tasks []taskResponse `json:"tasks"` } -func newTasksResponse(ctx context.Context, ts []*platform.Task, f platform.TaskFilter, labelService platform.LabelService) tasksResponse { +func newTasksResponse(ctx context.Context, ts []*influxdb.Task, f influxdb.TaskFilter, labelService influxdb.LabelService) tasksResponse { rs := tasksResponse{ Links: newTasksPagingLinks(tasksPath, ts, f), Tasks: make([]taskResponse, len(ts)), } for i := range ts { - labels, _ := labelService.FindResourceLabels(ctx, platform.LabelMappingFilter{ResourceID: ts[i].ID}) + labels, _ := labelService.FindResourceLabels(ctx, influxdb.LabelMappingFilter{ResourceID: ts[i].ID}) rs.Tasks[i] = newTaskResponse(*ts[i], labels) } return rs @@ -232,10 +231,10 @@ func newTasksResponse(ctx context.Context, ts []*platform.Task, f platform.TaskF type runResponse struct { Links map[string]string `json:"links,omitempty"` - platform.Run + influxdb.Run } -func newRunResponse(r platform.Run) runResponse { +func newRunResponse(r influxdb.Run) runResponse { return runResponse{ Links: map[string]string{ "self": fmt.Sprintf("/api/v2/tasks/%s/runs/%s", r.TaskID, r.ID), @@ -252,7 +251,7 @@ type runsResponse struct { Runs []*runResponse `json:"runs"` } -func newRunsResponse(rs []*platform.Run, taskID platform.ID) runsResponse { +func newRunsResponse(rs []*influxdb.Run, taskID influxdb.ID) runsResponse { r := runsResponse{ Links: map[string]string{ "self": fmt.Sprintf("/api/v2/tasks/%s/runs", taskID), @@ -273,9 +272,9 @@ func (h *TaskHandler) handleGetTasks(w http.ResponseWriter, r *http.Request) { h.logger.Debug("tasks retrieve request", zap.String("r", fmt.Sprint(r))) req, err := decodeGetTasksRequest(ctx, r, h.OrganizationService) if err != nil { - err = &platform.Error{ + err = &influxdb.Error{ Err: err, - Code: platform.EInvalid, + Code: influxdb.EInvalid, Msg: "failed to decode request", } h.HandleHTTPError(ctx, err, w) @@ -295,15 +294,15 @@ func (h *TaskHandler) handleGetTasks(w http.ResponseWriter, r *http.Request) { } type getTasksRequest struct { - filter platform.TaskFilter + filter influxdb.TaskFilter } -func decodeGetTasksRequest(ctx context.Context, r *http.Request, orgs platform.OrganizationService) (*getTasksRequest, error) { +func decodeGetTasksRequest(ctx context.Context, r *http.Request, orgs influxdb.OrganizationService) (*getTasksRequest, error) { qp := r.URL.Query() req := &getTasksRequest{} if after := qp.Get("after"); after != "" { - id, err := platform.IDFromString(after) + id, err := influxdb.IDFromString(after) if err != nil { return nil, err } @@ -311,11 +310,11 @@ func decodeGetTasksRequest(ctx context.Context, r *http.Request, orgs platform.O } if orgName := qp.Get("org"); orgName != "" { - o, err := orgs.FindOrganization(ctx, platform.OrganizationFilter{Name: &orgName}) + o, err := orgs.FindOrganization(ctx, influxdb.OrganizationFilter{Name: &orgName}) if err != nil { - if pErr, ok := err.(*platform.Error); ok && pErr != nil { - if kv.IsNotFound(err) || pErr.Code == platform.EUnauthorized { - return nil, &platform.Error{ + if pErr, ok := err.(*influxdb.Error); ok && pErr != nil { + if kv.IsNotFound(err) || pErr.Code == influxdb.EUnauthorized { + return nil, &influxdb.Error{ Err: errors.New("org not found or unauthorized"), Msg: "org " + orgName + " not found or unauthorized", } @@ -327,7 +326,7 @@ func decodeGetTasksRequest(ctx context.Context, r *http.Request, orgs platform.O req.filter.OrganizationID = &o.ID } if oid := qp.Get("orgID"); oid != "" { - orgID, err := platform.IDFromString(oid) + orgID, err := influxdb.IDFromString(oid) if err != nil { return nil, err } @@ -335,7 +334,7 @@ func decodeGetTasksRequest(ctx context.Context, r *http.Request, orgs platform.O } if userID := qp.Get("user"); userID != "" { - id, err := platform.IDFromString(userID) + id, err := influxdb.IDFromString(userID) if err != nil { return nil, err } @@ -347,15 +346,15 @@ func decodeGetTasksRequest(ctx context.Context, r *http.Request, orgs platform.O if err != nil { return nil, err } - if lim < 1 || lim > platform.TaskMaxPageSize { - return nil, &platform.Error{ - Code: platform.EUnprocessableEntity, - Msg: fmt.Sprintf("limit must be between 1 and %d", platform.TaskMaxPageSize), + if lim < 1 || lim > influxdb.TaskMaxPageSize { + return nil, &influxdb.Error{ + Code: influxdb.EUnprocessableEntity, + Msg: fmt.Sprintf("limit must be between 1 and %d", influxdb.TaskMaxPageSize), } } req.filter.Limit = lim } else { - req.filter.Limit = platform.TaskDefaultPageSize + req.filter.Limit = influxdb.TaskDefaultPageSize } if ttype := qp.Get("type"); ttype != "" { @@ -375,9 +374,9 @@ func (h *TaskHandler) handlePostTask(w http.ResponseWriter, r *http.Request) { req, err := decodePostTaskRequest(ctx, r) if err != nil { - err = &platform.Error{ + err = &influxdb.Error{ Err: err, - Code: platform.EInvalid, + Code: influxdb.EInvalid, Msg: "failed to decode request", } h.HandleHTTPError(ctx, err, w) @@ -385,7 +384,7 @@ func (h *TaskHandler) handlePostTask(w http.ResponseWriter, r *http.Request) { } if err := h.populateTaskCreateOrg(ctx, &req.TaskCreate); err != nil { - err = &platform.Error{ + err = &influxdb.Error{ Err: err, Msg: "could not identify organization", } @@ -394,8 +393,8 @@ func (h *TaskHandler) handlePostTask(w http.ResponseWriter, r *http.Request) { } if !req.TaskCreate.OrganizationID.Valid() { - err := &platform.Error{ - Code: platform.EInvalid, + err := &influxdb.Error{ + Code: influxdb.EInvalid, Msg: "invalid organization id", } h.HandleHTTPError(ctx, err, w) @@ -413,11 +412,11 @@ func (h *TaskHandler) handlePostTask(w http.ResponseWriter, r *http.Request) { h.logger.Error("failed authentication", zap.Errors("error messages", []error{err, e.AuthzError()})) } - // if the error is not already a platform error then make it into one - if _, ok := err.(*platform.Error); !ok { - err = &platform.Error{ + // if the error is not already a influxdb.error then make it into one + if _, ok := err.(*influxdb.Error); !ok { + err = &influxdb.Error{ Err: err, - Code: platform.EInternal, + Code: influxdb.EInternal, Msg: "failed to create task", } } @@ -426,18 +425,18 @@ func (h *TaskHandler) handlePostTask(w http.ResponseWriter, r *http.Request) { return } - if err := encodeResponse(ctx, w, http.StatusCreated, newTaskResponse(*task, []*platform.Label{})); err != nil { + if err := encodeResponse(ctx, w, http.StatusCreated, newTaskResponse(*task, []*influxdb.Label{})); err != nil { logEncodingError(h.logger, r, err) return } } type postTaskRequest struct { - TaskCreate platform.TaskCreate + TaskCreate influxdb.TaskCreate } func decodePostTaskRequest(ctx context.Context, r *http.Request) (*postTaskRequest, error) { - var tc platform.TaskCreate + var tc influxdb.TaskCreate if err := json.NewDecoder(r.Body).Decode(&tc); err != nil { return nil, err } @@ -463,9 +462,9 @@ func (h *TaskHandler) handleGetTask(w http.ResponseWriter, r *http.Request) { h.logger.Debug("task retrieve request", zap.String("r", fmt.Sprint(r))) req, err := decodeGetTaskRequest(ctx, r) if err != nil { - err = &platform.Error{ + err = &influxdb.Error{ Err: err, - Code: platform.EInvalid, + Code: influxdb.EInvalid, Msg: "failed to decode request", } h.HandleHTTPError(ctx, err, w) @@ -474,18 +473,18 @@ func (h *TaskHandler) handleGetTask(w http.ResponseWriter, r *http.Request) { task, err := h.TaskService.FindTaskByID(ctx, req.TaskID) if err != nil { - err = &platform.Error{ + err = &influxdb.Error{ Err: err, - Code: platform.ENotFound, + Code: influxdb.ENotFound, Msg: "failed to find task", } h.HandleHTTPError(ctx, err, w) return } - labels, err := h.LabelService.FindResourceLabels(ctx, platform.LabelMappingFilter{ResourceID: task.ID}) + labels, err := h.LabelService.FindResourceLabels(ctx, influxdb.LabelMappingFilter{ResourceID: task.ID}) if err != nil { - err = &platform.Error{ + err = &influxdb.Error{ Err: err, Msg: "failed to find resource labels", } @@ -500,20 +499,20 @@ func (h *TaskHandler) handleGetTask(w http.ResponseWriter, r *http.Request) { } type getTaskRequest struct { - TaskID platform.ID + TaskID influxdb.ID } func decodeGetTaskRequest(ctx context.Context, r *http.Request) (*getTaskRequest, error) { params := httprouter.ParamsFromContext(ctx) id := params.ByName("id") if id == "" { - return nil, &platform.Error{ - Code: platform.EInvalid, + return nil, &influxdb.Error{ + Code: influxdb.EInvalid, Msg: "url missing id", } } - var i platform.ID + var i influxdb.ID if err := i.DecodeFromString(id); err != nil { return nil, err } @@ -530,9 +529,9 @@ func (h *TaskHandler) handleUpdateTask(w http.ResponseWriter, r *http.Request) { h.logger.Debug("task update request", zap.String("r", fmt.Sprint(r))) req, err := decodeUpdateTaskRequest(ctx, r) if err != nil { - err = &platform.Error{ + err = &influxdb.Error{ Err: err, - Code: platform.EInvalid, + Code: influxdb.EInvalid, Msg: "failed to decode request", } h.HandleHTTPError(ctx, err, w) @@ -540,20 +539,20 @@ func (h *TaskHandler) handleUpdateTask(w http.ResponseWriter, r *http.Request) { } task, err := h.TaskService.UpdateTask(ctx, req.TaskID, req.Update) if err != nil { - err := &platform.Error{ + err := &influxdb.Error{ Err: err, Msg: "failed to update task", } if err.Err == influxdb.ErrTaskNotFound { - err.Code = platform.ENotFound + err.Code = influxdb.ENotFound } h.HandleHTTPError(ctx, err, w) return } - labels, err := h.LabelService.FindResourceLabels(ctx, platform.LabelMappingFilter{ResourceID: task.ID}) + labels, err := h.LabelService.FindResourceLabels(ctx, influxdb.LabelMappingFilter{ResourceID: task.ID}) if err != nil { - err = &platform.Error{ + err = &influxdb.Error{ Err: err, Msg: "failed to find resource labels", } @@ -568,26 +567,26 @@ func (h *TaskHandler) handleUpdateTask(w http.ResponseWriter, r *http.Request) { } type updateTaskRequest struct { - Update platform.TaskUpdate - TaskID platform.ID + Update influxdb.TaskUpdate + TaskID influxdb.ID } func decodeUpdateTaskRequest(ctx context.Context, r *http.Request) (*updateTaskRequest, error) { params := httprouter.ParamsFromContext(ctx) id := params.ByName("id") if id == "" { - return nil, &platform.Error{ - Code: platform.EInvalid, + return nil, &influxdb.Error{ + Code: influxdb.EInvalid, Msg: "you must provide a task ID", } } - var i platform.ID + var i influxdb.ID if err := i.DecodeFromString(id); err != nil { return nil, err } - var upd platform.TaskUpdate + var upd influxdb.TaskUpdate if err := json.NewDecoder(r.Body).Decode(&upd); err != nil { return nil, err } @@ -607,9 +606,9 @@ func (h *TaskHandler) handleDeleteTask(w http.ResponseWriter, r *http.Request) { h.logger.Debug("task delete request", zap.String("r", fmt.Sprint(r))) req, err := decodeDeleteTaskRequest(ctx, r) if err != nil { - err = &platform.Error{ + err = &influxdb.Error{ Err: err, - Code: platform.EInvalid, + Code: influxdb.EInvalid, Msg: "failed to decode request", } h.HandleHTTPError(ctx, err, w) @@ -617,12 +616,12 @@ func (h *TaskHandler) handleDeleteTask(w http.ResponseWriter, r *http.Request) { } if err := h.TaskService.DeleteTask(ctx, req.TaskID); err != nil { - err := &platform.Error{ + err := &influxdb.Error{ Err: err, Msg: "failed to delete task", } if err.Err == influxdb.ErrTaskNotFound { - err.Code = platform.ENotFound + err.Code = influxdb.ENotFound } h.HandleHTTPError(ctx, err, w) return @@ -632,20 +631,20 @@ func (h *TaskHandler) handleDeleteTask(w http.ResponseWriter, r *http.Request) { } type deleteTaskRequest struct { - TaskID platform.ID + TaskID influxdb.ID } func decodeDeleteTaskRequest(ctx context.Context, r *http.Request) (*deleteTaskRequest, error) { params := httprouter.ParamsFromContext(ctx) id := params.ByName("id") if id == "" { - return nil, &platform.Error{ - Code: platform.EInvalid, + return nil, &influxdb.Error{ + Code: influxdb.EInvalid, Msg: "you must provide a task ID", } } - var i platform.ID + var i influxdb.ID if err := i.DecodeFromString(id); err != nil { return nil, err } @@ -660,9 +659,9 @@ func (h *TaskHandler) handleGetLogs(w http.ResponseWriter, r *http.Request) { req, err := decodeGetLogsRequest(ctx, r) if err != nil { - err = &platform.Error{ + err = &influxdb.Error{ Err: err, - Code: platform.EInvalid, + Code: influxdb.EInvalid, Msg: "failed to decode request", } h.HandleHTTPError(ctx, err, w) @@ -671,16 +670,16 @@ func (h *TaskHandler) handleGetLogs(w http.ResponseWriter, r *http.Request) { auth, err := pcontext.GetAuthorizer(ctx) if err != nil { - err = &platform.Error{ + err = &influxdb.Error{ Err: err, - Code: platform.EUnauthorized, + Code: influxdb.EUnauthorized, Msg: "failed to get authorizer", } h.HandleHTTPError(ctx, err, w) return } - if k := auth.Kind(); k != platform.AuthorizationKind { + if k := auth.Kind(); k != influxdb.AuthorizationKind { // Get the authorization for the task, if allowed. authz, err := h.getAuthorizationForTask(ctx, auth, req.filter.Task) if err != nil { @@ -694,12 +693,12 @@ func (h *TaskHandler) handleGetLogs(w http.ResponseWriter, r *http.Request) { logs, _, err := h.TaskService.FindLogs(ctx, req.filter) if err != nil { - err := &platform.Error{ + err := &influxdb.Error{ Err: err, Msg: "failed to find task logs", } if err.Err == influxdb.ErrTaskNotFound || err.Err == influxdb.ErrNoRunsFound { - err.Code = platform.ENotFound + err.Code = influxdb.ENotFound } h.HandleHTTPError(ctx, err, w) return @@ -712,32 +711,32 @@ func (h *TaskHandler) handleGetLogs(w http.ResponseWriter, r *http.Request) { } type getLogsRequest struct { - filter platform.LogFilter + filter influxdb.LogFilter } type getLogsResponse struct { - Events []*platform.Log `json:"events"` + Events []*influxdb.Log `json:"events"` } func decodeGetLogsRequest(ctx context.Context, r *http.Request) (*getLogsRequest, error) { params := httprouter.ParamsFromContext(ctx) id := params.ByName("id") if id == "" { - return nil, &platform.Error{ - Code: platform.EInvalid, + return nil, &influxdb.Error{ + Code: influxdb.EInvalid, Msg: "you must provide a task ID", } } req := &getLogsRequest{} - taskID, err := platform.IDFromString(id) + taskID, err := influxdb.IDFromString(id) if err != nil { return nil, err } req.filter.Task = *taskID if runID := params.ByName("rid"); runID != "" { - id, err := platform.IDFromString(runID) + id, err := influxdb.IDFromString(runID) if err != nil { return nil, err } @@ -752,9 +751,9 @@ func (h *TaskHandler) handleGetRuns(w http.ResponseWriter, r *http.Request) { req, err := decodeGetRunsRequest(ctx, r) if err != nil { - err = &platform.Error{ + err = &influxdb.Error{ Err: err, - Code: platform.EInvalid, + Code: influxdb.EInvalid, Msg: "failed to decode request", } h.HandleHTTPError(ctx, err, w) @@ -763,16 +762,16 @@ func (h *TaskHandler) handleGetRuns(w http.ResponseWriter, r *http.Request) { auth, err := pcontext.GetAuthorizer(ctx) if err != nil { - err = &platform.Error{ + err = &influxdb.Error{ Err: err, - Code: platform.EUnauthorized, + Code: influxdb.EUnauthorized, Msg: "failed to get authorizer", } h.HandleHTTPError(ctx, err, w) return } - if k := auth.Kind(); k != platform.AuthorizationKind { + if k := auth.Kind(); k != influxdb.AuthorizationKind { // Get the authorization for the task, if allowed. authz, err := h.getAuthorizationForTask(ctx, auth, req.filter.Task) if err != nil { @@ -786,12 +785,12 @@ func (h *TaskHandler) handleGetRuns(w http.ResponseWriter, r *http.Request) { runs, _, err := h.TaskService.FindRuns(ctx, req.filter) if err != nil { - err := &platform.Error{ + err := &influxdb.Error{ Err: err, Msg: "failed to find runs", } if err.Err == influxdb.ErrTaskNotFound || err.Err == influxdb.ErrNoRunsFound { - err.Code = platform.ENotFound + err.Code = influxdb.ENotFound } h.HandleHTTPError(ctx, err, w) return @@ -804,21 +803,21 @@ func (h *TaskHandler) handleGetRuns(w http.ResponseWriter, r *http.Request) { } type getRunsRequest struct { - filter platform.RunFilter + filter influxdb.RunFilter } func decodeGetRunsRequest(ctx context.Context, r *http.Request) (*getRunsRequest, error) { params := httprouter.ParamsFromContext(ctx) id := params.ByName("id") if id == "" { - return nil, &platform.Error{ - Code: platform.EInvalid, + return nil, &influxdb.Error{ + Code: influxdb.EInvalid, Msg: "you must provide a task ID", } } req := &getRunsRequest{} - taskID, err := platform.IDFromString(id) + taskID, err := influxdb.IDFromString(id) if err != nil { return nil, err } @@ -827,7 +826,7 @@ func decodeGetRunsRequest(ctx context.Context, r *http.Request) (*getRunsRequest qp := r.URL.Query() if id := qp.Get("after"); id != "" { - afterID, err := platform.IDFromString(id) + afterID, err := influxdb.IDFromString(id) if err != nil { return nil, err } @@ -865,8 +864,8 @@ func decodeGetRunsRequest(ctx context.Context, r *http.Request) (*getRunsRequest } if at != "" && bt != "" && !beforeTime.After(afterTime) { - return nil, &platform.Error{ - Code: platform.EUnprocessableEntity, + return nil, &influxdb.Error{ + Code: influxdb.EUnprocessableEntity, Msg: "beforeTime must be later than afterTime", } } @@ -879,9 +878,9 @@ func (h *TaskHandler) handleForceRun(w http.ResponseWriter, r *http.Request) { req, err := decodeForceRunRequest(ctx, r) if err != nil { - err = &platform.Error{ + err = &influxdb.Error{ Err: err, - Code: platform.EInvalid, + Code: influxdb.EInvalid, Msg: "failed to decode request", } h.HandleHTTPError(ctx, err, w) @@ -890,12 +889,12 @@ func (h *TaskHandler) handleForceRun(w http.ResponseWriter, r *http.Request) { run, err := h.TaskService.ForceRun(ctx, req.TaskID, req.Timestamp) if err != nil { - err := &platform.Error{ + err := &influxdb.Error{ Err: err, Msg: "failed to force run", } if err.Err == influxdb.ErrTaskNotFound { - err.Code = platform.ENotFound + err.Code = influxdb.ENotFound } h.HandleHTTPError(ctx, err, w) return @@ -907,7 +906,7 @@ func (h *TaskHandler) handleForceRun(w http.ResponseWriter, r *http.Request) { } type forceRunRequest struct { - TaskID platform.ID + TaskID influxdb.ID Timestamp int64 } @@ -915,13 +914,13 @@ func decodeForceRunRequest(ctx context.Context, r *http.Request) (forceRunReques params := httprouter.ParamsFromContext(ctx) tid := params.ByName("id") if tid == "" { - return forceRunRequest{}, &platform.Error{ - Code: platform.EInvalid, + return forceRunRequest{}, &influxdb.Error{ + Code: influxdb.EInvalid, Msg: "you must provide a task ID", } } - var ti platform.ID + var ti influxdb.ID if err := ti.DecodeFromString(tid); err != nil { return forceRunRequest{}, err } @@ -955,9 +954,9 @@ func (h *TaskHandler) handleGetRun(w http.ResponseWriter, r *http.Request) { req, err := decodeGetRunRequest(ctx, r) if err != nil { - err = &platform.Error{ + err = &influxdb.Error{ Err: err, - Code: platform.EInvalid, + Code: influxdb.EInvalid, Msg: "failed to decode request", } h.HandleHTTPError(ctx, err, w) @@ -966,16 +965,16 @@ func (h *TaskHandler) handleGetRun(w http.ResponseWriter, r *http.Request) { auth, err := pcontext.GetAuthorizer(ctx) if err != nil { - err = &platform.Error{ + err = &influxdb.Error{ Err: err, - Code: platform.EUnauthorized, + Code: influxdb.EUnauthorized, Msg: "failed to get authorizer", } h.HandleHTTPError(ctx, err, w) return } - if k := auth.Kind(); k != platform.AuthorizationKind { + if k := auth.Kind(); k != influxdb.AuthorizationKind { // Get the authorization for the task, if allowed. authz, err := h.getAuthorizationForTask(ctx, auth, req.TaskID) if err != nil { @@ -989,12 +988,12 @@ func (h *TaskHandler) handleGetRun(w http.ResponseWriter, r *http.Request) { run, err := h.TaskService.FindRunByID(ctx, req.TaskID, req.RunID) if err != nil { - err := &platform.Error{ + err := &influxdb.Error{ Err: err, Msg: "failed to find run", } if err.Err == influxdb.ErrTaskNotFound || err.Err == influxdb.ErrRunNotFound { - err.Code = platform.ENotFound + err.Code = influxdb.ENotFound } h.HandleHTTPError(ctx, err, w) return @@ -1007,28 +1006,28 @@ func (h *TaskHandler) handleGetRun(w http.ResponseWriter, r *http.Request) { } type getRunRequest struct { - TaskID platform.ID - RunID platform.ID + TaskID influxdb.ID + RunID influxdb.ID } func decodeGetRunRequest(ctx context.Context, r *http.Request) (*getRunRequest, error) { params := httprouter.ParamsFromContext(ctx) tid := params.ByName("id") if tid == "" { - return nil, &platform.Error{ - Code: platform.EInvalid, + return nil, &influxdb.Error{ + Code: influxdb.EInvalid, Msg: "you must provide a task ID", } } rid := params.ByName("rid") if rid == "" { - return nil, &platform.Error{ - Code: platform.EInvalid, + return nil, &influxdb.Error{ + Code: influxdb.EInvalid, Msg: "you must provide a run ID", } } - var ti, ri platform.ID + var ti, ri influxdb.ID if err := ti.DecodeFromString(tid); err != nil { return nil, err } @@ -1043,32 +1042,32 @@ func decodeGetRunRequest(ctx context.Context, r *http.Request) (*getRunRequest, } type cancelRunRequest struct { - RunID platform.ID - TaskID platform.ID + RunID influxdb.ID + TaskID influxdb.ID } func decodeCancelRunRequest(ctx context.Context, r *http.Request) (*cancelRunRequest, error) { params := httprouter.ParamsFromContext(ctx) rid := params.ByName("rid") if rid == "" { - return nil, &platform.Error{ - Code: platform.EInvalid, + return nil, &influxdb.Error{ + Code: influxdb.EInvalid, Msg: "you must provide a run ID", } } tid := params.ByName("id") if tid == "" { - return nil, &platform.Error{ - Code: platform.EInvalid, + return nil, &influxdb.Error{ + Code: influxdb.EInvalid, Msg: "you must provide a task ID", } } - var i platform.ID + var i influxdb.ID if err := i.DecodeFromString(rid); err != nil { return nil, err } - var t platform.ID + var t influxdb.ID if err := t.DecodeFromString(tid); err != nil { return nil, err } @@ -1084,9 +1083,9 @@ func (h *TaskHandler) handleCancelRun(w http.ResponseWriter, r *http.Request) { req, err := decodeCancelRunRequest(ctx, r) if err != nil { - err = &platform.Error{ + err = &influxdb.Error{ Err: err, - Code: platform.EInvalid, + Code: influxdb.EInvalid, Msg: "failed to decode request", } h.HandleHTTPError(ctx, err, w) @@ -1095,12 +1094,12 @@ func (h *TaskHandler) handleCancelRun(w http.ResponseWriter, r *http.Request) { err = h.TaskService.CancelRun(ctx, req.TaskID, req.RunID) if err != nil { - err := &platform.Error{ + err := &influxdb.Error{ Err: err, Msg: "failed to cancel run", } if err.Err == influxdb.ErrTaskNotFound || err.Err == influxdb.ErrRunNotFound { - err.Code = platform.ENotFound + err.Code = influxdb.ENotFound } h.HandleHTTPError(ctx, err, w) return @@ -1112,9 +1111,9 @@ func (h *TaskHandler) handleRetryRun(w http.ResponseWriter, r *http.Request) { req, err := decodeRetryRunRequest(ctx, r) if err != nil { - err = &platform.Error{ + err = &influxdb.Error{ Err: err, - Code: platform.EInvalid, + Code: influxdb.EInvalid, Msg: "failed to decode request", } h.HandleHTTPError(ctx, err, w) @@ -1123,16 +1122,16 @@ func (h *TaskHandler) handleRetryRun(w http.ResponseWriter, r *http.Request) { auth, err := pcontext.GetAuthorizer(ctx) if err != nil { - err = &platform.Error{ + err = &influxdb.Error{ Err: err, - Code: platform.EUnauthorized, + Code: influxdb.EUnauthorized, Msg: "failed to get authorizer", } h.HandleHTTPError(ctx, err, w) return } - if k := auth.Kind(); k != platform.AuthorizationKind { + if k := auth.Kind(); k != influxdb.AuthorizationKind { // Get the authorization for the task, if allowed. authz, err := h.getAuthorizationForTask(ctx, auth, req.TaskID) if err != nil { @@ -1146,12 +1145,12 @@ func (h *TaskHandler) handleRetryRun(w http.ResponseWriter, r *http.Request) { run, err := h.TaskService.RetryRun(ctx, req.TaskID, req.RunID) if err != nil { - err := &platform.Error{ + err := &influxdb.Error{ Err: err, Msg: "failed to retry run", } if err.Err == influxdb.ErrTaskNotFound || err.Err == influxdb.ErrRunNotFound { - err.Code = platform.ENotFound + err.Code = influxdb.ENotFound } h.HandleHTTPError(ctx, err, w) return @@ -1163,27 +1162,27 @@ func (h *TaskHandler) handleRetryRun(w http.ResponseWriter, r *http.Request) { } type retryRunRequest struct { - RunID, TaskID platform.ID + RunID, TaskID influxdb.ID } func decodeRetryRunRequest(ctx context.Context, r *http.Request) (*retryRunRequest, error) { params := httprouter.ParamsFromContext(ctx) tid := params.ByName("id") if tid == "" { - return nil, &platform.Error{ - Code: platform.EInvalid, + return nil, &influxdb.Error{ + Code: influxdb.EInvalid, Msg: "you must provide a task ID", } } rid := params.ByName("rid") if rid == "" { - return nil, &platform.Error{ - Code: platform.EInvalid, + return nil, &influxdb.Error{ + Code: influxdb.EInvalid, Msg: "you must provide a run ID", } } - var ti, ri platform.ID + var ti, ri influxdb.ID if err := ti.DecodeFromString(tid); err != nil { return nil, err } @@ -1197,7 +1196,7 @@ func decodeRetryRunRequest(ctx context.Context, r *http.Request) (*retryRunReque }, nil } -func (h *TaskHandler) populateTaskCreateOrg(ctx context.Context, tc *platform.TaskCreate) error { +func (h *TaskHandler) populateTaskCreateOrg(ctx context.Context, tc *influxdb.TaskCreate) error { if tc.OrganizationID.Valid() && tc.Organization != "" { return nil } @@ -1213,7 +1212,7 @@ func (h *TaskHandler) populateTaskCreateOrg(ctx context.Context, tc *platform.Ta } tc.Organization = o.Name } else { - o, err := h.OrganizationService.FindOrganization(ctx, platform.OrganizationFilter{Name: &tc.Organization}) + o, err := h.OrganizationService.FindOrganization(ctx, influxdb.OrganizationFilter{Name: &tc.Organization}) if err != nil { return err } @@ -1225,12 +1224,12 @@ func (h *TaskHandler) populateTaskCreateOrg(ctx context.Context, tc *platform.Ta // getAuthorizationForTask looks up the authorization associated with taskID, // ensuring that the authorizer on ctx is allowed to view the task and the authorization. // -// This method returns a *platform.Error, suitable for directly passing to h.HandleHTTPError. -func (h *TaskHandler) getAuthorizationForTask(ctx context.Context, auth platform.Authorizer, taskID platform.ID) (*platform.Authorization, *platform.Error) { - sess, ok := auth.(*platform.Session) +// This method returns a *influxdb.Error, suitable for directly passing to h.HandleHTTPError. +func (h *TaskHandler) getAuthorizationForTask(ctx context.Context, auth influxdb.Authorizer, taskID influxdb.ID) (*influxdb.Authorization, *influxdb.Error) { + sess, ok := auth.(*influxdb.Session) if !ok { - return nil, &platform.Error{ - Code: platform.EUnauthorized, + return nil, &influxdb.Error{ + Code: influxdb.EUnauthorized, Msg: "unable to authorize session", } } @@ -1238,9 +1237,9 @@ func (h *TaskHandler) getAuthorizationForTask(ctx context.Context, auth platform // This assumes h.TaskService validates access. t, err := h.TaskService.FindTaskByID(ctx, taskID) if err != nil { - return nil, &platform.Error{ + return nil, &influxdb.Error{ Err: err, - Code: platform.EUnauthorized, + Code: influxdb.EUnauthorized, Msg: "task ID unknown or unauthorized", } } @@ -1256,7 +1255,7 @@ type TaskService struct { } // FindTaskByID returns a single task -func (t TaskService) FindTaskByID(ctx context.Context, id platform.ID) (*platform.Task, error) { +func (t TaskService) FindTaskByID(ctx context.Context, id influxdb.ID) (*influxdb.Task, error) { span, _ := tracing.StartSpanFromContext(ctx) defer span.Finish() @@ -1279,7 +1278,7 @@ func (t TaskService) FindTaskByID(ctx context.Context, id platform.ID) (*platfor defer resp.Body.Close() if err := CheckError(resp); err != nil { - if platform.ErrorCode(err) == platform.ENotFound { + if influxdb.ErrorCode(err) == influxdb.ENotFound { // ErrTaskNotFound is expected as part of the FindTaskByID contract, // so return that actual error instead of a different error that looks like it. // TODO cleanup backend task service error implementation @@ -1298,7 +1297,7 @@ func (t TaskService) FindTaskByID(ctx context.Context, id platform.ID) (*platfor // FindTasks returns a list of tasks that match a filter (limit 100) and the total count // of matching tasks. -func (t TaskService) FindTasks(ctx context.Context, filter platform.TaskFilter) ([]*platform.Task, int, error) { +func (t TaskService) FindTasks(ctx context.Context, filter influxdb.TaskFilter) ([]*influxdb.Task, int, error) { span, _ := tracing.StartSpanFromContext(ctx) defer span.Finish() @@ -1352,7 +1351,7 @@ func (t TaskService) FindTasks(ctx context.Context, filter platform.TaskFilter) return nil, 0, err } - tasks := make([]*platform.Task, len(tr.Tasks)) + tasks := make([]*influxdb.Task, len(tr.Tasks)) for i := range tr.Tasks { tasks[i] = &tr.Tasks[i].Task } @@ -1360,7 +1359,7 @@ func (t TaskService) FindTasks(ctx context.Context, filter platform.TaskFilter) } // CreateTask creates a new task. -func (t TaskService) CreateTask(ctx context.Context, tc platform.TaskCreate) (*platform.Task, error) { +func (t TaskService) CreateTask(ctx context.Context, tc influxdb.TaskCreate) (*influxdb.Task, error) { span, _ := tracing.StartSpanFromContext(ctx) defer span.Finish() @@ -1402,7 +1401,7 @@ func (t TaskService) CreateTask(ctx context.Context, tc platform.TaskCreate) (*p } // UpdateTask updates a single task with changeset. -func (t TaskService) UpdateTask(ctx context.Context, id platform.ID, upd platform.TaskUpdate) (*platform.Task, error) { +func (t TaskService) UpdateTask(ctx context.Context, id influxdb.ID, upd influxdb.TaskUpdate) (*influxdb.Task, error) { span, _ := tracing.StartSpanFromContext(ctx) defer span.Finish() @@ -1445,7 +1444,7 @@ func (t TaskService) UpdateTask(ctx context.Context, id platform.ID, upd platfor } // DeleteTask removes a task by ID and purges all associated data and scheduled runs. -func (t TaskService) DeleteTask(ctx context.Context, id platform.ID) error { +func (t TaskService) DeleteTask(ctx context.Context, id influxdb.ID) error { span, _ := tracing.StartSpanFromContext(ctx) defer span.Finish() @@ -1474,7 +1473,7 @@ func (t TaskService) DeleteTask(ctx context.Context, id platform.ID) error { } // FindLogs returns logs for a run. -func (t TaskService) FindLogs(ctx context.Context, filter platform.LogFilter) ([]*platform.Log, int, error) { +func (t TaskService) FindLogs(ctx context.Context, filter influxdb.LogFilter) ([]*influxdb.Log, int, error) { span, _ := tracing.StartSpanFromContext(ctx) defer span.Finish() @@ -1521,7 +1520,7 @@ func (t TaskService) FindLogs(ctx context.Context, filter platform.LogFilter) ([ } // FindRuns returns a list of runs that match a filter and the total count of returned runs. -func (t TaskService) FindRuns(ctx context.Context, filter platform.RunFilter) ([]*platform.Run, int, error) { +func (t TaskService) FindRuns(ctx context.Context, filter influxdb.RunFilter) ([]*influxdb.Run, int, error) { span, _ := tracing.StartSpanFromContext(ctx) defer span.Finish() @@ -1570,7 +1569,7 @@ func (t TaskService) FindRuns(ctx context.Context, filter platform.RunFilter) ([ return nil, 0, err } - runs := make([]*platform.Run, len(rs.Runs)) + runs := make([]*influxdb.Run, len(rs.Runs)) for i := range rs.Runs { runs[i] = &rs.Runs[i].Run } @@ -1579,7 +1578,7 @@ func (t TaskService) FindRuns(ctx context.Context, filter platform.RunFilter) ([ } // FindRunByID returns a single run of a specific task. -func (t TaskService) FindRunByID(ctx context.Context, taskID, runID platform.ID) (*platform.Run, error) { +func (t TaskService) FindRunByID(ctx context.Context, taskID, runID influxdb.ID) (*influxdb.Run, error) { span, _ := tracing.StartSpanFromContext(ctx) defer span.Finish() @@ -1604,11 +1603,11 @@ func (t TaskService) FindRunByID(ctx context.Context, taskID, runID platform.ID) defer resp.Body.Close() if err := CheckError(resp); err != nil { - if platform.ErrorCode(err) == platform.ENotFound { + if influxdb.ErrorCode(err) == influxdb.ENotFound { // ErrRunNotFound is expected as part of the FindRunByID contract, // so return that actual error instead of a different error that looks like it. // TODO cleanup backend error implementation - return nil, platform.ErrRunNotFound + return nil, influxdb.ErrRunNotFound } return nil, err @@ -1621,7 +1620,7 @@ func (t TaskService) FindRunByID(ctx context.Context, taskID, runID platform.ID) } // RetryRun creates and returns a new run (which is a retry of another run). -func (t TaskService) RetryRun(ctx context.Context, taskID, runID platform.ID) (*platform.Run, error) { +func (t TaskService) RetryRun(ctx context.Context, taskID, runID influxdb.ID) (*influxdb.Run, error) { span, _ := tracing.StartSpanFromContext(ctx) defer span.Finish() @@ -1647,11 +1646,11 @@ func (t TaskService) RetryRun(ctx context.Context, taskID, runID platform.ID) (* defer resp.Body.Close() if err := CheckError(resp); err != nil { - if platform.ErrorCode(err) == platform.ENotFound { + if influxdb.ErrorCode(err) == influxdb.ENotFound { // ErrRunNotFound is expected as part of the RetryRun contract, // so return that actual error instead of a different error that looks like it. // TODO cleanup backend task error implementation - return nil, platform.ErrRunNotFound + return nil, influxdb.ErrRunNotFound } // RequestStillQueuedError is also part of the contract. if e := backend.ParseRequestStillQueuedError(err.Error()); e != nil { @@ -1669,7 +1668,7 @@ func (t TaskService) RetryRun(ctx context.Context, taskID, runID platform.ID) (* } // ForceRun starts a run manually right now. -func (t TaskService) ForceRun(ctx context.Context, taskID platform.ID, scheduledFor int64) (*platform.Run, error) { +func (t TaskService) ForceRun(ctx context.Context, taskID influxdb.ID, scheduledFor int64) (*influxdb.Run, error) { span, _ := tracing.StartSpanFromContext(ctx) defer span.Finish() @@ -1695,7 +1694,7 @@ func (t TaskService) ForceRun(ctx context.Context, taskID platform.ID, scheduled defer resp.Body.Close() if err := CheckError(resp); err != nil { - if platform.ErrorCode(err) == platform.ENotFound { + if influxdb.ErrorCode(err) == influxdb.ENotFound { // ErrRunNotFound is expected as part of the RetryRun contract, // so return that actual error instead of a different error that looks like it. return nil, influxdb.ErrRunNotFound @@ -1716,12 +1715,12 @@ func (t TaskService) ForceRun(ctx context.Context, taskID platform.ID, scheduled return &rs.Run, nil } -func cancelPath(taskID, runID platform.ID) string { +func cancelPath(taskID, runID influxdb.ID) string { return path.Join(taskID.String(), runID.String()) } // CancelRun stops a longer running run. -func (t TaskService) CancelRun(ctx context.Context, taskID, runID platform.ID) error { +func (t TaskService) CancelRun(ctx context.Context, taskID, runID influxdb.ID) error { span, _ := tracing.StartSpanFromContext(ctx) defer span.Finish() @@ -1752,14 +1751,14 @@ func (t TaskService) CancelRun(ctx context.Context, taskID, runID platform.ID) e return nil } -func taskIDPath(id platform.ID) string { +func taskIDPath(id influxdb.ID) string { return path.Join(tasksPath, id.String()) } -func taskIDRunsPath(id platform.ID) string { +func taskIDRunsPath(id influxdb.ID) string { return path.Join(tasksPath, id.String(), "runs") } -func taskIDRunIDPath(taskID, runID platform.ID) string { +func taskIDRunIDPath(taskID, runID influxdb.ID) string { return path.Join(tasksPath, taskID.String(), "runs", runID.String()) } diff --git a/id_test.go b/id_test.go index c46d2a7b0a..30743e9aae 100644 --- a/id_test.go +++ b/id_test.go @@ -8,7 +8,6 @@ import ( "testing" "github.com/influxdata/influxdb" - platform "github.com/influxdata/influxdb" platformtesting "github.com/influxdata/influxdb/testing" ) @@ -16,7 +15,7 @@ func TestIDFromString(t *testing.T) { tests := []struct { name string id string - want platform.ID + want influxdb.ID wantErr bool err string }{ @@ -24,7 +23,7 @@ func TestIDFromString(t *testing.T) { name: "Should be able to decode an all zeros ID", id: "0000000000000000", wantErr: true, - err: platform.ErrInvalidID.Error(), + err: influxdb.ErrInvalidID.Error(), }, { name: "Should be able to decode an all f ID", @@ -40,24 +39,24 @@ func TestIDFromString(t *testing.T) { name: "Should not be able to decode a non hex ID", id: "gggggggggggggggg", wantErr: true, - err: platform.ErrInvalidID.Error(), + err: influxdb.ErrInvalidID.Error(), }, { name: "Should not be able to decode inputs with length less than 16 bytes", id: "abc", wantErr: true, - err: platform.ErrInvalidIDLength.Error(), + err: influxdb.ErrInvalidIDLength.Error(), }, { name: "Should not be able to decode inputs with length greater than 16 bytes", id: "abcdabcdabcdabcd0", wantErr: true, - err: platform.ErrInvalidIDLength.Error(), + err: influxdb.ErrInvalidIDLength.Error(), }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - got, err := platform.IDFromString(tt.id) + got, err := influxdb.IDFromString(tt.id) // Check negative test cases if (err != nil) && tt.wantErr { @@ -76,7 +75,7 @@ func TestIDFromString(t *testing.T) { } func TestDecodeFromString(t *testing.T) { - var id platform.ID + var id influxdb.ID err := id.DecodeFromString("020f755c3c082000") if err != nil { t.Errorf(err.Error()) @@ -95,7 +94,7 @@ func TestDecodeFromString(t *testing.T) { } func TestEncode(t *testing.T) { - var id platform.ID + var id influxdb.ID if _, err := id.Encode(); err == nil { t.Errorf("encoding an invalid ID should not be possible") } @@ -115,15 +114,15 @@ func TestEncode(t *testing.T) { } func TestDecodeFromAllZeros(t *testing.T) { - var id platform.ID - err := id.Decode(make([]byte, platform.IDLength)) + var id influxdb.ID + err := id.Decode(make([]byte, influxdb.IDLength)) if err == nil { t.Errorf("expecting all zeros ID to not be a valid ID") } } func TestDecodeFromShorterString(t *testing.T) { - var id platform.ID + var id influxdb.ID err := id.DecodeFromString("020f75") if err == nil { t.Errorf("expecting shorter inputs to error") @@ -134,7 +133,7 @@ func TestDecodeFromShorterString(t *testing.T) { } func TestDecodeFromLongerString(t *testing.T) { - var id platform.ID + var id influxdb.ID err := id.DecodeFromString("020f755c3c082000aaa") if err == nil { t.Errorf("expecting shorter inputs to error") @@ -145,7 +144,7 @@ func TestDecodeFromLongerString(t *testing.T) { } func TestDecodeFromEmptyString(t *testing.T) { - var id platform.ID + var id influxdb.ID err := id.DecodeFromString("") if err == nil { t.Errorf("expecting empty inputs to error") @@ -156,14 +155,14 @@ func TestDecodeFromEmptyString(t *testing.T) { } func TestMarshalling(t *testing.T) { - var id0 platform.ID + var id0 influxdb.ID _, err := json.Marshal(id0) if err == nil { t.Errorf("expecting empty ID to not be a valid one") } init := "ca55e77eca55e77e" - id1, err := platform.IDFromString(init) + id1, err := influxdb.IDFromString(init) if err != nil { t.Errorf(err.Error()) } @@ -173,7 +172,7 @@ func TestMarshalling(t *testing.T) { t.Errorf(err.Error()) } - var id2 platform.ID + var id2 influxdb.ID json.Unmarshal(serialized, &id2) bytes1, _ := id1.Encode() @@ -207,19 +206,19 @@ func TestMarshalling(t *testing.T) { } func TestValid(t *testing.T) { - var id platform.ID + var id influxdb.ID if id.Valid() { t.Errorf("expecting initial ID to be invalid") } - if platform.InvalidID() != 0 { + if influxdb.InvalidID() != 0 { t.Errorf("expecting invalid ID to return a zero ID, thus invalid") } } func TestID_GoString(t *testing.T) { type idGoStringTester struct { - ID platform.ID + ID influxdb.ID } var x idGoStringTester @@ -236,7 +235,7 @@ func TestID_GoString(t *testing.T) { } func BenchmarkIDEncode(b *testing.B) { - var id platform.ID + var id influxdb.ID id.DecodeFromString("5ca1ab1eba5eba11") b.ResetTimer() for i := 0; i < b.N; i++ { @@ -247,7 +246,7 @@ func BenchmarkIDEncode(b *testing.B) { func BenchmarkIDDecode(b *testing.B) { for i := 0; i < b.N; i++ { - var id platform.ID + var id influxdb.ID id.DecodeFromString("5ca1ab1eba5eba11") } } diff --git a/label_test.go b/label_test.go index 33c32ceeb8..01fec6f83e 100644 --- a/label_test.go +++ b/label_test.go @@ -4,7 +4,6 @@ import ( "testing" "github.com/influxdata/influxdb" - platform "github.com/influxdata/influxdb" influxtest "github.com/influxdata/influxdb/testing" ) @@ -46,7 +45,7 @@ func TestLabelValidate(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - m := platform.Label{ + m := influxdb.Label{ Name: tt.fields.Name, OrgID: tt.fields.OrgID, } diff --git a/query/control/controller.go b/query/control/controller.go index 09d4b012ec..8ca7ff9211 100644 --- a/query/control/controller.go +++ b/query/control/controller.go @@ -35,7 +35,7 @@ import ( "github.com/influxdata/influxdb/kit/prom" "github.com/influxdata/influxdb/kit/tracing" "github.com/influxdata/influxdb/query" - "github.com/opentracing/opentracing-go" + opentracing "github.com/opentracing/opentracing-go" "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" "go.uber.org/zap/zapcore" @@ -107,7 +107,7 @@ func New(c Config) (*Controller, error) { if err := c.Validate(); err != nil { return nil, errors.Wrap(err, "invalid controller config") } - c.MetricLabelKeys = append(c.MetricLabelKeys, orgLabel) + c.MetricLabelKeys = append(c.MetricLabelKeys, orgLabel) //lint:ignore SA1029 this is a temporary ignore until we have time to create an appropriate type logger := c.Logger if logger == nil { logger = zap.NewNop() @@ -145,7 +145,7 @@ func (c *Controller) Query(ctx context.Context, req *query.Request) (flux.Query, // Set the request on the context so platform specific Flux operations can retrieve it later. ctx = query.ContextWithRequest(ctx, req) // Set the org label value for controller metrics - ctx = context.WithValue(ctx, orgLabel, req.OrganizationID.String()) + ctx = context.WithValue(ctx, orgLabel, req.OrganizationID.String()) //lint:ignore SA1029 this is a temporary ignore until we have time to create an appropriate type q, err := c.query(ctx, req.Compiler) if err != nil { return q, err diff --git a/query/stdlib/influxdata/influxdb/source_test.go b/query/stdlib/influxdata/influxdb/source_test.go index 26793c4f10..0864146b8d 100644 --- a/query/stdlib/influxdata/influxdb/source_test.go +++ b/query/stdlib/influxdata/influxdb/source_test.go @@ -117,7 +117,7 @@ func TestMetrics(t *testing.T) { } // This key/value pair added to the context will appear as a label in the prometheus histogram. - ctx := context.WithValue(context.Background(), labelKey, labelValue) + ctx := context.WithValue(context.Background(), labelKey, labelValue) //lint:ignore SA1029 this is a temporary ignore until we have time to create an appropriate type rfs := influxdb.ReadFilterSource( execute.DatasetID(uuid.FromTime(time.Now())), &mockReader{}, diff --git a/query/stdlib/testing/end_to_end_test.go b/query/stdlib/testing/end_to_end_test.go index 76ac2ee02a..3423325037 100644 --- a/query/stdlib/testing/end_to_end_test.go +++ b/query/stdlib/testing/end_to_end_test.go @@ -21,7 +21,6 @@ import ( "github.com/influxdata/influxdb/query" itesting "github.com/influxdata/influxdb/query/stdlib/testing" - _ "github.com/influxdata/flux/stdlib" // Import the built-in functions _ "github.com/influxdata/influxdb/query/stdlib" // Import the stdlib ) diff --git a/task/backend/analytical_storage.go b/task/backend/analytical_storage.go index a27e289afc..bd88248bca 100644 --- a/task/backend/analytical_storage.go +++ b/task/backend/analytical_storage.go @@ -10,7 +10,6 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/flux/lang" "github.com/influxdata/influxdb" - platform "github.com/influxdata/influxdb" "github.com/influxdata/influxdb/models" "github.com/influxdata/influxdb/query" "github.com/influxdata/influxdb/storage" @@ -30,7 +29,7 @@ const ( statusTag = "status" // Fixed system bucket ID for task and run logs. - taskSystemBucketID platform.ID = 10 + taskSystemBucketID influxdb.ID = 10 ) // NewAnalyticalStorage creates a new analytical store with access to the necessary systems for storing data and to act as a middleware @@ -295,7 +294,7 @@ func (as *AnalyticalStorage) FindRunByID(ctx context.Context, taskID, runID infl } if len(re.runs) == 0 { - return nil, platform.ErrRunNotFound + return nil, influxdb.ErrRunNotFound } diff --git a/task/backend/executor/task_executor_test.go b/task/backend/executor/task_executor_test.go index 95ff968454..f49034f4b0 100644 --- a/task/backend/executor/task_executor_test.go +++ b/task/backend/executor/task_executor_test.go @@ -10,7 +10,6 @@ import ( "github.com/influxdata/flux" "github.com/influxdata/influxdb" - platform "github.com/influxdata/influxdb" icontext "github.com/influxdata/influxdb/context" "github.com/influxdata/influxdb/inmem" "github.com/influxdata/influxdb/kit/prom" @@ -64,7 +63,7 @@ func testQuerySuccess(t *testing.T) { script := fmt.Sprintf(fmtTestScript, t.Name()) ctx := icontext.SetAuthorizer(context.Background(), tes.tc.Auth) - task, err := tes.i.CreateTask(ctx, platform.TaskCreate{OrganizationID: tes.tc.OrgID, OwnerID: tes.tc.Auth.GetUserID(), Flux: script}) + task, err := tes.i.CreateTask(ctx, influxdb.TaskCreate{OrganizationID: tes.tc.OrgID, OwnerID: tes.tc.Auth.GetUserID(), Flux: script}) if err != nil { t.Fatal(err) } @@ -100,7 +99,7 @@ func testQueryFailure(t *testing.T) { script := fmt.Sprintf(fmtTestScript, t.Name()) ctx := icontext.SetAuthorizer(context.Background(), tes.tc.Auth) - task, err := tes.i.CreateTask(ctx, platform.TaskCreate{OrganizationID: tes.tc.OrgID, OwnerID: tes.tc.Auth.GetUserID(), Flux: script}) + task, err := tes.i.CreateTask(ctx, influxdb.TaskCreate{OrganizationID: tes.tc.OrgID, OwnerID: tes.tc.Auth.GetUserID(), Flux: script}) if err != nil { t.Fatal(err) } @@ -136,7 +135,7 @@ func testManualRun(t *testing.T) { script := fmt.Sprintf(fmtTestScript, t.Name()) ctx := icontext.SetAuthorizer(context.Background(), tes.tc.Auth) - task, err := tes.i.CreateTask(ctx, platform.TaskCreate{OrganizationID: tes.tc.OrgID, OwnerID: tes.tc.Auth.GetUserID(), Flux: script}) + task, err := tes.i.CreateTask(ctx, influxdb.TaskCreate{OrganizationID: tes.tc.OrgID, OwnerID: tes.tc.Auth.GetUserID(), Flux: script}) if err != nil { t.Fatal(err) } @@ -184,7 +183,7 @@ func testResumingRun(t *testing.T) { script := fmt.Sprintf(fmtTestScript, t.Name()) ctx := icontext.SetAuthorizer(context.Background(), tes.tc.Auth) - task, err := tes.i.CreateTask(ctx, platform.TaskCreate{OrganizationID: tes.tc.OrgID, OwnerID: tes.tc.Auth.GetUserID(), Flux: script}) + task, err := tes.i.CreateTask(ctx, influxdb.TaskCreate{OrganizationID: tes.tc.OrgID, OwnerID: tes.tc.Auth.GetUserID(), Flux: script}) if err != nil { t.Fatal(err) } @@ -233,7 +232,7 @@ func testWorkerLimit(t *testing.T) { script := fmt.Sprintf(fmtTestScript, t.Name()) ctx := icontext.SetAuthorizer(context.Background(), tes.tc.Auth) - task, err := tes.i.CreateTask(ctx, platform.TaskCreate{OrganizationID: tes.tc.OrgID, OwnerID: tes.tc.Auth.GetUserID(), Flux: script}) + task, err := tes.i.CreateTask(ctx, influxdb.TaskCreate{OrganizationID: tes.tc.OrgID, OwnerID: tes.tc.Auth.GetUserID(), Flux: script}) if err != nil { t.Fatal(err) } @@ -263,7 +262,7 @@ func testLimitFunc(t *testing.T) { script := fmt.Sprintf(fmtTestScript, t.Name()) ctx := icontext.SetAuthorizer(context.Background(), tes.tc.Auth) - task, err := tes.i.CreateTask(ctx, platform.TaskCreate{OrganizationID: tes.tc.OrgID, OwnerID: tes.tc.Auth.GetUserID(), Flux: script}) + task, err := tes.i.CreateTask(ctx, influxdb.TaskCreate{OrganizationID: tes.tc.OrgID, OwnerID: tes.tc.Auth.GetUserID(), Flux: script}) if err != nil { t.Fatal(err) } @@ -310,7 +309,7 @@ func testMetrics(t *testing.T) { script := fmt.Sprintf(fmtTestScript, t.Name()) ctx := icontext.SetAuthorizer(context.Background(), tes.tc.Auth) - task, err := tes.i.CreateTask(ctx, platform.TaskCreate{OrganizationID: tes.tc.OrgID, OwnerID: tes.tc.Auth.GetUserID(), Flux: script}) + task, err := tes.i.CreateTask(ctx, influxdb.TaskCreate{OrganizationID: tes.tc.OrgID, OwnerID: tes.tc.Auth.GetUserID(), Flux: script}) if err != nil { t.Fatal(err) } @@ -357,7 +356,7 @@ func testMetrics(t *testing.T) { } // manual runs metrics - mt, err := tes.i.CreateTask(ctx, platform.TaskCreate{OrganizationID: tes.tc.OrgID, OwnerID: tes.tc.Auth.GetUserID(), Flux: script}) + mt, err := tes.i.CreateTask(ctx, influxdb.TaskCreate{OrganizationID: tes.tc.OrgID, OwnerID: tes.tc.Auth.GetUserID(), Flux: script}) if err != nil { t.Fatal(err) } @@ -395,7 +394,7 @@ func testIteratorFailure(t *testing.T) { script := fmt.Sprintf(fmtTestScript, t.Name()) ctx := icontext.SetAuthorizer(context.Background(), tes.tc.Auth) - task, err := tes.i.CreateTask(ctx, platform.TaskCreate{OrganizationID: tes.tc.OrgID, OwnerID: tes.tc.Auth.GetUserID(), Flux: script}) + task, err := tes.i.CreateTask(ctx, influxdb.TaskCreate{OrganizationID: tes.tc.OrgID, OwnerID: tes.tc.Auth.GetUserID(), Flux: script}) if err != nil { t.Fatal(err) }