From d3b72899f1d6370b205c508a8a9b6bdd42f6ece1 Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Mon, 5 Apr 2021 09:16:38 -0700 Subject: [PATCH] fix scopes double import (#1066) --- internal/servers/controller/handlers/scopes/scope_service.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/internal/servers/controller/handlers/scopes/scope_service.go b/internal/servers/controller/handlers/scopes/scope_service.go index fbf37023a..bd2db6258 100644 --- a/internal/servers/controller/handlers/scopes/scope_service.go +++ b/internal/servers/controller/handlers/scopes/scope_service.go @@ -7,7 +7,6 @@ import ( "strings" "github.com/hashicorp/boundary/internal/auth" - "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" pb "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/iam" @@ -322,7 +321,7 @@ func (s Service) createInRepo(ctx context.Context, authResults auth.VerifyResult return ToProto(out), nil } -func (s Service) updateInRepo(ctx context.Context, parentScope *scopes.ScopeInfo, scopeId string, mask []string, item *pb.Scope) (*pb.Scope, error) { +func (s Service) updateInRepo(ctx context.Context, parentScope *pb.ScopeInfo, scopeId string, mask []string, item *pb.Scope) (*pb.Scope, error) { var opts []iam.Option if desc := item.GetDescription(); desc != nil { opts = append(opts, iam.WithDescription(desc.GetValue()))