|
|
@@ -29,20 +29,15 @@ func NewDeleteNamespaceHandler(
|
|
|
}
|
|
|
|
|
|
func (c *DeleteNamespaceHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|
|
- namespace, _ := requestutils.GetURLParamString(r, types.URLParamNamespace)
|
|
|
-
|
|
|
- if namespace == "" {
|
|
|
- request := &types.DeleteNamespaceRequest{}
|
|
|
+ cluster, _ := r.Context().Value(types.ClusterScope).(*models.Cluster)
|
|
|
|
|
|
- if ok := c.DecodeAndValidate(w, r, request); !ok {
|
|
|
- return
|
|
|
- }
|
|
|
+ namespace, reqErr := requestutils.GetURLParamString(r, types.URLParamNamespace)
|
|
|
|
|
|
- namespace = request.Name
|
|
|
+ if reqErr != nil {
|
|
|
+ c.HandleAPIError(w, r, apierrors.NewErrPassThroughToClient(reqErr, http.StatusBadRequest))
|
|
|
+ return
|
|
|
}
|
|
|
|
|
|
- cluster, _ := r.Context().Value(types.ClusterScope).(*models.Cluster)
|
|
|
-
|
|
|
agent, err := c.GetAgent(r, cluster, "")
|
|
|
|
|
|
if err != nil {
|