storj/cmd/uplinkng/ultest/external.go

// Copyright (C) 2021 Storj Labs, Inc.
// See LICENSE for copying information.

package ultest

import (
	"context"

	"storj.io/storj/cmd/uplinkng/ulext"
	"storj.io/storj/cmd/uplinkng/ulfs"
	"storj.io/uplink"
)

type external struct {
	ulext.External

	fs      ulfs.Filesystem
	project *uplink.Project
}

func newExternal(fs ulfs.Filesystem, project *uplink.Project) *external {
	return &external{
		fs:      fs,
		project: project,
	}
}

func (ex *external) OpenFilesystem(ctx context.Context, access string, options ...ulext.Option) (ulfs.Filesystem, error) {
	return ex.fs, nil
}

func (ex *external) OpenProject(ctx context.Context, access string, options ...ulext.Option) (*uplink.Project, error) {
	return ex.project, nil
}
cmd/uplinkng: remove global flags this changes globalFlags to be a ulext.External interface value that is passed to each command. rather than have the ulext.External have a Setup call in the way that the projectProvider used to we make all of the state arguments to the functions and have the commands call setup themselves. the reason it is in its own package is so that cmd/uplinkng can import cmd/uplinkng/ultest but cmd/uplinkng/ultest needs to refer to whatever the interface type is to call the function that creates the commands. there's also quite a bit of shuffling around of code and names. sorry if that makes it tricky to review. there should be no logic changes, though. a side benefit is there's no longer a need to do a type assertion in ultest to make it set the fake filesystem to use. that can be passed in directly now. additionally, this makes the access commands much easier to test. Change-Id: I29cf6a2144248a58b7a605a7ae0a5ada5cfd57b6 2021-05-26 21:19:29 +01:00			`// Copyright (C) 2021 Storj Labs, Inc.`
			`// See LICENSE for copying information.`

			`package ultest`

			`import (`
			`"context"`

			`"storj.io/storj/cmd/uplinkng/ulext"`
			`"storj.io/storj/cmd/uplinkng/ulfs"`
			`"storj.io/uplink"`
			`)`

			`type external struct {`
cmd/uplinkng: access creation/restriction and review fixes Change-Id: I649ae3615363685c28c39d1efb6a65fcad507f46 2021-06-22 23:41:22 +01:00			`ulext.External`

cmd/uplinkng: remove global flags this changes globalFlags to be a ulext.External interface value that is passed to each command. rather than have the ulext.External have a Setup call in the way that the projectProvider used to we make all of the state arguments to the functions and have the commands call setup themselves. the reason it is in its own package is so that cmd/uplinkng can import cmd/uplinkng/ultest but cmd/uplinkng/ultest needs to refer to whatever the interface type is to call the function that creates the commands. there's also quite a bit of shuffling around of code and names. sorry if that makes it tricky to review. there should be no logic changes, though. a side benefit is there's no longer a need to do a type assertion in ultest to make it set the fake filesystem to use. that can be passed in directly now. additionally, this makes the access commands much easier to test. Change-Id: I29cf6a2144248a58b7a605a7ae0a5ada5cfd57b6 2021-05-26 21:19:29 +01:00			`fs ulfs.Filesystem`
			`project *uplink.Project`
			`}`

			`func newExternal(fs ulfs.Filesystem, project uplink.Project) external {`
			`return &external{`
			`fs: fs,`
			`project: project,`
			`}`
			`}`

			`func (ex *external) OpenFilesystem(ctx context.Context, access string, options ...ulext.Option) (ulfs.Filesystem, error) {`
			`return ex.fs, nil`
			`}`

			`func (ex external) OpenProject(ctx context.Context, access string, options ...ulext.Option) (uplink.Project, error) {`
			`return ex.project, nil`
			`}`