b3fb6cb5fb
Automatic merge from submit-queue kubectl: commas in --from-literal on secret creation Closes #35185 ``` release-note Fixes an issue where commas were not accepted in --from-literal flags when creating secrets. Passing multiple values separated by a comma in a single --from-literal flag is no longer supported. Please use multiple --from-literal flags to provide multiple values. ```
94 lines
3.1 KiB
Go
94 lines
3.1 KiB
Go
/*
|
|
Copyright 2014 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package cmd
|
|
|
|
import (
|
|
"bytes"
|
|
"net/http"
|
|
"testing"
|
|
|
|
"k8s.io/kubernetes/pkg/api"
|
|
"k8s.io/kubernetes/pkg/client/restclient/fake"
|
|
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
|
|
)
|
|
|
|
func TestCreateSecretGeneric(t *testing.T) {
|
|
secretObject := &api.Secret{
|
|
Data: map[string][]byte{
|
|
"password": []byte("includes,comma"),
|
|
"username": []byte("test_user"),
|
|
},
|
|
}
|
|
secretObject.Name = "my-secret"
|
|
f, tf, codec, ns := cmdtesting.NewAPIFactory()
|
|
tf.Printer = &testPrinter{}
|
|
tf.Client = &fake.RESTClient{
|
|
NegotiatedSerializer: ns,
|
|
Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) {
|
|
switch p, m := req.URL.Path, req.Method; {
|
|
case p == "/namespaces/test/secrets" && m == "POST":
|
|
return &http.Response{StatusCode: 201, Header: defaultHeader(), Body: objBody(codec, secretObject)}, nil
|
|
default:
|
|
t.Fatalf("unexpected request: %#v\n%#v", req.URL, req)
|
|
return nil, nil
|
|
}
|
|
}),
|
|
}
|
|
tf.Namespace = "test"
|
|
buf := bytes.NewBuffer([]byte{})
|
|
cmd := NewCmdCreateSecretGeneric(f, buf)
|
|
cmd.Flags().Set("output", "name")
|
|
cmd.Flags().Set("from-literal", "password=includes,comma")
|
|
cmd.Flags().Set("from-literal", "username=test_user")
|
|
cmd.Run(cmd, []string{secretObject.Name})
|
|
expectedOutput := "secret/" + secretObject.Name + "\n"
|
|
if buf.String() != expectedOutput {
|
|
t.Errorf("expected output: %s, but got: %s", buf.String(), expectedOutput)
|
|
}
|
|
}
|
|
|
|
func TestCreateSecretDockerRegistry(t *testing.T) {
|
|
secretObject := &api.Secret{}
|
|
secretObject.Name = "my-secret"
|
|
f, tf, codec, ns := cmdtesting.NewAPIFactory()
|
|
tf.Printer = &testPrinter{}
|
|
tf.Client = &fake.RESTClient{
|
|
NegotiatedSerializer: ns,
|
|
Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) {
|
|
switch p, m := req.URL.Path, req.Method; {
|
|
case p == "/namespaces/test/secrets" && m == "POST":
|
|
return &http.Response{StatusCode: 201, Header: defaultHeader(), Body: objBody(codec, secretObject)}, nil
|
|
default:
|
|
t.Fatalf("unexpected request: %#v\n%#v", req.URL, req)
|
|
return nil, nil
|
|
}
|
|
}),
|
|
}
|
|
tf.Namespace = "test"
|
|
buf := bytes.NewBuffer([]byte{})
|
|
cmd := NewCmdCreateSecretDockerRegistry(f, buf)
|
|
cmd.Flags().Set("docker-username", "test-user")
|
|
cmd.Flags().Set("docker-password", "test-pass")
|
|
cmd.Flags().Set("docker-email", "test-email")
|
|
cmd.Flags().Set("output", "name")
|
|
cmd.Run(cmd, []string{secretObject.Name})
|
|
expectedOutput := "secret/" + secretObject.Name + "\n"
|
|
if buf.String() != expectedOutput {
|
|
t.Errorf("expected output: %s, but got: %s", buf.String(), expectedOutput)
|
|
}
|
|
}
|