Skip to content

fix(policies): handle provider 404 #1291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
migmartri merged 1 commit into from
Sep 6, 2024
Merged

fix(policies): handle provider 404 #1291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/controlplane/pkg/biz/workflowcontract.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,10 @@ func (uc *WorkflowContractUseCase) GetPolicy(providerName, policyName, token str

policy, ref, err := provider.Resolve(policyName, token)
if err != nil {
if errors.Is(err, policies.ErrNotFound) {
return nil, NewErrNotFound(fmt.Sprintf("policy %q", policyName))
}

return nil, fmt.Errorf("failed to resolve policy: %w. Available providers: %s", err, uc.policyRegistry.GetProviderNames())
}

Expand Down
7 changes: 7 additions & 0 deletions app/controlplane/pkg/policies/policyprovider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ type PolicyReference struct {
Digest string
}

var ErrNotFound = fmt.Errorf("policy not found")

// Resolve calls the remote provider for retrieving a policy
func (p *PolicyProvider) Resolve(policyName string, token string) (*schemaapi.Policy, *PolicyReference, error) {
if policyName == "" || token == "" {
Expand All @@ -60,7 +62,12 @@ func (p *PolicyProvider) Resolve(policyName string, token string) (*schemaapi.Po
if err != nil {
return nil, nil, fmt.Errorf("error executing policy request: %w", err)
}

if resp.StatusCode != http.StatusOK {
if resp.StatusCode == http.StatusNotFound {
return nil, nil, ErrNotFound
}

return nil, nil, fmt.Errorf("expected status code 200 but got %d", resp.StatusCode)
}

Expand Down