@@ -70,7 +70,7 @@ func (s *serviceImpl) AuthFuncOverride(ctx context.Context, fullMethodName strin
7070// GetAuthProvider retrieves the authProvider based on the id passed
7171func (s * serviceImpl ) GetAuthProvider (_ context.Context , request * v1.GetAuthProviderRequest ) (* storage.AuthProvider , error ) {
7272 if request .GetId () == "" {
73- return nil , errox .NewErrInvalidArgs ("auth provider id is required " )
73+ return nil , errox .InvalidArgs . CausedBy ("auth provider id is empty " )
7474 }
7575 authProvider := s .registry .GetProvider (request .GetId ())
7676 if authProvider == nil {
@@ -158,37 +158,37 @@ func (s *serviceImpl) GetAuthProviders(_ context.Context, request *v1.GetAuthPro
158158func (s * serviceImpl ) PostAuthProvider (ctx context.Context , request * v1.PostAuthProviderRequest ) (* storage.AuthProvider , error ) {
159159 providerReq := request .GetProvider ()
160160 if providerReq .GetName () == "" {
161- return nil , errox .NewErrInvalidArgs ("no auth provider name specified" )
161+ return nil , errox .InvalidArgs . CausedBy ("no auth provider name specified" )
162162 }
163163 if providerReq .GetId () != "" {
164- return nil , errox .NewErrInvalidArgs ("auth provider id must be empty" )
164+ return nil , errox .InvalidArgs . CausedBy ("auth provider id is not empty" )
165165 }
166166 if providerReq .GetLoginUrl () != "" {
167- return nil , errox .NewErrInvalidArgs ("auth provider loginUrl field must be empty" )
167+ return nil , errox .InvalidArgs . CausedBy ("auth provider loginUrl field is not empty" )
168168 }
169169
170170 provider , err := s .registry .CreateProvider (ctx , authproviders .WithStorageView (providerReq ), authproviders .WithValidateCallback (datastore .Singleton ()))
171171 if err != nil {
172- return nil , errors .Wrap (errox .NewErrInvalidArgs (err .Error ()), "creating auth provider instance" )
172+ return nil , errors .Wrap (errox .InvalidArgs . CausedBy (err .Error ()), "creating auth provider instance" )
173173 }
174174 return provider .StorageView (), nil
175175}
176176
177177func (s * serviceImpl ) PutAuthProvider (ctx context.Context , request * storage.AuthProvider ) (* storage.AuthProvider , error ) {
178178 if request .GetId () == "" {
179- return nil , errox .NewErrInvalidArgs ("auth provider id must not be empty" )
179+ return nil , errox .InvalidArgs . CausedBy ("auth provider id is empty" )
180180 }
181181
182182 provider := s .registry .GetProvider (request .GetId ())
183183 if provider == nil {
184- return nil , errox .NewErrInvalidArgs (fmt .Sprintf ("auth provider with id %q does not exist" , request .GetId ()))
184+ return nil , errox .InvalidArgs . CausedBy (fmt .Sprintf ("auth provider with id %q does not exist" , request .GetId ()))
185185 }
186186
187187 // Attempt to merge configs.
188188 request .Config = provider .MergeConfigInto (request .GetConfig ())
189189
190190 if err := s .registry .ValidateProvider (ctx , authproviders .WithStorageView (request )); err != nil {
191- return nil , errox .NewErrInvalidArgs (fmt .Sprintf ("auth provider validation check failed: %v" , err ))
191+ return nil , errox .InvalidArgs . CausedBy (fmt .Sprintf ("auth provider validation check failed: %v" , err ))
192192 }
193193
194194 // This will not log anyone out as the provider was not validated and thus no one has ever logged into it
@@ -198,14 +198,14 @@ func (s *serviceImpl) PutAuthProvider(ctx context.Context, request *storage.Auth
198198
199199 provider , err := s .registry .CreateProvider (ctx , authproviders .WithStorageView (request ), authproviders .WithValidateCallback (datastore .Singleton ()))
200200 if err != nil {
201- return nil , errors .Wrap (errox .NewErrInvalidArgs (err .Error ()), "creating auth provider instance" )
201+ return nil , errors .Wrap (errox .InvalidArgs . CausedBy (err .Error ()), "creating auth provider instance" )
202202 }
203203 return provider .StorageView (), nil
204204}
205205
206206func (s * serviceImpl ) UpdateAuthProvider (ctx context.Context , request * v1.UpdateAuthProviderRequest ) (* storage.AuthProvider , error ) {
207207 if request .GetId () == "" {
208- return nil , errox .NewErrInvalidArgs ("auth provider id must not be empty" )
208+ return nil , errox .InvalidArgs . CausedBy ("auth provider id is empty" )
209209 }
210210
211211 var options []authproviders.ProviderOption
@@ -217,15 +217,15 @@ func (s *serviceImpl) UpdateAuthProvider(ctx context.Context, request *v1.Update
217217 }
218218 provider , err := s .registry .UpdateProvider (ctx , request .GetId (), options ... )
219219 if err != nil {
220- return nil , errors .Wrap (errox .NewErrInvalidArgs (err .Error ()), "updating auth provider" )
220+ return nil , errors .Wrap (errox .InvalidArgs . CausedBy (err .Error ()), "updating auth provider" )
221221 }
222222 return provider .StorageView (), nil
223223}
224224
225225// DeleteAuthProvider deletes an auth provider from the system
226226func (s * serviceImpl ) DeleteAuthProvider (ctx context.Context , request * v1.ResourceByID ) (* v1.Empty , error ) {
227227 if request .GetId () == "" {
228- return nil , errox .NewErrInvalidArgs ("auth provider id is required " )
228+ return nil , errox .InvalidArgs . CausedBy ("auth provider id is empty " )
229229 }
230230
231231 // Get auth provider.
0 commit comments