From bf44c29932711c27d4b64e2443627fd16e809119 Mon Sep 17 00:00:00 2001 From: hangaoshuai Date: Thu, 15 Mar 2018 17:14:28 +0800 Subject: [PATCH] remove unused code authenticator/password/allow --- .../plugin/pkg/authenticator/password/BUILD | 1 - .../pkg/authenticator/password/allow/BUILD | 36 -------------- .../pkg/authenticator/password/allow/allow.go | 38 --------------- .../password/allow/allow_test.go | 47 ------------------- 4 files changed, 122 deletions(-) delete mode 100644 staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/allow/BUILD delete mode 100644 staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/allow/allow.go delete mode 100644 staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/allow/allow_test.go diff --git a/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/BUILD b/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/BUILD index ed1d4151347..53b017a8dac 100644 --- a/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/BUILD +++ b/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/BUILD @@ -22,7 +22,6 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/allow:all-srcs", "//staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/passwordfile:all-srcs", ], tags = ["automanaged"], diff --git a/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/allow/BUILD b/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/allow/BUILD deleted file mode 100644 index ee53216eef4..00000000000 --- a/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/allow/BUILD +++ /dev/null @@ -1,36 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_test( - name = "go_default_test", - srcs = ["allow_test.go"], - embed = [":go_default_library"], -) - -go_library( - name = "go_default_library", - srcs = ["allow.go"], - importpath = "k8s.io/apiserver/plugin/pkg/authenticator/password/allow", - deps = [ - "//vendor/k8s.io/apiserver/pkg/authentication/authenticator:go_default_library", - "//vendor/k8s.io/apiserver/pkg/authentication/user:go_default_library", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/allow/allow.go b/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/allow/allow.go deleted file mode 100644 index 3ca0ee2345e..00000000000 --- a/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/allow/allow.go +++ /dev/null @@ -1,38 +0,0 @@ -/* -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 allow - -import ( - "k8s.io/apiserver/pkg/authentication/authenticator" - "k8s.io/apiserver/pkg/authentication/user" -) - -type allowAuthenticator struct{} - -// NewAllow returns a password authenticator that allows any non-empty username -func NewAllow() authenticator.Password { - return allowAuthenticator{} -} - -// AuthenticatePassword implements authenticator.Password to allow any non-empty username, -// using the specified username as the name and UID -func (allowAuthenticator) AuthenticatePassword(username, password string) (user.Info, bool, error) { - if username == "" { - return nil, false, nil - } - return &user.DefaultInfo{Name: username, UID: username}, true, nil -} diff --git a/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/allow/allow_test.go b/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/allow/allow_test.go deleted file mode 100644 index 58d2170919b..00000000000 --- a/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/allow/allow_test.go +++ /dev/null @@ -1,47 +0,0 @@ -/* -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 allow - -import "testing" - -func TestAllowEmpty(t *testing.T) { - allow := NewAllow() - user, ok, err := allow.AuthenticatePassword("", "") - if err != nil { - t.Fatalf("Unexpected error: %v", err) - } - if ok { - t.Fatalf("Unexpected success") - } - if user != nil { - t.Fatalf("Unexpected user: %v", user) - } -} - -func TestAllowPresent(t *testing.T) { - allow := NewAllow() - user, ok, err := allow.AuthenticatePassword("myuser", "") - if err != nil { - t.Fatalf("Unexpected error: %v", err) - } - if !ok { - t.Fatalf("Unexpected failure") - } - if user.GetName() != "myuser" || user.GetUID() != "myuser" { - t.Fatalf("Unexpected user name or uid: %v", user) - } -}