From 20d95f23fabeaec7f428aad62255dbe92c175101 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Wed, 19 Aug 2020 12:44:15 +0200 Subject: [PATCH] Make linter happy --- pkg/service/v0/service.go | 2 +- pkg/service/v0/validator.go | 3 ++- pkg/store/filesystem/assignments_test.go | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/service/v0/service.go b/pkg/service/v0/service.go index 7d185213e7..98fcc2ee68 100644 --- a/pkg/service/v0/service.go +++ b/pkg/service/v0/service.go @@ -2,8 +2,8 @@ package svc import ( "context" - "github.com/golang/protobuf/ptypes/empty" + "github.com/golang/protobuf/ptypes/empty" "github.com/owncloud/ocis-pkg/v2/log" "github.com/owncloud/ocis-pkg/v2/middleware" "github.com/owncloud/ocis-settings/pkg/config" diff --git a/pkg/service/v0/validator.go b/pkg/service/v0/validator.go index b2494c8921..2ef5202fc0 100644 --- a/pkg/service/v0/validator.go +++ b/pkg/service/v0/validator.go @@ -11,7 +11,8 @@ import ( var ( regexForAccountUUID = regexp.MustCompile(`^[A-Za-z0-9\-_.+@]+$`) requireAccountID = []validation.Rule{ - validation.Required,// use rule for validation error message consistency (".. must not be blank" on empty strings) + // use rule for validation error message consistency (".. must not be blank" on empty strings) + validation.Required, validation.Match(regexForAccountUUID), } regexForKeys = regexp.MustCompile(`^[A-Za-z0-9\-_]*$`) diff --git a/pkg/store/filesystem/assignments_test.go b/pkg/store/filesystem/assignments_test.go index 25a0c652b8..e9aa387e2b 100644 --- a/pkg/store/filesystem/assignments_test.go +++ b/pkg/store/filesystem/assignments_test.go @@ -14,7 +14,7 @@ import ( var ( einstein = "a4d07560-a670-4be9-8d60-9b547751a208" - marie = "3c054db3-eec1-4ca4-b985-bc56dcf560cb" + //marie = "3c054db3-eec1-4ca4-b985-bc56dcf560cb" s = Store{ dataPath: dataRoot,