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

feat: remove deprecation warning on organization #1640

Merged
merged 1 commit into from
Jan 7, 2021
Merged

feat: remove deprecation warning on organization #1640

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: 1 addition & 3 deletions cmd/scw/testdata/test-all-usage-instance-server-create-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ ARGS:
[boot-type=local] The boot type to use, if empty the local boot will be used. Will be overwritten to bootscript if bootscript-id is set. (local | bootscript | rescue)
[project-id] Project ID to use. If none is passed the default project ID will be used
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config

DEPRECATED ARGS:
[organization-id] Please use project-id instead
[organization-id] Organization ID to use. If none is passed the default organization ID will be used

FLAGS:
-h, --help help for create
Expand Down
12 changes: 0 additions & 12 deletions internal/core/arg_specs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,6 @@ func ProjectArgSpec() *ArgSpec {
}
}

// TODO: Remove me and:
// - use OrganizationIDDeprecatedArgSpec in the generator
// - stop using renameOrganizationIDArgSpec and renameProjectIDArgSpec for these use-cases
func OrganizationArgSpec() *ArgSpec {
return &ArgSpec{
Name: "organization",
Expand All @@ -202,12 +199,3 @@ func OrganizationIDArgSpec() *ArgSpec {
ValidateFunc: ValidateOrganizationID(),
}
}

func OrganizationIDDeprecatedArgSpec() *ArgSpec {
return &ArgSpec{
Name: "organization-id",
Short: "Please use project-id instead",
ValidateFunc: ValidateOrganizationID(),
Deprecated: true,
}
}
2 changes: 1 addition & 1 deletion internal/namespaces/instance/v1/custom_server_create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func serverCreateCommand() *core.Command {
},
core.ProjectIDArgSpec(),
core.ZoneArgSpec(),
core.OrganizationIDDeprecatedArgSpec(),
core.OrganizationIDArgSpec(),
},
Run: instanceServerCreateRun,
WaitFunc: instanceWaitServerCreateRun(),
Expand Down