Skip to content

Commit 23ab68f

Browse files
deads2kdeads2k
committed
remove unnecessary anonymous function
1 parent 05f812f commit 23ab68f

File tree

7 files changed

+22
-198
lines changed

7 files changed

+22
-198
lines changed

‎pkg/cmd/util/clientcmd/clientcmd.go

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -46,31 +46,6 @@ func NewConfig() *Config {
4646
}
4747
}
4848

49-
// AnonymousClientConfig returns a copy of the given config with all user credentials (cert/key, bearer token, and username/password) removed
50-
func AnonymousClientConfig(config *restclient.Config) restclient.Config {
51-
// copy only known safe fields
52-
// TODO: expose a copy method on the config that is "auth free"
53-
return restclient.Config{
54-
Host: config.Host,
55-
APIPath: config.APIPath,
56-
Prefix: config.Prefix,
57-
ContentConfig: config.ContentConfig,
58-
TLSClientConfig: restclient.TLSClientConfig{
59-
CAFile: config.TLSClientConfig.CAFile,
60-
CAData: config.TLSClientConfig.CAData,
61-
Insecure: config.Insecure,
62-
ServerName: config.ServerName,
63-
},
64-
RateLimiter: config.RateLimiter,
65-
UserAgent: config.UserAgent,
66-
Transport: config.Transport,
67-
WrapTransport: config.WrapTransport,
68-
QPS: config.QPS,
69-
Burst: config.Burst,
70-
Timeout: config.Timeout,
71-
}
72-
}
73-
7449
// BindClientConfigSecurityFlags adds flags for the supplied client config
7550
func BindClientConfigSecurityFlags(config *restclient.Config, flags *pflag.FlagSet) {
7651
flags.BoolVar(&config.Insecure, "insecure-skip-tls-verify", config.Insecure, "If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.")

‎pkg/cmd/util/clientcmd/clientcmd_test.go

Lines changed: 0 additions & 150 deletions
This file was deleted.

‎test/integration/cli_get_token_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import (
66

77
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
88

9-
"github.com/openshift/origin/pkg/cmd/util/clientcmd"
109
"github.com/openshift/origin/pkg/cmd/util/tokencmd"
1110
userclient "github.com/openshift/origin/pkg/user/generated/internalclientset/typed/user/internalversion"
1211
testutil "github.com/openshift/origin/test/util"
1312
testserver "github.com/openshift/origin/test/util/server"
13+
"k8s.io/client-go/rest"
1414
)
1515

1616
func TestCLIGetToken(t *testing.T) {
@@ -24,20 +24,20 @@ func TestCLIGetToken(t *testing.T) {
2424
t.Fatal(err)
2525
}
2626

27-
anonymousConfig := clientcmd.AnonymousClientConfig(clusterAdminClientConfig)
27+
anonymousConfig := rest.AnonymousClientConfig(clusterAdminClientConfig)
2828
reader := bytes.NewBufferString("user\npass")
29-
accessToken, err := tokencmd.RequestToken(&anonymousConfig, reader, "", "")
29+
accessToken, err := tokencmd.RequestToken(anonymousConfig, reader, "", "")
3030
if err != nil {
3131
t.Errorf("Unexpected error: %v", err)
3232
}
3333
if len(accessToken) == 0 {
3434
t.Error("Expected accessToken, but did not get one")
3535
}
3636

37-
clientConfig := clientcmd.AnonymousClientConfig(clusterAdminClientConfig)
37+
clientConfig := rest.AnonymousClientConfig(clusterAdminClientConfig)
3838
clientConfig.BearerToken = accessToken
3939

40-
user, err := userclient.NewForConfigOrDie(&clientConfig).Users().Get("~", metav1.GetOptions{})
40+
user, err := userclient.NewForConfigOrDie(clientConfig).Users().Get("~", metav1.GetOptions{})
4141
if err != nil {
4242
t.Fatal(err)
4343
}

‎test/integration/node_auth_test.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
authorizationclient "github.com/openshift/origin/pkg/authorization/generated/internalclientset"
1717
configapi "github.com/openshift/origin/pkg/cmd/server/api"
1818
"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
19-
"github.com/openshift/origin/pkg/cmd/util/clientcmd"
2019
oauthapi "github.com/openshift/origin/pkg/oauth/apis/oauth"
2120
oauthapiserver "github.com/openshift/origin/pkg/oauth/apiserver"
2221
oauthclient "github.com/openshift/origin/pkg/oauth/generated/internalclientset/typed/oauth/internalversion"
@@ -62,9 +61,9 @@ func TestNodeAuth(t *testing.T) {
6261
}
6362
masterKubeletClientConfig.Port = uint(nodePortInt)
6463

65-
anonymousConfig := clientcmd.AnonymousClientConfig(adminConfig)
64+
anonymousConfig := restclient.AnonymousClientConfig(adminConfig)
6665

67-
badTokenConfig := clientcmd.AnonymousClientConfig(adminConfig)
66+
badTokenConfig := restclient.AnonymousClientConfig(adminConfig)
6867
badTokenConfig.BearerToken = "bad-token"
6968

7069
bobKubeClient, bobConfig, err := testutil.GetClientForUser(adminConfig, "bob")
@@ -135,10 +134,10 @@ func TestNodeAuth(t *testing.T) {
135134
NodeAdmin bool
136135
}{
137136
"bad token": {
138-
KubeletClientConfig: kubeletClientConfig(&badTokenConfig),
137+
KubeletClientConfig: kubeletClientConfig(badTokenConfig),
139138
},
140139
"anonymous": {
141-
KubeletClientConfig: kubeletClientConfig(&anonymousConfig),
140+
KubeletClientConfig: kubeletClientConfig(anonymousConfig),
142141
Forbidden: true,
143142
},
144143
"cluster admin": {

‎test/integration/router/router_http_server.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ import (
1919
kapi "k8s.io/kubernetes/pkg/api"
2020

2121
"github.com/openshift/origin/pkg/cmd/util"
22+
23+
_ "github.com/openshift/origin/pkg/api/install"
2224
)
2325

2426
// GetDefaultLocalAddress returns an address at which the local host can

‎test/integration/scopes_test.go

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"github.com/openshift/origin/pkg/authorization/authorizer/scope"
1414
buildapi "github.com/openshift/origin/pkg/build/apis/build"
1515
buildclient "github.com/openshift/origin/pkg/build/generated/internalclientset"
16-
"github.com/openshift/origin/pkg/cmd/util/clientcmd"
1716
oauthapi "github.com/openshift/origin/pkg/oauth/apis/oauth"
1817
oauthapiserver "github.com/openshift/origin/pkg/oauth/apiserver"
1918
oauthclient "github.com/openshift/origin/pkg/oauth/generated/internalclientset/typed/oauth/internalversion"
@@ -63,14 +62,14 @@ func TestScopedTokens(t *testing.T) {
6362
t.Fatalf("unexpected error: %v", err)
6463
}
6564

66-
whoamiConfig := clientcmd.AnonymousClientConfig(clusterAdminClientConfig)
65+
whoamiConfig := rest.AnonymousClientConfig(clusterAdminClientConfig)
6766
whoamiConfig.BearerToken = whoamiOnlyToken.Name
6867

69-
if _, err := buildclient.NewForConfigOrDie(&whoamiConfig).Builds(projectName).List(metav1.ListOptions{}); !kapierrors.IsForbidden(err) {
68+
if _, err := buildclient.NewForConfigOrDie(whoamiConfig).Builds(projectName).List(metav1.ListOptions{}); !kapierrors.IsForbidden(err) {
7069
t.Fatalf("unexpected error: %v", err)
7170
}
7271

73-
user, err := userclient.NewForConfigOrDie(&whoamiConfig).Users().Get("~", metav1.GetOptions{})
72+
user, err := userclient.NewForConfigOrDie(whoamiConfig).Users().Get("~", metav1.GetOptions{})
7473
if err != nil {
7574
t.Fatalf("unexpected error: %v", err)
7675
}
@@ -80,7 +79,7 @@ func TestScopedTokens(t *testing.T) {
8079

8180
// try to impersonate a service account using this token
8281
whoamiConfig.Impersonate = rest.ImpersonationConfig{UserName: apiserverserviceaccount.MakeUsername(projectName, "default")}
83-
impersonatedUser, err := userclient.NewForConfigOrDie(&whoamiConfig).Users().Get("~", metav1.GetOptions{})
82+
impersonatedUser, err := userclient.NewForConfigOrDie(whoamiConfig).Users().Get("~", metav1.GetOptions{})
8483
if !kapierrors.IsForbidden(err) {
8584
t.Fatalf("missing error: %v got user %#v", err, impersonatedUser)
8685
}
@@ -167,9 +166,9 @@ func TestScopeEscalations(t *testing.T) {
167166
t.Fatalf("unexpected error: %v", err)
168167
}
169168

170-
nonEscalatingEditConfig := clientcmd.AnonymousClientConfig(clusterAdminClientConfig)
169+
nonEscalatingEditConfig := rest.AnonymousClientConfig(clusterAdminClientConfig)
171170
nonEscalatingEditConfig.BearerToken = nonEscalatingEditToken.Name
172-
nonEscalatingEditClient, err := kclientset.NewForConfig(&nonEscalatingEditConfig)
171+
nonEscalatingEditClient, err := kclientset.NewForConfig(nonEscalatingEditConfig)
173172
if err != nil {
174173
t.Fatalf("unexpected error: %v", err)
175174
}
@@ -190,9 +189,9 @@ func TestScopeEscalations(t *testing.T) {
190189
t.Fatalf("unexpected error: %v", err)
191190
}
192191

193-
escalatingEditConfig := clientcmd.AnonymousClientConfig(clusterAdminClientConfig)
192+
escalatingEditConfig := rest.AnonymousClientConfig(clusterAdminClientConfig)
194193
escalatingEditConfig.BearerToken = escalatingEditToken.Name
195-
escalatingEditClient, err := kclientset.NewForConfig(&escalatingEditConfig)
194+
escalatingEditClient, err := kclientset.NewForConfig(escalatingEditConfig)
196195
if err != nil {
197196
t.Fatalf("unexpected error: %v", err)
198197
}

‎test/util/client.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020

2121
configapi "github.com/openshift/origin/pkg/cmd/server/api"
2222
cmdutil "github.com/openshift/origin/pkg/cmd/util"
23-
"github.com/openshift/origin/pkg/cmd/util/clientcmd"
2423
"github.com/openshift/origin/pkg/cmd/util/tokencmd"
2524
oauthapi "github.com/openshift/origin/pkg/oauth/apis/oauth"
2625
oauthclient "github.com/openshift/origin/pkg/oauth/generated/internalclientset"
@@ -145,15 +144,15 @@ func GetClientForServiceAccount(adminClient kclientset.Interface, clientConfig r
145144
return nil, nil, err
146145
}
147146

148-
saClientConfig := clientcmd.AnonymousClientConfig(&clientConfig)
147+
saClientConfig := restclient.AnonymousClientConfig(&clientConfig)
149148
saClientConfig.BearerToken = token
150149

151-
kubeClientset, err := kclientset.NewForConfig(&saClientConfig)
150+
kubeClientset, err := kclientset.NewForConfig(saClientConfig)
152151
if err != nil {
153152
return nil, nil, err
154153
}
155154

156-
return kubeClientset, &saClientConfig, nil
155+
return kubeClientset, saClientConfig, nil
157156
}
158157

159158
// WaitForResourceQuotaSync watches given resource quota until its hard limit is updated to match the desired

0 commit comments

Comments
 (0)