Don't return an empty resource if there was an apiErr (#294)

This commit is contained in:
Jeff Mitchell authored and GitHub committed 2020-08-20 17:31:38 -04:00
1 parent b24fc185a7
commit 627a353ccb
11 files changed
+198 -66

No files matched your search

+15 -5
View File
@@ -59,7 +59,9 @@ func (c *ScopesClient) Create(ctx context.Context, scopeId string, opt ...Option
if err != nil {
return nil, nil, fmt.Errorf("error decoding Create response: %w", err)
}
if apiErr != nil {
return nil, apiErr, nil
}
return target, apiErr, nil
}
@@ -89,7 +91,9 @@ func (c *ScopesClient) Read(ctx context.Context, scopeId string, opt ...Option)
if err != nil {
return nil, nil, fmt.Errorf("error decoding Read response: %w", err)
}
if apiErr != nil {
return nil, apiErr, nil
}
return target, apiErr, nil
}
@@ -137,7 +141,9 @@ func (c *ScopesClient) Update(ctx context.Context, scopeId string, version uint3
if err != nil {
return nil, nil, fmt.Errorf("error decoding Update response: %w", err)
}
if apiErr != nil {
return nil, apiErr, nil
}
return target, apiErr, nil
}
@@ -170,7 +176,9 @@ func (c *ScopesClient) Delete(ctx context.Context, scopeId string, opt ...Option
if err != nil {
return false, nil, fmt.Errorf("error decoding Delete response: %w", err)
}
if apiErr != nil {
return false, apiErr, nil
}
return target.Existed, apiErr, nil
}
@@ -207,6 +215,8 @@ func (c *ScopesClient) List(ctx context.Context, scopeId string, opt ...Option)
if err != nil {
return nil, nil, fmt.Errorf("error decoding List response: %w", err)
}
if apiErr != nil {
return nil, apiErr, nil
}
return target.Items, apiErr, nil
}