Skip to content

refactor: remove old login / logout commands #623

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

Open
christeredvartsen wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: remove old login / logout commands #623

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: 0 additions & 4 deletions internal/application/application.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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),
Expand Down
28 changes: 0 additions & 28 deletions internal/auth/login/login.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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{
Expand Down
19 changes: 0 additions & 19 deletions internal/auth/logout/logout.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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{
Expand Down