diff --git a/internal/application/application.go b/internal/application/application.go index ab2167b9..4afd5fa2 100644 --- a/internal/application/application.go +++ b/internal/application/application.go @@ -11,8 +11,6 @@ import ( alpha "github.com/nais/cli/internal/alpha/command" appCommand "github.com/nais/cli/internal/app/command" "github.com/nais/cli/internal/auth" - "github.com/nais/cli/internal/auth/login" - "github.com/nais/cli/internal/auth/logout" debug "github.com/nais/cli/internal/debug/command" "github.com/nais/cli/internal/flags" issues "github.com/nais/cli/internal/issues/command" @@ -56,8 +54,6 @@ func newApplication(w io.Writer) (*Application, *flags.GlobalFlags, error) { } cmds := []*naistrix.Command{ auth.Auth(globalFlags), - login.LoginDeprecated(globalFlags), - logout.LogoutDeprecated(globalFlags), appCommand.App(globalFlags), naisdevice.Naisdevice(globalFlags), members.Members(globalFlags), diff --git a/internal/auth/login/login.go b/internal/auth/login/login.go index e21a927c..01bc4fc2 100644 --- a/internal/auth/login/login.go +++ b/internal/auth/login/login.go @@ -4,7 +4,6 @@ import ( "context" "github.com/nais/cli/internal/auth/flag" - "github.com/nais/cli/internal/flags" "github.com/nais/cli/internal/gcloud" "github.com/nais/cli/internal/naisapi" "github.com/nais/naistrix" @@ -15,33 +14,6 @@ type loginFlags struct { Nais bool `name:"nais" short:"n" usage:"Login using login.nais.io instead of gcloud."` } -func LoginDeprecated(parentFlags *flags.GlobalFlags) *naistrix.Command { - flags := &loginFlags{Auth: &flag.Auth{GlobalFlags: parentFlags}} - return &naistrix.Command{ - Name: "login", - Title: "Log in to the Nais platform.", - Flags: flags, - Examples: []naistrix.Example{ - { - Description: "Log in to the Nais platform using gcloud.", - }, - { - Description: "Log in to the Nais platform using login.nais.io.", - Command: "-n", - }, - }, - Description: `Uses "gcloud auth login --update-adc" by default.`, - Deprecated: naistrix.DeprecatedWithReplacementFunc(func(context.Context, *naistrix.Arguments) []string { - cmd := []string{"auth", "login"} - if flags.Nais { - cmd = append(cmd, "-n") - } - - return cmd - }), - } -} - func Login(parentFlags *flag.Auth) *naistrix.Command { flags := &loginFlags{Auth: parentFlags} return &naistrix.Command{ diff --git a/internal/auth/logout/logout.go b/internal/auth/logout/logout.go index e02b32d3..f717f29a 100644 --- a/internal/auth/logout/logout.go +++ b/internal/auth/logout/logout.go @@ -4,7 +4,6 @@ import ( "context" "github.com/nais/cli/internal/auth/flag" - "github.com/nais/cli/internal/flags" "github.com/nais/cli/internal/gcloud" "github.com/nais/cli/internal/naisapi" "github.com/nais/naistrix" @@ -15,24 +14,6 @@ type loginFlags struct { Nais bool `name:"nais" short:"n" usage:"Logout using login.nais.io instead of gcloud.\nShould be used if you logged in using \"nais auth login --nais\"."` } -func LogoutDeprecated(parentFlags *flags.GlobalFlags) *naistrix.Command { - flags := &loginFlags{Auth: &flag.Auth{GlobalFlags: parentFlags}} - return &naistrix.Command{ - Name: "logout", - Title: "Log out and remove credentials.", - Description: "Log out of the Nais platform and remove credentials from your local machine.", - Flags: flags, - Deprecated: naistrix.DeprecatedWithReplacementFunc(func(context.Context, *naistrix.Arguments) []string { - cmd := []string{"auth", "logout"} - if flags.Nais { - cmd = append(cmd, "-n") - } - - return cmd - }), - } -} - func Logout(parentFlags *flag.Auth) *naistrix.Command { flags := &loginFlags{Auth: parentFlags} return &naistrix.Command{