Skip to content

Commit 0be6f78

Browse files
authored
chore(serverless_jobs): filter job defs and runs by organization_id (#3757)
1 parent 0d06554 commit 0be6f78

File tree

6 files changed

+22
-6
lines changed

6 files changed

+22
-6
lines changed

cmd/scw/testdata/test-all-usage-jobs-definition-list-usage.golden

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ USAGE:
66
scw jobs definition list [arg=value ...]
77

88
ARGS:
9-
[order-by] (created_at_asc | created_at_desc)
10-
[project-id]
11-
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw | all)
9+
[order-by] (created_at_asc | created_at_desc)
10+
[project-id]
11+
[organization-id]
12+
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw | all)
1213

1314
FLAGS:
1415
-h, --help help for list

cmd/scw/testdata/test-all-usage-jobs-run-list-usage.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ARGS:
99
[order-by] (created_at_asc | created_at_desc)
1010
[job-definition-id]
1111
[project-id]
12+
[organization-id]
1213
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw | all)
1314

1415
FLAGS:

docs/commands/jobs.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ scw jobs definition list [arg=value ...]
109109
|------|---|-------------|
110110
| order-by | One of: `created_at_asc`, `created_at_desc` | |
111111
| project-id | | |
112+
| organization-id | | |
112113
| region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw`, `all` | Region to target. If none is passed will use default region from the config |
113114

114115

@@ -210,6 +211,7 @@ scw jobs run list [arg=value ...]
210211
| order-by | One of: `created_at_asc`, `created_at_desc` | |
211212
| job-definition-id | | |
212213
| project-id | | |
214+
| organization-id | | |
213215
| region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw`, `all` | Region to target. If none is passed will use default region from the config |
214216

215217

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ require (
2424
github.com/moby/buildkit v0.11.6
2525
github.com/opencontainers/go-digest v1.0.0
2626
github.com/pkg/errors v0.9.1
27-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.25.0.20240404123609-0262fe19b753
27+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.25.0.20240405144000-4e97e7066cac
2828
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
2929
github.com/spf13/cobra v1.8.0
3030
github.com/spf13/pflag v1.0.5

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,8 @@ github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUz
425425
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
426426
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
427427
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
428-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.25.0.20240404123609-0262fe19b753 h1:560ZctptQdKx0KGFRZ9r8Hx8bMRv86c/xvgCKt0EHas=
429-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.25.0.20240404123609-0262fe19b753/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
428+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.25.0.20240405144000-4e97e7066cac h1:eGkGyD5ICOgXbP6prT30gMnptSGdxvJo4vQNBD829J4=
429+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.25.0.20240405144000-4e97e7066cac/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
430430
github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
431431
github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
432432
github.com/secure-systems-lab/go-securesystemslib v0.4.0 h1:b23VGrQhTA8cN2CbBw7/FulN9fTtqYUdS5+Oxzt+DUE=

internal/namespaces/jobs/v1alpha1/jobs_cli.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,12 @@ func jobsDefinitionList() *core.Command {
212212
Deprecated: false,
213213
Positional: false,
214214
},
215+
{
216+
Name: "organization-id",
217+
Required: false,
218+
Deprecated: false,
219+
Positional: false,
220+
},
215221
core.RegionArgSpec(scw.RegionFrPar, scw.RegionNlAms, scw.RegionPlWaw, scw.Region(core.AllLocalities)),
216222
},
217223
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
@@ -515,6 +521,12 @@ func jobsRunList() *core.Command {
515521
Deprecated: false,
516522
Positional: false,
517523
},
524+
{
525+
Name: "organization-id",
526+
Required: false,
527+
Deprecated: false,
528+
Positional: false,
529+
},
518530
core.RegionArgSpec(scw.RegionFrPar, scw.RegionNlAms, scw.RegionPlWaw, scw.Region(core.AllLocalities)),
519531
},
520532
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {

0 commit comments

Comments
 (0)