rework not found

This commit is contained in:
Mikaël Cluseau
2023-02-13 18:07:10 +01:00
parent 4acdf88785
commit 5a6c0fa3d8
5 changed files with 29 additions and 29 deletions

View File

@ -12,8 +12,8 @@ import (
var clusterSecretKVs = []string{}
func newClusterSecretKV[T any](name string) KVSecrets[T] {
clusterSecretKVs = append(clusterSecretKVs, name)
return KVSecrets[T]{"clusters/"+name}
clusterSecretKVs = append(clusterSecretKVs, name)
return KVSecrets[T]{"clusters/" + name}
}
func wsListClusters(req *restful.Request, resp *restful.Response) {
@ -40,7 +40,7 @@ func wsReadCluster(req *restful.Request, resp *restful.Response) (cluster *local
cluster = cfg.Cluster(clusterName)
if cluster == nil {
wsNotFound(req, resp)
wsNotFound(resp)
return
}
@ -64,7 +64,7 @@ func wsClusterAddons(req *restful.Request, resp *restful.Response) {
if len(cluster.Addons) == 0 {
log.Printf("cluster %q has no addons defined", cluster.Name)
wsNotFound(req, resp)
wsNotFound(resp)
return
}
@ -73,11 +73,11 @@ func wsClusterAddons(req *restful.Request, resp *restful.Response) {
return
}
sslCfg, err := sslConfigFromLocalConfig(cfg)
if err != nil {
wsError(resp, err)
return
}
sslCfg, err := sslConfigFromLocalConfig(cfg)
if err != nil {
wsError(resp, err)
return
}
wsRender(resp, sslCfg, cluster.Addons, cluster)
}
@ -85,13 +85,13 @@ func wsClusterAddons(req *restful.Request, resp *restful.Response) {
func wsClusterCACert(req *restful.Request, resp *restful.Response) {
cs := secretData.clusters[req.PathParameter("cluster-name")]
if cs == nil {
wsNotFound(req, resp)
wsNotFound(resp)
return
}
ca := cs.CAs[req.PathParameter("ca-name")]
if ca == nil {
wsNotFound(req, resp)
wsNotFound(resp)
return
}
@ -101,13 +101,13 @@ func wsClusterCACert(req *restful.Request, resp *restful.Response) {
func wsClusterSignedCert(req *restful.Request, resp *restful.Response) {
cs := secretData.clusters[req.PathParameter("cluster-name")]
if cs == nil {
wsNotFound(req, resp)
wsNotFound(resp)
return
}
ca := cs.CAs[req.PathParameter("ca-name")]
if ca == nil {
wsNotFound(req, resp)
wsNotFound(resp)
return
}
@ -127,7 +127,7 @@ func wsClusterSignedCert(req *restful.Request, resp *restful.Response) {
kc := ca.Signed[name]
if kc == nil {
wsNotFound(req, resp)
wsNotFound(resp)
return
}