admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use more friendly error messages (#2364)

Browse Source
This commit is contained in:
zryfish
2020-07-09 18:33:24 +08:00
committed by GitHub
parent b479195aea
commit eeaa4b646a
4 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/kapis/cluster/v1alpha1/handler_test.go
View File

@@ -142,7 +142,7 @@ func TestGeranteAgentDeployment(t *testing.T) {
for _, testCase := range testCases {
t.Run(testCase.description, func(t *testing.T) {
h := NewHandler(informersFactory.KubernetesSharedInformerFactory().Core().V1().Services().Lister(),
h := newHandler(informersFactory.KubernetesSharedInformerFactory().Core().V1().Services().Lister(),
informersFactory.KubeSphereSharedInformerFactory().Cluster().V1alpha1().Clusters().Lister(),
proxyService,
"",
@@ -215,6 +215,20 @@ users:
`
func TestValidateKubeConfig(t *testing.T) {
k8sclient := k8sfake.NewSimpleClientset(service)
ksclient := fake.NewSimpleClientset(cluster)
informersFactory := informers.NewInformerFactories(k8sclient, ksclient, nil, nil, nil, nil)
informersFactory.KubernetesSharedInformerFactory().Core().V1().Services().Informer().GetIndexer().Add(service)
informersFactory.KubeSphereSharedInformerFactory().Cluster().V1alpha1().Clusters().Informer().GetIndexer().Add(cluster)
h := newHandler(informersFactory.KubernetesSharedInformerFactory().Core().V1().Services().Lister(),
informersFactory.KubeSphereSharedInformerFactory().Cluster().V1alpha1().Clusters().Lister(),
proxyService,
"",
agentImage)
config, err := loadKubeConfigFromBytes([]byte(base64EncodedKubeConfig))
if err != nil {
t.Fatal(err)
@@ -247,7 +261,7 @@ func TestValidateKubeConfig(t *testing.T) {
_ = env.Stop()
}()
err = validateKubeConfig([]byte(base64EncodedKubeConfig))
err = h.validateKubeConfig([]byte(base64EncodedKubeConfig))
if err != nil {
t.Fatal(err)
}