-
Notifications
You must be signed in to change notification settings - Fork 61
fix: Use organization job routes #833
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.
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
Open
lox
wants to merge
2
commits into
main
Choose a base branch
from
lox/job-unblock-rest
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| package job | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "io" | ||
| "os" | ||
| ) | ||
|
|
||
| func warnIgnoredJobContextFlags(w io.Writer, pipeline, buildNumber string) { | ||
| if pipeline == "" && buildNumber == "" { | ||
| return | ||
| } | ||
| if w == nil { | ||
| w = os.Stderr | ||
| } | ||
|
|
||
| fmt.Fprintln(w, "Warning: --pipeline and --build are deprecated and ignored because job UUIDs no longer require pipeline or build context") | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| package job | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "strings" | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestWarnIgnoredJobContextFlags(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| tests := []struct { | ||
| name string | ||
| pipeline string | ||
| buildNumber string | ||
| wantWarning bool | ||
| }{ | ||
| { | ||
| name: "no flags", | ||
| wantWarning: false, | ||
| }, | ||
| { | ||
| name: "pipeline", | ||
| pipeline: "cli", | ||
| wantWarning: true, | ||
| }, | ||
| { | ||
| name: "build", | ||
| buildNumber: "123", | ||
| wantWarning: true, | ||
| }, | ||
| { | ||
| name: "both flags", | ||
| pipeline: "cli", | ||
| buildNumber: "123", | ||
| wantWarning: true, | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| var stderr bytes.Buffer | ||
| warnIgnoredJobContextFlags(&stderr, tt.pipeline, tt.buildNumber) | ||
|
|
||
| got := stderr.String() | ||
| if tt.wantWarning { | ||
| if !strings.Contains(got, "Warning: --pipeline and --build are deprecated and ignored") { | ||
| t.Fatalf("warning = %q", got) | ||
| } | ||
| return | ||
| } | ||
| if got != "" { | ||
| t.Fatalf("warning = %q, want empty", got) | ||
| } | ||
| }) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| package job | ||
|
|
||
| import "fmt" | ||
|
|
||
| func configuredOrganization(organization string) (string, error) { | ||
| if organization == "" { | ||
| return "", fmt.Errorf("no organization configured. Run bk auth login, or bk use, to set an organization") | ||
| } | ||
|
|
||
| return organization, nil | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package job | ||
|
|
||
| import "testing" | ||
|
|
||
| func TestConfiguredOrganization(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| got, err := configuredOrganization("buildkite") | ||
| if err != nil { | ||
| t.Fatalf("configuredOrganization() error = %v", err) | ||
| } | ||
| if got != "buildkite" { | ||
| t.Fatalf("configuredOrganization() = %q", got) | ||
| } | ||
| } | ||
|
|
||
| func TestConfiguredOrganizationRequiresOrganization(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| if _, err := configuredOrganization(""); err == nil { | ||
| t.Fatal("configuredOrganization() error = nil, want error") | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| package job | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "net/url" | ||
|
|
||
| buildkite "github.com/buildkite/go-buildkite/v4" | ||
| ) | ||
|
|
||
| type unblockJobOptions struct { | ||
| Fields map[string]any `json:"fields,omitempty"` | ||
| } | ||
|
|
||
| func organizationJobPath(organization, jobID, action string) string { | ||
| return fmt.Sprintf( | ||
| "v2/organizations/%s/jobs/%s/%s", | ||
| url.PathEscape(organization), | ||
| url.PathEscape(jobID), | ||
| action, | ||
| ) | ||
| } | ||
|
|
||
| func getJobLog(ctx context.Context, client *buildkite.Client, organization, jobID string) (buildkite.JobLog, error) { | ||
| req, err := client.NewRequest(ctx, "GET", organizationJobPath(organization, jobID, "log"), nil) | ||
| if err != nil { | ||
| return buildkite.JobLog{}, err | ||
| } | ||
| req.Header.Set("Accept", "application/json") | ||
|
|
||
| var jobLog buildkite.JobLog | ||
| if _, err := client.Do(req, &jobLog); err != nil { | ||
| return buildkite.JobLog{}, err | ||
| } | ||
|
|
||
| return jobLog, nil | ||
| } | ||
|
|
||
| func reprioritizeJob(ctx context.Context, client *buildkite.Client, organization, jobID string, priority int) (buildkite.Job, error) { | ||
| req, err := client.NewRequest(ctx, "PUT", organizationJobPath(organization, jobID, "reprioritize"), &buildkite.JobReprioritizationOptions{ | ||
| Priority: priority, | ||
| }) | ||
| if err != nil { | ||
| return buildkite.Job{}, err | ||
| } | ||
|
|
||
| var job buildkite.Job | ||
| if _, err := client.Do(req, &job); err != nil { | ||
| return buildkite.Job{}, err | ||
| } | ||
|
|
||
| return job, nil | ||
| } | ||
|
|
||
| func unblockJob(ctx context.Context, client *buildkite.Client, organization, jobID string, fields map[string]any) (buildkite.Job, error) { | ||
| req, err := client.NewRequest(ctx, "PUT", organizationJobPath(organization, jobID, "unblock"), &unblockJobOptions{ | ||
| Fields: fields, | ||
| }) | ||
| if err != nil { | ||
| return buildkite.Job{}, err | ||
| } | ||
|
|
||
| var job buildkite.Job | ||
| if _, err := client.Do(req, &job); err != nil { | ||
| return buildkite.Job{}, err | ||
| } | ||
|
|
||
| return job, nil | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.