CyberCoveLLC/threshold
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

See how Boundary would look with gofumpt applied (#853)

Browse Source 
* See how Boundary would look with https://github.com/mvdan/gofumpt applied

Results of running `gofumpt -w -s .`

* Update tools file and Makefile for gofumpt

Co-authored-by: Jeff Mitchell <jeffrey.mitchell@gmail.com>
This commit is contained in:
Michael GaffneyandJeff Mitchell authored and GitHub committed 2021-01-07 10:02:32 -05:00
1 parent cca0fbea2b
commit 94cb79bbdd
237 files changed
+1567 -1529
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

internal/servers/controller/handler_test.go
-1
View File
@@ -186,7 +186,6 @@ func TestHandleImplementedPaths(t *testing.T) {
} {
for _, p := range paths {
t.Run(fmt.Sprintf("%s/%s", verb, p), func(t *testing.T) {
var expCode int
if !strings.HasPrefix(p, "v1/") {
sp := strings.Split(p, "_")
internal/servers/controller/handler_ui_test.go
+2 -2
View File
@@ -33,9 +33,9 @@ func TestUiRouting(t *testing.T) {
for k, v := range nameContentsMap {
dir := filepath.Dir(k)
if dir != "/" {
require.NoError(t, os.MkdirAll(filepath.Join(tempDir, dir), 0755))
require.NoError(t, os.MkdirAll(filepath.Join(tempDir, dir), 0o755))
}
require.NoError(t, ioutil.WriteFile(filepath.Join(tempDir, k), []byte(v), 0644))
require.NoError(t, ioutil.WriteFile(filepath.Join(tempDir, k), []byte(v), 0o644))
}
c := NewTestController(t, &TestControllerOpts{DisableAutoStart: true})
internal/servers/controller/handlers/accounts/account_service.go
+1 -3
View File
@@ -18,9 +18,7 @@ import (
"google.golang.org/protobuf/types/known/wrapperspb"
)
var (
maskManager handlers.MaskManager
)
var maskManager handlers.MaskManager
func init() {
var err error
internal/servers/controller/handlers/accounts/account_service_test.go
+4 -2
View File
@@ -491,7 +491,8 @@ func TestUpdate(t *testing.T) {
Description: wrapperspb.String("default"),
Type: "password",
Attributes: defaultAttributes,
}},
},
},
)
require.NoError(t, err)
@@ -718,7 +719,8 @@ func TestUpdate(t *testing.T) {
Id: password.AccountPrefix + "_somethinge",
Name: &wrapperspb.StringValue{Value: "new"},
Description: &wrapperspb.StringValue{Value: "new desc"},
}},
},
},
res: nil,
err: handlers.ApiErrorWithCode(codes.InvalidArgument),
},
internal/servers/controller/handlers/authmethods/authmethod_service.go
+1 -3
View File
@@ -31,9 +31,7 @@ const (
pwKey = "password"
)
var (
maskManager handlers.MaskManager
)
var maskManager handlers.MaskManager
func init() {
var err error
internal/servers/controller/handlers/authmethods/authmethod_service_test.go
+2 -1
View File
@@ -738,7 +738,8 @@ func TestUpdate(t *testing.T) {
Id: password.AuthMethodPrefix + "_somethinge",
Name: &wrapperspb.StringValue{Value: "new"},
Description: &wrapperspb.StringValue{Value: "new desc"},
}},
},
},
res: nil,
err: handlers.ApiErrorWithCode(codes.InvalidArgument),
},
internal/servers/controller/handlers/errors.go
+16 -8
View File
@@ -53,7 +53,8 @@ func ApiErrorWithCode(c codes.Code) error {
status: int32(runtime.HTTPStatusFromCode(c)),
inner: &pb.Error{
Kind: c.String(),
}}
},
}
}
// ApiErrorWithCodeAndMessage returns an api error with the provided code and message.
@@ -63,7 +64,8 @@ func ApiErrorWithCodeAndMessage(c codes.Code, msg string, args ...interface{}) e
inner: &pb.Error{
Kind: c.String(),
Message: fmt.Sprintf(msg, args...),
}}
},
}
}
// NotFoundError returns an ApiError indicating a resource couldn't be found.
@@ -73,7 +75,8 @@ func NotFoundError() error {
inner: &pb.Error{
Kind: codes.NotFound.String(),
Message: "Resource not found.",
}}
},
}
}
// NotFoundErrorf returns an ApiError indicating a resource couldn't be found.
@@ -83,7 +86,8 @@ func NotFoundErrorf(msg string, a ...interface{}) error {
inner: &pb.Error{
Kind: codes.NotFound.String(),
Message: fmt.Sprintf(msg, a...),
}}
},
}
}
func ForbiddenError() error {
@@ -92,7 +96,8 @@ func ForbiddenError() error {
inner: &pb.Error{
Kind: codes.PermissionDenied.String(),
Message: "Forbidden.",
}}
},
}
}
func UnauthenticatedError() error {
@@ -101,7 +106,8 @@ func UnauthenticatedError() error {
inner: &pb.Error{
Kind: codes.Unauthenticated.String(),
Message: "Unauthenticated, or invalid token.",
}}
},
}
}
func InvalidArgumentErrorf(msg string, fields map[string]string) error {
@@ -136,7 +142,8 @@ func backendErrorToApiError(inErr error) error {
inner: &pb.Error{
Kind: codes.NotFound.String(),
Message: http.StatusText(http.StatusNotFound),
}}
},
}
case status.Code(inErr) == codes.Unimplemented:
// Instead of returning a 501 we always want to return a 405 when a method isn't implemented.
return &apiError{
@@ -144,7 +151,8 @@ func backendErrorToApiError(inErr error) error {
inner: &pb.Error{
Kind: codes.Unimplemented.String(),
Message: stErr.Message(),
}}
},
}
case errors.Is(inErr, errors.ErrRecordNotFound), errors.Match(errors.T(errors.RecordNotFound), inErr):
return NotFoundErrorf(genericNotFoundMsg)
case errors.Is(inErr, errors.ErrInvalidFieldMask), errors.Is(inErr, errors.ErrEmptyFieldMask),
internal/servers/controller/handlers/groups/group_service.go
+1 -3
View File
@@ -20,9 +20,7 @@ import (
"google.golang.org/protobuf/types/known/wrapperspb"
)
var (
maskManager handlers.MaskManager
)
var maskManager handlers.MaskManager
func init() {
var err error
internal/servers/controller/handlers/groups/group_service_test.go
+2 -1
View File
@@ -823,7 +823,8 @@ func TestUpdate(t *testing.T) {
Id: iam.GroupPrefix + "_somethinge",
Name: &wrapperspb.StringValue{Value: "new"},
Description: &wrapperspb.StringValue{Value: "new desc"},
}},
},
},
res: nil,
err: handlers.ApiErrorWithCode(codes.InvalidArgument),
},
internal/servers/controller/handlers/host_catalogs/host_catalog_service.go
+1 -3
View File
@@ -20,9 +20,7 @@ import (
"google.golang.org/protobuf/types/known/wrapperspb"
)
var (
maskManager handlers.MaskManager
)
var maskManager handlers.MaskManager
func init() {
var err error
internal/servers/controller/handlers/host_catalogs/host_catalog_service_test.go
+3 -2
View File
@@ -659,7 +659,8 @@ func TestUpdate(t *testing.T) {
Scope: &scopepb.ScopeInfo{Id: proj.GetPublicId(), Type: scope.Project.String()},
Name: &wrappers.StringValue{Value: "new"},
Description: &wrappers.StringValue{Value: "new desc"},
}},
},
},
res: nil,
err: handlers.ApiErrorWithCode(codes.InvalidArgument),
},
@@ -736,7 +737,7 @@ func TestUpdate(t *testing.T) {
require.NoError(err, "Failed to convert proto to timestamp")
// Verify it is a catalog updated after it was created
// TODO: This is currently failing.
//assert.True(gotUpdateTime.After(hcCreated), "Updated catalog should have been updated after it's creation. Was updated %v, which is after %v", gotUpdateTime, hcCreated)
// assert.True(gotUpdateTime.After(hcCreated), "Updated catalog should have been updated after it's creation. Was updated %v, which is after %v", gotUpdateTime, hcCreated)
_ = gotUpdateTime
_ = hcCreated
internal/servers/controller/handlers/host_sets/host_set_service.go
+1 -3
View File
@@ -20,9 +20,7 @@ import (
"google.golang.org/protobuf/types/known/wrapperspb"
)
var (
maskManager handlers.MaskManager
)
var maskManager handlers.MaskManager
func init() {
var err error
internal/servers/controller/handlers/host_sets/host_set_service_test.go
+2 -1
View File
@@ -675,7 +675,8 @@ func TestUpdate(t *testing.T) {
Scope: &scopes.ScopeInfo{Id: proj.GetPublicId(), Type: scope.Project.String()},
Name: &wrappers.StringValue{Value: "new"},
Description: &wrappers.StringValue{Value: "new desc"},
}},
},
},
res: nil,
err: handlers.ApiErrorWithCode(codes.InvalidArgument),
},
internal/servers/controller/handlers/hosts/host_service.go
+1 -3
View File
@@ -21,9 +21,7 @@ import (
"google.golang.org/protobuf/types/known/wrapperspb"
)
var (
maskManager handlers.MaskManager
)
var maskManager handlers.MaskManager
func init() {
var err error
internal/servers/controller/handlers/hosts/host_service_test.go
+6 -3
View File
@@ -702,7 +702,8 @@ func TestUpdate(t *testing.T) {
Scope: &scopes.ScopeInfo{Id: proj.GetPublicId(), Type: scope.Project.String()},
Name: &wrappers.StringValue{Value: "new"},
Description: &wrappers.StringValue{Value: "new desc"},
}},
},
},
res: nil,
err: handlers.ApiErrorWithCode(codes.InvalidArgument),
},
@@ -717,7 +718,8 @@ func TestUpdate(t *testing.T) {
Attributes: &structpb.Struct{Fields: map[string]*structpb.Value{
"address": structpb.NewNullValue(),
}},
}},
},
},
res: nil,
err: handlers.ApiErrorWithCode(codes.InvalidArgument),
},
@@ -732,7 +734,8 @@ func TestUpdate(t *testing.T) {
Attributes: &structpb.Struct{Fields: map[string]*structpb.Value{
"address": structpb.NewStringValue(""),
}},
}},
},
},
res: nil,
err: handlers.ApiErrorWithCode(codes.InvalidArgument),
},
internal/servers/controller/handlers/roles/role_service.go
+1 -3
View File
@@ -21,9 +21,7 @@ import (
"google.golang.org/protobuf/types/known/wrapperspb"
)
var (
maskManager handlers.MaskManager
)
var maskManager handlers.MaskManager
func init() {
var err error
internal/servers/controller/handlers/roles/role_service_test.go
+2 -2
View File
@@ -342,7 +342,6 @@ func TestDelete_twice(t *testing.T) {
_, gErr = s.DeleteRole(ctx, projReq)
assert.Error(gErr, "Second attempt")
assert.True(errors.Is(gErr, handlers.ApiErrorWithCode(codes.NotFound)), "Expected permission denied for the second delete.")
}
func TestCreate(t *testing.T) {
@@ -822,7 +821,8 @@ func TestUpdate(t *testing.T) {
Id: iam.RolePrefix + "_somethinge",
Name: &wrapperspb.StringValue{Value: "new"},
Description: &wrapperspb.StringValue{Value: "new desc"},
}},
},
},
res: nil,
err: handlers.ApiErrorWithCode(codes.InvalidArgument),
},
internal/servers/controller/handlers/scopes/scope_service.go
+1 -3
View File
@@ -21,9 +21,7 @@ import (
"google.golang.org/protobuf/types/known/wrapperspb"
)
var (
maskManager handlers.MaskManager
)
var maskManager handlers.MaskManager
func init() {
var err error
internal/servers/controller/handlers/scopes/scope_service_test.go
+2 -1
View File
@@ -932,7 +932,8 @@ func TestUpdate(t *testing.T) {
Scope: &pb.ScopeInfo{Id: org.GetPublicId(), Type: scope.Org.String()},
Name: &wrapperspb.StringValue{Value: "new"},
Description: &wrapperspb.StringValue{Value: "new desc"},
}},
},
},
res: nil,
err: handlers.ApiErrorWithCode(codes.InvalidArgument),
},
internal/servers/controller/handlers/targets/target_service.go
+1 -3
View File
@@ -34,9 +34,7 @@ import (
"google.golang.org/protobuf/types/known/wrapperspb"
)
var (
maskManager handlers.MaskManager
)
var maskManager handlers.MaskManager
func init() {
var err error
internal/servers/controller/handlers/targets/target_service_test.go
+2 -1
View File
@@ -693,7 +693,8 @@ func TestUpdate(t *testing.T) {
Scope: &scopes.ScopeInfo{Id: proj.GetPublicId(), Type: scope.Project.String()},
Name: wrapperspb.String("new"),
Description: wrapperspb.String("new desc"),
}},
},
},
res: nil,
err: handlers.ApiErrorWithCode(codes.InvalidArgument),
},
internal/servers/controller/handlers/users/user_service.go
+1 -3
View File
@@ -21,9 +21,7 @@ import (
"google.golang.org/protobuf/types/known/wrapperspb"
)
var (
maskManager handlers.MaskManager
)
var maskManager handlers.MaskManager
func init() {
var err error
internal/servers/controller/handlers/users/user_service_test.go
+2 -1
View File
@@ -533,7 +533,8 @@ func TestUpdate(t *testing.T) {
Id: iam.UserPrefix + "_somethinge",
Name: &wrapperspb.StringValue{Value: "new"},
Description: &wrapperspb.StringValue{Value: "new desc"},
}},
},
},
res: nil,
err: handlers.ApiErrorWithCode(codes.InvalidArgument),
},
internal/servers/controller/handlers/workers/worker_service.go
+4 -2
View File
@@ -42,8 +42,10 @@ func NewWorkerServiceServer(
}
}
var _ pbs.SessionServiceServer = &workerServiceServer{}
var _ pbs.ServerCoordinationServiceServer = &workerServiceServer{}
var (
_ pbs.SessionServiceServer = &workerServiceServer{}
_ pbs.ServerCoordinationServiceServer = &workerServiceServer{}
)
func (ws *workerServiceServer) Status(ctx context.Context, req *pbs.StatusRequest) (*pbs.StatusResponse, error) {
ws.logger.Trace("got status request from worker", "name", req.Worker.Name, "address", req.Worker.Address, "jobs", req.GetJobs())