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

Update commands with resource builders to use external versions #20400

Closed
wants to merge 8 commits into from
Closed

Update commands with resource builders to use external versions #20400

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e5f669d
update extract command
juanvallejo Jul 23, 2018
f4ab185
update rsync
juanvallejo Jul 23, 2018
0f74d82
UPSTREAM: 66519: switch attach to use external objs
juanvallejo Jul 25, 2018
c7c536a
update debug cmd to use externals
juanvallejo Jul 23, 2018
54a7df4
update secret cmd to externals
juanvallejo Jul 23, 2018
302b786
update generated completions
juanvallejo Jul 26, 2018
c20f996
update import restrictions
juanvallejo Jul 27, 2018
8a8b443
update log cmd to use corev1.PodLogOptions
juanvallejo Aug 1, 2018
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
112 changes: 51 additions & 61 deletions pkg/oc/cli/secrets/basicauth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,20 @@ package secrets
import (
"errors"
"fmt"
"io"
"io/ioutil"

"github.com/spf13/cobra"

api "k8s.io/kubernetes/pkg/apis/core"
kcoreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion"
corev1 "k8s.io/api/core/v1"
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
"k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers"
kterm "k8s.io/kubernetes/pkg/kubectl/util/term"

"github.com/openshift/origin/pkg/cmd/util/term"
"github.com/openshift/origin/pkg/oc/util/ocscheme"
)

