Просмотр исходного кода

webhook does not require body and storage defaults to secret

sunguroku 5 лет назад
Родитель
Сommit
8dab07d1a3
3 измененных файлов с 6 добавлено и 11 удалено
  1. 1 1
      internal/helm/config.go
  2. 0 5
      server/api/release_handler.go
  3. 5 5
      server/router/router.go

+ 1 - 1
internal/helm/config.go

@@ -21,7 +21,7 @@ import (
 type Form struct {
 	Cluster   *models.Cluster `form:"required"`
 	Repo      *repository.Repository
-	Storage   string `json:"storage" form:"oneof=secret configmap memory"`
+	Storage   string `json:"storage" form:"oneof=secret configmap memory" default:"secret"`
 	Namespace string `json:"namespace"`
 }
 

+ 0 - 5
server/api/release_handler.go

@@ -580,11 +580,6 @@ func (app *App) HandleReleaseDeployWebhook(w http.ResponseWriter, r *http.Reques
 		app.Repo.Cluster,
 	)
 
-	if err := json.NewDecoder(r.Body).Decode(form); err != nil {
-		app.handleErrorFormDecoding(err, ErrUserDecode, w)
-		return
-	}
-
 	agent, err := app.getAgentFromReleaseForm(
 		w,
 		r,

+ 5 - 5
server/router/router.go

@@ -527,11 +527,11 @@ func New(a *api.App) *chi.Mux {
 			),
 		)
 
-		r.Method(
-			"POST",
-			"/projects/{project_id}/releases/{name}/upgrade/hook",
-			requestlog.NewHandler(a.HandleReleaseDeployHook, l),
-		)
+		// r.Method(
+		// 	"POST",
+		// 	"/projects/{project_id}/releases/{name}/upgrade/hook",
+		// 	requestlog.NewHandler(a.HandleReleaseDeployHook, l),
+		// )
 
 		r.Method(
 			"POST",