Skip to content
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

Switch yaml libraries to use json annotations #290

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Switch yaml libraries to use json annotations #290

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
1 change: 0 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ require (
golang.org/x/oauth2 v0.19.0
google.golang.org/api v0.174.0
google.golang.org/grpc v1.63.2
gopkg.in/yaml.v2 v2.4.0
k8s.io/apimachinery v0.29.1
sigs.k8s.io/yaml v1.4.0
)
Expand Down
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,6 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
Expand Down
2 changes: 1 addition & 1 deletion pkg/webhook/webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"github.com/google/go-github/v58/github"
"github.com/hashicorp/go-multierror"
"github.com/octo-sts/app/pkg/octosts"
"gopkg.in/yaml.v2"
"k8s.io/apimachinery/pkg/util/sets"
"sigs.k8s.io/yaml"
)

const (
Expand Down
47 changes: 47 additions & 0 deletions pkg/webhook/webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
// Copyright 2024 Chainguard, Inc.
// SPDX-License-Identifier: Apache-2.0

package webhook

import (
"testing"

"github.com/octo-sts/app/pkg/octosts"
"sigs.k8s.io/yaml"
)

func TestYAMLUnmarshalStrict(t *testing.T) {
const orgPolicy = `
issuer: https://issuer.enforce.dev
subject: 9e8b549b441afc4f082e9dccb5d1eeda843af975
claim_pattern:
email: .*

permissions:
metadata: read
administration: read

repositories: [] # Act over all of the repos in the org.
`
const repoPolicy = `
issuer: https://issuer.enforce.dev
subject: 9e8b549b441afc4f082e9dccb5d1eeda843af975
claim_pattern:
email: .*

permissions:
metadata: read
administration: read
`
if err := yaml.UnmarshalStrict([]byte(orgPolicy), &octosts.OrgTrustPolicy{}); err != nil {
t.Error(err)
}

tp := &octosts.TrustPolicy{}
if err := yaml.UnmarshalStrict([]byte(orgPolicy), tp); err == nil {
t.Errorf("Wanted error, got: %v", tp)
}
if err := yaml.UnmarshalStrict([]byte(repoPolicy), &octosts.TrustPolicy{}); err != nil {
t.Error(err)
}
}