// CreateBasicAuthSecretRecommendedCommandName represents name of subcommand for `oc secrets` command
Expand Down Expand Up @@ -44,6 +45,10 @@ var (

// CreateBasicAuthSecretOptions holds the credential needed to authenticate against SCM servers.
type CreateBasicAuthSecretOptions struct {
PrintFlags *genericclioptions.PrintFlags

Printer printers.ResourcePrinter

SecretName string
Username string
Password string
Expand All @@ -52,18 +57,21 @@ type CreateBasicAuthSecretOptions struct {

PromptForPassword bool

Reader io.Reader
Out io.Writer
SecretsInterface corev1client.SecretInterface

SecretsInterface kcoreclient.SecretInterface
genericclioptions.IOStreams
}

func NewCreateBasicAuthSecretOptions(streams genericclioptions.IOStreams) *CreateBasicAuthSecretOptions {
return &CreateBasicAuthSecretOptions{
PrintFlags: genericclioptions.NewPrintFlags("created").WithTypeSetter(ocscheme.PrintingInternalScheme),
IOStreams: streams,
}
}

// NewCmdCreateBasicAuthSecret implements the OpenShift cli secrets new-basicauth subcommand
func NewCmdCreateBasicAuthSecret(name, fullName string, f kcmdutil.Factory, streams genericclioptions.IOStreams, newSecretFullName, ocEditFullName string) *cobra.Command {
o := &CreateBasicAuthSecretOptions{
Out: streams.Out,
Reader: streams.In,
}
o := NewCreateBasicAuthSecretOptions(streams)

cmd := &cobra.Command{
Use: fmt.Sprintf("%s SECRET --username=USERNAME --password=PASSWORD [--ca-cert=FILENAME] [--gitconfig=FILENAME]", name),
Expand All @@ -73,25 +81,9 @@ func NewCmdCreateBasicAuthSecret(name, fullName string, f kcmdutil.Factory, stre
Deprecated: "use oc create secret",
Hidden: true,
Run: func(c *cobra.Command, args []string) {
if err := o.Complete(f, args); err != nil {
kcmdutil.CheckErr(kcmdutil.UsageErrorf(c, err.Error()))
}

if err := o.Validate(); err != nil {
kcmdutil.CheckErr(kcmdutil.UsageErrorf(c, err.Error()))
}

if len(kcmdutil.GetFlagString(c, "output")) != 0 {
secret, err := o.NewBasicAuthSecret()
kcmdutil.CheckErr(err)

kcmdutil.CheckErr(kcmdutil.PrintObject(c, secret, streams.Out))
return
}

if err := o.CreateBasicAuthSecret(); err != nil {
kcmdutil.CheckErr(err)
}
kcmdutil.CheckErr(o.Complete(f, args))
kcmdutil.CheckErr(o.Validate())
kcmdutil.CheckErr(o.Run())
},
}

Expand All @@ -103,13 +95,12 @@ func NewCmdCreateBasicAuthSecret(name, fullName string, f kcmdutil.Factory, stre
cmd.MarkFlagFilename("gitconfig")
cmd.Flags().BoolVarP(&o.PromptForPassword, "prompt", "", false, "If true, prompt for password or token")

kcmdutil.AddPrinterFlags(cmd)

o.PrintFlags.AddFlags(cmd)
return cmd
}

// CreateBasicAuthSecret saves created Secret structure and prints the secret name to the output on success.
func (o *CreateBasicAuthSecretOptions) CreateBasicAuthSecret() error {
func (o *CreateBasicAuthSecretOptions) Run() error {
secret, err := o.NewBasicAuthSecret()
if err != nil {
return err
Expand All @@ -119,16 +110,15 @@ func (o *CreateBasicAuthSecretOptions) CreateBasicAuthSecret() error {
return err
}

fmt.Fprintf(o.GetOut(), "secret/%s\n", secret.Name)
return nil
return o.Printer.PrintObj(secret, o.Out)
}

// NewBasicAuthSecret builds up the Secret structure containing secret name, type and data structure
// containing desired credentials.
func (o *CreateBasicAuthSecretOptions) NewBasicAuthSecret() (*api.Secret, error) {
secret := &api.Secret{}
func (o *CreateBasicAuthSecretOptions) NewBasicAuthSecret() (*corev1.Secret, error) {
secret := &corev1.Secret{}
secret.Name = o.SecretName
secret.Type = api.SecretTypeBasicAuth
secret.Type = corev1.SecretTypeBasicAuth
secret.Data = map[string][]byte{}

if len(o.Username) != 0 {
Expand Down Expand Up @@ -164,32 +154,38 @@ func (o *CreateBasicAuthSecretOptions) Complete(f kcmdutil.Factory, args []strin
if len(args) != 1 {
return errors.New("must have exactly one argument: secret name")
}

o.SecretName = args[0]

if o.PromptForPassword {
if len(o.Password) != 0 {
return errors.New("must provide either --prompt or --password flag")
}
if !kterm.IsTerminal(o.Reader) {
if !kterm.IsTerminal(o.In) {
return errors.New("provided reader is not a terminal")
}

o.Password = term.PromptForPasswordString(o.Reader, o.Out, "Password: ")
o.Password = term.PromptForPasswordString(o.In, o.Out, "Password: ")
if len(o.Password) == 0 {
return errors.New("password must be provided")
}
}

if f != nil {
client, err := f.ClientSet()
if err != nil {
return err
}
namespace, _, err := f.ToRawKubeConfigLoader().Namespace()
if err != nil {
return err
}
o.SecretsInterface = client.Core().Secrets(namespace)
config, err := f.ToRESTConfig()
if err != nil {
return err
}

clientset, err := corev1client.NewForConfig(config)
if err != nil {
return err
}
namespace, _, err := f.ToRawKubeConfigLoader().Namespace()
if err != nil {
return err
}
o.SecretsInterface = clientset.Secrets(namespace)

o.Printer, err = o.PrintFlags.ToPrinter()
if err != nil {
return err
}

return nil
Expand All @@ -205,15 +201,9 @@ func (o CreateBasicAuthSecretOptions) Validate() error {
return errors.New("must provide basic authentication credentials")
}

return nil
}

// GetOut check if the CreateBasicAuthSecretOptions Out Writer is set. Returns it if the Writer
// is present, if not returns Writer on which all Write calls succeed without doing anything.
func (o CreateBasicAuthSecretOptions) GetOut() io.Writer {
if o.Out == nil {
return ioutil.Discard
if o.PromptForPassword && len(o.Password) > 0 {
return errors.New("must provide either --prompt or --password flag")
}

return o.Out
return nil
}
81 changes: 45 additions & 36 deletions pkg/oc/cli/secrets/basicauth_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,79 +3,87 @@ package secrets
import (
"testing"

api "k8s.io/kubernetes/pkg/apis/core"
corev1 "k8s.io/api/core/v1"
"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
)

func TestValidateBasicAuth(t *testing.T) {
tests := []struct {
testName string
args []string
params CreateBasicAuthSecretOptions
options func(genericclioptions.IOStreams) *CreateBasicAuthSecretOptions
expErr bool
}{
{
testName: "validArgs",
args: []string{"testSecret"},
params: CreateBasicAuthSecretOptions{
Username: "testUser",
Password: "testPassword",
options: func(streams genericclioptions.IOStreams) *CreateBasicAuthSecretOptions {
o := NewCreateBasicAuthSecretOptions(streams)
o.Username = "testUser"
o.Password = "testPassword"
o.SecretName = "testSecret"
return o
},
expErr: false,
},
{
testName: "validArgsWithCertificate",
args: []string{"testSecret"},
params: CreateBasicAuthSecretOptions{
Username: "testUser",
Password: "testPassword",
CertificatePath: "./bsFixtures/valid/ca.crt",
options: func(streams genericclioptions.IOStreams) *CreateBasicAuthSecretOptions {
o := NewCreateBasicAuthSecretOptions(streams)
o.Username = "testUser"
o.Password = "testPassword"
o.SecretName = "testSecret"
o.CertificatePath = "./bsFixtures/valid/ca.crt"
return o
},
expErr: false,
},
{
testName: "validArgsWithGitconfig",
args: []string{"testSecret"},
params: CreateBasicAuthSecretOptions{
Username: "testUser",
Password: "testPassword",
GitConfigPath: "./bsFixtures/leadingdot/.gitconfig",
options: func(streams genericclioptions.IOStreams) *CreateBasicAuthSecretOptions {
o := NewCreateBasicAuthSecretOptions(streams)
o.Username = "testUser"
o.Password = "testPassword"
o.SecretName = "testSecret"
o.GitConfigPath = "./bsFixtures/leadingdot/.gitconfig"
return o
},
expErr: false,
},
{
testName: "noName",
args: []string{},
params: CreateBasicAuthSecretOptions{
Username: "testUser",
Password: "testPassword",
options: func(streams genericclioptions.IOStreams) *CreateBasicAuthSecretOptions {
o := NewCreateBasicAuthSecretOptions(streams)
o.Username = "testUser"
o.Password = "testPassword"
return o
},
expErr: true, //"Must have exactly one argument: secret name"
},
{
testName: "noParams",
args: []string{"testSecret"},
params: CreateBasicAuthSecretOptions{},
expErr: true, //"Must provide basic authentication credentials"
options: func(streams genericclioptions.IOStreams) *CreateBasicAuthSecretOptions {
o := NewCreateBasicAuthSecretOptions(streams)
o.SecretName = "testSecret"
return o
},
expErr: true, //"Must provide basic authentication credentials"
},
{
testName: "passwordAndPrompt",
args: []string{"testSecret"},
params: CreateBasicAuthSecretOptions{
Username: "testUser",
Password: "testPassword",
PromptForPassword: true,
options: func(streams genericclioptions.IOStreams) *CreateBasicAuthSecretOptions {
o := NewCreateBasicAuthSecretOptions(streams)
o.Username = "testUser"
o.Password = "testPassword"
o.SecretName = "testSecret"
o.PromptForPassword = true
return o
},
expErr: true, //"Must provide either --prompt or --password flag"
},
}

for _, test := range tests {
options := test.params
err := options.Complete(nil, test.args)
if err == nil {
err = options.Validate()
}

options := test.options(genericclioptions.NewTestIOStreamsDiscard())
err := options.Validate()
if test.expErr {
if err == nil {
t.Errorf("%s: unexpected error: %v", test.testName, err)
Expand All @@ -85,13 +93,14 @@ func TestValidateBasicAuth(t *testing.T) {

if err != nil {
t.Errorf("%s: unexpected error: %v", test.testName, err)
continue
}

secret, err := options.NewBasicAuthSecret()
if err != nil {
t.Errorf("%s: unexpected error: %v", test.testName, err)
}
if secret.Type != api.SecretTypeBasicAuth {
if secret.Type != corev1.SecretTypeBasicAuth {
t.Errorf("%s: unexpected secret.Type: %v", test.testName, secret.Type)
}
}
Expand Down
Loading