Skip to content

Make authenticated calls when ensuring options #267

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
puerco merged 1 commit into from
Aug 2, 2025
Merged

Make authenticated calls when ensuring options #267

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
12 changes: 10 additions & 2 deletions internal/cmd/checklevelprov.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"google.golang.org/protobuf/encoding/protojson"

"github.com/slsa-framework/slsa-source-poc/pkg/attest"
"github.com/slsa-framework/slsa-source-poc/pkg/auth"
"github.com/slsa-framework/slsa-source-poc/pkg/ghcontrol"
"github.com/slsa-framework/slsa-source-poc/pkg/policy"
)
Expand Down Expand Up @@ -78,12 +79,19 @@ func addCheckLevelProv(parentCmd *cobra.Command) {
}

func doCheckLevelProv(checkLevelProvArgs *checkLevelProvOpts) error {
ghconnection := ghcontrol.NewGhConnection(checkLevelProvArgs.owner, checkLevelProvArgs.repository, ghcontrol.BranchToFullRef(checkLevelProvArgs.branch)).WithAuthToken(githubToken)
t := githubToken
var err error
if t == "" {
t, err = auth.New().ReadToken()
if err != nil {
return err
}
}
ghconnection := ghcontrol.NewGhConnection(checkLevelProvArgs.owner, checkLevelProvArgs.repository, ghcontrol.BranchToFullRef(checkLevelProvArgs.branch)).WithAuthToken(t)
ghconnection.Options.AllowMergeCommits = checkLevelProvArgs.allowMergeCommits
ctx := context.Background()

prevCommit := checkLevelProvArgs.prevCommit
var err error
if prevCommit == "" {
prevCommit, err = ghconnection.GetPriorCommit(ctx, checkLevelProvArgs.commit)
if err != nil {
Expand Down
23 changes: 21 additions & 2 deletions internal/cmd/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/carabiner-dev/vcslocator"
"github.com/spf13/cobra"

"github.com/slsa-framework/slsa-source-poc/pkg/auth"
"github.com/slsa-framework/slsa-source-poc/pkg/ghcontrol"
"github.com/slsa-framework/slsa-source-poc/pkg/sourcetool/models"
)
Expand Down Expand Up @@ -122,7 +123,16 @@ func (bo *branchOptions) EnsureDefaults() error {
return nil
}

gcx := ghcontrol.NewGhConnection(bo.owner, bo.repository, "").WithAuthToken(githubToken)
t := githubToken
var err error
if t == "" {
t, err = auth.New().ReadToken()
if err != nil {
return err
}
}

gcx := ghcontrol.NewGhConnection(bo.owner, bo.repository, "").WithAuthToken(t)
branch, err := gcx.GetDefaultBranch(context.Background())
if err != nil {
return fmt.Errorf("reading repository default branch: %w", err)
Expand Down Expand Up @@ -181,7 +191,16 @@ func (co *commitOptions) EnsureDefaults() error {
}

if co.commit == "" {
gcx := ghcontrol.NewGhConnection(co.owner, co.repository, "").WithAuthToken(githubToken)
t := githubToken
var err error
if t == "" {
t, err = auth.New().ReadToken()
if err != nil {
return err
}
}

gcx := ghcontrol.NewGhConnection(co.owner, co.repository, "").WithAuthToken(t)
digest, err := gcx.GetLatestCommit(context.Background(), co.branch)
if err != nil {
return fmt.Errorf("fetching last commit from %q: %w", co.branch, err)
Expand Down
Loading