gemma: pkg/controllers/importconfig.go annotate

annotate pkg/controllers/importconfig.go @ 3552:ffc8fb059d1a

refactor password persistence for import configurations.

author	Thomas Junk <thomas.junk@intevation.de>
date	Fri, 31 May 2019 14:29:21 +0200
parents	30f6647b8856
children	efa468653d48

rev	line source
1582 dc727824183a Started with REST API for scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	1 // This is Free Software under GNU Affero General Public License v >= 3.0
dc727824183a Started with REST API for scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	2 // without warranty, see README.md and license for details.
dc727824183a Started with REST API for scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	3 //
dc727824183a Started with REST API for scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	4 // SPDX-License-Identifier: AGPL-3.0-or-later
dc727824183a Started with REST API for scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	5 // License-Filename: LICENSES/AGPL-3.0.txt
dc727824183a Started with REST API for scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	6 //
dc727824183a Started with REST API for scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	7 // Copyright (C) 2018 by via donau
dc727824183a Started with REST API for scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	8 // – Österreichische Wasserstraßen-Gesellschaft mbH
dc727824183a Started with REST API for scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	9 // Software engineering by Intevation GmbH
dc727824183a Started with REST API for scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	10 //
dc727824183a Started with REST API for scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	11 // Author(s):
dc727824183a Started with REST API for scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	12 // * Sascha L. Teichmann <sascha.teichmann@intevation.de>
dc727824183a Started with REST API for scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	13
dc727824183a Started with REST API for scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	14 package controllers
dc727824183a Started with REST API for scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	15
dc727824183a Started with REST API for scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	16 import (
dc727824183a Started with REST API for scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	17 "database/sql"
2051 7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	18 "encoding/json"
2046 725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	19 "fmt"
1582 dc727824183a Started with REST API for scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	20 "net/http"
2045 10a1e139d2e8 Imports: Re-enabled running configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2042 diff changeset	21 "strconv"
10a1e139d2e8 Imports: Re-enabled running configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2042 diff changeset	22
10a1e139d2e8 Imports: Re-enabled running configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2042 diff changeset	23 "github.com/gorilla/mux"
10a1e139d2e8 Imports: Re-enabled running configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2042 diff changeset	24
2051 7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	25 "gemma.intevation.de/gemma/pkg/auth"
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	26 "gemma.intevation.de/gemma/pkg/common"
2045 10a1e139d2e8 Imports: Re-enabled running configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2042 diff changeset	27 "gemma.intevation.de/gemma/pkg/imports"
2050 a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	28 "gemma.intevation.de/gemma/pkg/scheduler"
1583 caedd9b176f2 Added GET to /api/imports/scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1582 diff changeset	29 )
caedd9b176f2 Added GET to /api/imports/scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1582 diff changeset	30
1730 7c54babe10f7 Configured imports: Added GET /imports/config/{id:[0-9]+}/run" to run a configured import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1727 diff changeset	31 func runImportConfig(
7c54babe10f7 Configured imports: Added GET /imports/config/{id:[0-9]+}/run" to run a configured import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1727 diff changeset	32 _ interface{},
7c54babe10f7 Configured imports: Added GET /imports/config/{id:[0-9]+}/run" to run a configured import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1727 diff changeset	33 req *http.Request,
1748 c11807dc6940 Comfigured imports: Run enqueing of configured imports if triggered by REST with the database connection of the logged in user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1739 diff changeset	34 conn *sql.Conn,
1730 7c54babe10f7 Configured imports: Added GET /imports/config/{id:[0-9]+}/run" to run a configured import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1727 diff changeset	35 ) (jr JSONResult, err error) {
7c54babe10f7 Configured imports: Added GET /imports/config/{id:[0-9]+}/run" to run a configured import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1727 diff changeset	36
2045 10a1e139d2e8 Imports: Re-enabled running configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2042 diff changeset	37 id, _ := strconv.ParseInt(mux.Vars(req)["id"], 10, 64)
1730 7c54babe10f7 Configured imports: Added GET /imports/config/{id:[0-9]+}/run" to run a configured import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1727 diff changeset	38
2045 10a1e139d2e8 Imports: Re-enabled running configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2042 diff changeset	39 ctx := req.Context()
1748 c11807dc6940 Comfigured imports: Run enqueing of configured imports if triggered by REST with the database connection of the logged in user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1739 diff changeset	40
2045 10a1e139d2e8 Imports: Re-enabled running configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2042 diff changeset	41 var jobID int64
10a1e139d2e8 Imports: Re-enabled running configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2042 diff changeset	42 if jobID, err = imports.RunConfiguredImportContext(ctx, conn, id); err != nil {
10a1e139d2e8 Imports: Re-enabled running configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2042 diff changeset	43 return
10a1e139d2e8 Imports: Re-enabled running configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2042 diff changeset	44 }
1730 7c54babe10f7 Configured imports: Added GET /imports/config/{id:[0-9]+}/run" to run a configured import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1727 diff changeset	45
2045 10a1e139d2e8 Imports: Re-enabled running configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2042 diff changeset	46 var result = struct {
10a1e139d2e8 Imports: Re-enabled running configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2042 diff changeset	47 ID int64 `json:"id"`
10a1e139d2e8 Imports: Re-enabled running configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2042 diff changeset	48 }{
10a1e139d2e8 Imports: Re-enabled running configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2042 diff changeset	49 ID: jobID,
10a1e139d2e8 Imports: Re-enabled running configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2042 diff changeset	50 }
1730 7c54babe10f7 Configured imports: Added GET /imports/config/{id:[0-9]+}/run" to run a configured import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1727 diff changeset	51
2045 10a1e139d2e8 Imports: Re-enabled running configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2042 diff changeset	52 jr = JSONResult{
10a1e139d2e8 Imports: Re-enabled running configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2042 diff changeset	53 Code: http.StatusCreated,
10a1e139d2e8 Imports: Re-enabled running configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2042 diff changeset	54 Result: &result,
10a1e139d2e8 Imports: Re-enabled running configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2042 diff changeset	55 }
1730 7c54babe10f7 Configured imports: Added GET /imports/config/{id:[0-9]+}/run" to run a configured import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1727 diff changeset	56 return
7c54babe10f7 Configured imports: Added GET /imports/config/{id:[0-9]+}/run" to run a configured import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1727 diff changeset	57 }
7c54babe10f7 Configured imports: Added GET /imports/config/{id:[0-9]+}/run" to run a configured import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1727 diff changeset	58
1627 b10aa02d7819 Refactored: Moved REST /api/imports/scheduler to /api/imports/config Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1592 diff changeset	59 func modifyImportConfig(
1592 c12cec1d7692 Added PATCH /imports/scheduler/{id:[0-9]+} to modify a single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1591 diff changeset	60 input interface{},
c12cec1d7692 Added PATCH /imports/scheduler/{id:[0-9]+} to modify a single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1591 diff changeset	61 req *http.Request,
c12cec1d7692 Added PATCH /imports/scheduler/{id:[0-9]+} to modify a single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1591 diff changeset	62 conn *sql.Conn,
c12cec1d7692 Added PATCH /imports/scheduler/{id:[0-9]+} to modify a single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1591 diff changeset	63 ) (jr JSONResult, err error) {
c12cec1d7692 Added PATCH /imports/scheduler/{id:[0-9]+} to modify a single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1591 diff changeset	64
2052 0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	65 ctx := req.Context()
1592 c12cec1d7692 Added PATCH /imports/scheduler/{id:[0-9]+} to modify a single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1591 diff changeset	66
2052 0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	67 raw := input.(*json.RawMessage)
1592 c12cec1d7692 Added PATCH /imports/scheduler/{id:[0-9]+} to modify a single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1591 diff changeset	68
2052 0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	69 id, _ := strconv.ParseInt(mux.Vars(req)["id"], 10, 64)
2042 d29ac997eb34 This breaks this branch!!!! Starting to remove the old persistent layer for configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2016 diff changeset	70
2052 0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	71 var pc *imports.PersistentConfig
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	72 pc, err = imports.LoadPersistentConfigContext(ctx, conn, id)
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	73 switch {
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	74 case err == sql.ErrNoRows:
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	75 err = JSONError{
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	76 Code: http.StatusNotFound,
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	77 Message: fmt.Sprintf("No configuration %d found", id),
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	78 }
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	79 return
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	80 case err != nil:
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	81 return
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	82 }
2042 d29ac997eb34 This breaks this branch!!!! Starting to remove the old persistent layer for configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2016 diff changeset	83
2052 0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	84 kind := imports.JobKind(pc.Kind)
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	85 ctor := imports.ImportModelForJobKind(kind)
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	86 if ctor == nil {
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	87 err = JSONError{
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	88 Code: http.StatusInternalServerError,
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	89 Message: fmt.Sprintf("No constructor for kind '%s' found", pc.Kind),
1704 897d4d8316ad Import configuration: Made extra attributes updatable, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1702 diff changeset	90 }
2052 0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	91 return
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	92 }
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	93 config := ctor()
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	94 if err = json.Unmarshal(*raw, config); err != nil {
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	95 return
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	96 }
2042 d29ac997eb34 This breaks this branch!!!! Starting to remove the old persistent layer for configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2016 diff changeset	97
2052 0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	98 _, oldCron := pc.Attributes.Get("cron")
2042 d29ac997eb34 This breaks this branch!!!! Starting to remove the old persistent layer for configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2016 diff changeset	99
2052 0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	100 session, _ := auth.GetSession(req)
3552 ffc8fb059d1a refactor password persistence for import configurations. Thomas Junk <thomas.junk@intevation.de> parents: 3549 diff changeset	101 // When a password is stored it doesn't get retransmitted to the client
ffc8fb059d1a refactor password persistence for import configurations. Thomas Junk <thomas.junk@intevation.de> parents: 3549 diff changeset	102 // in order to prevent password leakage
ffc8fb059d1a refactor password persistence for import configurations. Thomas Junk <thomas.junk@intevation.de> parents: 3549 diff changeset	103 // When the user changes the import configuration without a new password
ffc8fb059d1a refactor password persistence for import configurations. Thomas Junk <thomas.junk@intevation.de> parents: 3549 diff changeset	104 // the old password should be conserved
3549 30f6647b8856 import_configuration: if password was persisted it should be repersisted again, if missing in frontend Thomas Junk <thomas.junk@intevation.de> parents: 3515 diff changeset	105 oldPasswd := pc.Attributes["password"]
2052 0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	106 pc.User = session.User
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	107 pc.Attributes = common.Attributes{}
3552 ffc8fb059d1a refactor password persistence for import configurations. Thomas Junk <thomas.junk@intevation.de> parents: 3549 diff changeset	108 pc.Attributes["password"] = oldPasswd
ffc8fb059d1a refactor password persistence for import configurations. Thomas Junk <thomas.junk@intevation.de> parents: 3549 diff changeset	109 pc.Attributes.Marshal(config) // Marshal only overwrites keys present in config
2052 0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	110 cron, newCron := pc.Attributes.Get("cron")
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	111
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	112 var tx *sql.Tx
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	113 if tx, err = conn.BeginTx(ctx, nil); err != nil {
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	114 return
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	115 }
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	116 defer tx.Rollback()
1592 c12cec1d7692 Added PATCH /imports/scheduler/{id:[0-9]+} to modify a single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1591 diff changeset	117
2052 0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	118 if err = pc.UpdateContext(ctx, tx); err != nil {
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	119 return
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	120 }
2042 d29ac997eb34 This breaks this branch!!!! Starting to remove the old persistent layer for configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2016 diff changeset	121
2052 0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	122 if oldCron {
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	123 scheduler.UnbindByID(id)
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	124 }
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	125
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	126 if newCron {
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	127 if err = scheduler.BindAction(
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	128 string(pc.Kind),
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	129 cron,
2042 d29ac997eb34 This breaks this branch!!!! Starting to remove the old persistent layer for configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2016 diff changeset	130 id,
1592 c12cec1d7692 Added PATCH /imports/scheduler/{id:[0-9]+} to modify a single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1591 diff changeset	131 ); err != nil {
c12cec1d7692 Added PATCH /imports/scheduler/{id:[0-9]+} to modify a single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1591 diff changeset	132 return
c12cec1d7692 Added PATCH /imports/scheduler/{id:[0-9]+} to modify a single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1591 diff changeset	133 }
2052 0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	134 }
1592 c12cec1d7692 Added PATCH /imports/scheduler/{id:[0-9]+} to modify a single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1591 diff changeset	135
2052 0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	136 if err = tx.Commit(); err != nil {
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	137 return
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	138 }
1592 c12cec1d7692 Added PATCH /imports/scheduler/{id:[0-9]+} to modify a single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1591 diff changeset	139
2052 0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	140 var result = struct {
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	141 ID int64 `json:"id"`
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	142 }{
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	143 ID: id,
0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	144 }
1592 c12cec1d7692 Added PATCH /imports/scheduler/{id:[0-9]+} to modify a single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1591 diff changeset	145
2052 0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	146 jr = JSONResult{Result: &result}
1592 c12cec1d7692 Added PATCH /imports/scheduler/{id:[0-9]+} to modify a single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1591 diff changeset	147 return
c12cec1d7692 Added PATCH /imports/scheduler/{id:[0-9]+} to modify a single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1591 diff changeset	148 }
c12cec1d7692 Added PATCH /imports/scheduler/{id:[0-9]+} to modify a single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1591 diff changeset	149
1627 b10aa02d7819 Refactored: Moved REST /api/imports/scheduler to /api/imports/config Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1592 diff changeset	150 func infoImportConfig(
1591 2d53065c95af Added GET /imports/scheduler/{id:[0-9]+} to show infos about single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1590 diff changeset	151 _ interface{},
2d53065c95af Added GET /imports/scheduler/{id:[0-9]+} to show infos about single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1590 diff changeset	152 req *http.Request,
2d53065c95af Added GET /imports/scheduler/{id:[0-9]+} to show infos about single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1590 diff changeset	153 conn *sql.Conn,
2d53065c95af Added GET /imports/scheduler/{id:[0-9]+} to show infos about single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1590 diff changeset	154 ) (jr JSONResult, err error) {
2d53065c95af Added GET /imports/scheduler/{id:[0-9]+} to show infos about single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1590 diff changeset	155
2046 725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	156 ctx := req.Context()
1591 2d53065c95af Added GET /imports/scheduler/{id:[0-9]+} to show infos about single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1590 diff changeset	157
2046 725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	158 id, _ := strconv.ParseInt(mux.Vars(req)["id"], 10, 64)
1591 2d53065c95af Added GET /imports/scheduler/{id:[0-9]+} to show infos about single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1590 diff changeset	159
2046 725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	160 var cfg *imports.PersistentConfig
1591 2d53065c95af Added GET /imports/scheduler/{id:[0-9]+} to show infos about single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1590 diff changeset	161
2046 725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	162 cfg, err = imports.LoadPersistentConfigContext(ctx, conn, id)
725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	163 switch {
725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	164 case err != nil:
725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	165 return
725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	166 case cfg == nil:
725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	167 err = JSONError{
725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	168 Code: http.StatusNotFound,
725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	169 Message: fmt.Sprintf("No schedule %d found", id),
725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	170 }
725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	171 return
725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	172 }
725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	173
725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	174 kind := imports.JobKind(cfg.Kind)
725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	175
725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	176 ctor := imports.ImportModelForJobKind(kind)
725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	177 if ctor == nil {
725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	178 err = JSONError{
725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	179 Code: http.StatusInternalServerError,
725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	180 Message: fmt.Sprintf("No constructor for kind '%s' found", cfg.Kind),
725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	181 }
2052 0b203a3b3e8e Imports: Re-enabled /imports/config/{id} PATCH. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2051 diff changeset	182 return
2046 725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	183 }
2047 78002c5e838c Imports: Code simplification. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2046 diff changeset	184
3515 c64c47ff2ab1 import: fix for passwordleakage. No passwords are received/sent if configuration is edited. Thomas Junk <thomas.junk@intevation.de> parents: 2052 diff changeset	185 // Remove `password` from the attributes to be delivered to the client.
c64c47ff2ab1 import: fix for passwordleakage. No passwords are received/sent if configuration is edited. Thomas Junk <thomas.junk@intevation.de> parents: 2052 diff changeset	186 // Even a priviledged user shall not be able to see the password.
c64c47ff2ab1 import: fix for passwordleakage. No passwords are received/sent if configuration is edited. Thomas Junk <thomas.junk@intevation.de> parents: 2052 diff changeset	187 // (See config.ListAllPersistentConfigurationsContext() for the other
c64c47ff2ab1 import: fix for passwordleakage. No passwords are received/sent if configuration is edited. Thomas Junk <thomas.junk@intevation.de> parents: 2052 diff changeset	188 // place where this is done.)
c64c47ff2ab1 import: fix for passwordleakage. No passwords are received/sent if configuration is edited. Thomas Junk <thomas.junk@intevation.de> parents: 2052 diff changeset	189 filteredAttributes := make(common.Attributes)
c64c47ff2ab1 import: fix for passwordleakage. No passwords are received/sent if configuration is edited. Thomas Junk <thomas.junk@intevation.de> parents: 2052 diff changeset	190 for key, value := range cfg.Attributes {
c64c47ff2ab1 import: fix for passwordleakage. No passwords are received/sent if configuration is edited. Thomas Junk <thomas.junk@intevation.de> parents: 2052 diff changeset	191 if key != "password" {
c64c47ff2ab1 import: fix for passwordleakage. No passwords are received/sent if configuration is edited. Thomas Junk <thomas.junk@intevation.de> parents: 2052 diff changeset	192 filteredAttributes[key] = value
c64c47ff2ab1 import: fix for passwordleakage. No passwords are received/sent if configuration is edited. Thomas Junk <thomas.junk@intevation.de> parents: 2052 diff changeset	193 }
c64c47ff2ab1 import: fix for passwordleakage. No passwords are received/sent if configuration is edited. Thomas Junk <thomas.junk@intevation.de> parents: 2052 diff changeset	194 }
2046 725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	195
3515 c64c47ff2ab1 import: fix for passwordleakage. No passwords are received/sent if configuration is edited. Thomas Junk <thomas.junk@intevation.de> parents: 2052 diff changeset	196 what := ctor()
c64c47ff2ab1 import: fix for passwordleakage. No passwords are received/sent if configuration is edited. Thomas Junk <thomas.junk@intevation.de> parents: 2052 diff changeset	197 if err = filteredAttributes.Unmarshal(what); err != nil {
2047 78002c5e838c Imports: Code simplification. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2046 diff changeset	198 return
2046 725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	199 }
1591 2d53065c95af Added GET /imports/scheduler/{id:[0-9]+} to show infos about single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1590 diff changeset	200
2046 725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	201 jr = JSONResult{Result: &imports.ImportConfigOut{
725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	202 ID: id,
725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	203 Kind: imports.ImportKind(cfg.Kind),
725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	204 Config: what,
725884a4c89a Imports: Re-enabled /imports/config/{id} GET- Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2045 diff changeset	205 }}
1591 2d53065c95af Added GET /imports/scheduler/{id:[0-9]+} to show infos about single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1590 diff changeset	206 return
2d53065c95af Added GET /imports/scheduler/{id:[0-9]+} to show infos about single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1590 diff changeset	207 }
2d53065c95af Added GET /imports/scheduler/{id:[0-9]+} to show infos about single import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1590 diff changeset	208
1627 b10aa02d7819 Refactored: Moved REST /api/imports/scheduler to /api/imports/config Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1592 diff changeset	209 func deleteImportConfig(
1590 2fdd8e57542d Added DELETE /imports/scheduler/{id:[0-9]+} to delete a schedule from the scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1589 diff changeset	210 _ interface{},
2fdd8e57542d Added DELETE /imports/scheduler/{id:[0-9]+} to delete a schedule from the scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1589 diff changeset	211 req *http.Request,
2fdd8e57542d Added DELETE /imports/scheduler/{id:[0-9]+} to delete a schedule from the scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1589 diff changeset	212 conn *sql.Conn,
2fdd8e57542d Added DELETE /imports/scheduler/{id:[0-9]+} to delete a schedule from the scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1589 diff changeset	213 ) (jr JSONResult, err error) {
2fdd8e57542d Added DELETE /imports/scheduler/{id:[0-9]+} to delete a schedule from the scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1589 diff changeset	214
2050 a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	215 ctx := req.Context()
1590 2fdd8e57542d Added DELETE /imports/scheduler/{id:[0-9]+} to delete a schedule from the scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1589 diff changeset	216
2050 a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	217 id, _ := strconv.ParseInt(mux.Vars(req)["id"], 10, 64)
1590 2fdd8e57542d Added DELETE /imports/scheduler/{id:[0-9]+} to delete a schedule from the scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1589 diff changeset	218
2050 a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	219 var tx *sql.Tx
a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	220 if tx, err = conn.BeginTx(ctx, nil); err != nil {
a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	221 return
a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	222 }
a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	223 defer tx.Rollback()
a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	224
a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	225 err = imports.DeletePersistentConfigurationContext(
a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	226 ctx,
a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	227 tx,
a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	228 id,
a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	229 )
1704 897d4d8316ad Import configuration: Made extra attributes updatable, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1702 diff changeset	230
2050 a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	231 switch {
a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	232 case err == sql.ErrNoRows:
a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	233 err = JSONError{
a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	234 Code: http.StatusNotFound,
a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	235 Message: fmt.Sprintf("No configuration %d found", id),
2049 d1a680be7ae4 Imports. Re-enabled /imports/config GET. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2048 diff changeset	236 }
2050 a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	237 return
a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	238 case err != nil:
a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	239 return
a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	240 }
2042 d29ac997eb34 This breaks this branch!!!! Starting to remove the old persistent layer for configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2016 diff changeset	241
2050 a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	242 // Remove from running scheduler.
a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	243 scheduler.UnbindByID(id)
2049 d1a680be7ae4 Imports. Re-enabled /imports/config GET. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2048 diff changeset	244
2050 a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	245 if err = tx.Commit(); err != nil {
a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	246 return
a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	247 }
1590 2fdd8e57542d Added DELETE /imports/scheduler/{id:[0-9]+} to delete a schedule from the scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1589 diff changeset	248
2050 a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	249 var result = struct {
a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	250 ID int64 `json:"id"`
a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	251 }{
a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	252 ID: id,
a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	253 }
1590 2fdd8e57542d Added DELETE /imports/scheduler/{id:[0-9]+} to delete a schedule from the scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1589 diff changeset	254
2050 a3ccef8ec304 Imports: Re-enabled /imports/config/{id} DELETE. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2049 diff changeset	255 jr = JSONResult{Result: &result}
2042 d29ac997eb34 This breaks this branch!!!! Starting to remove the old persistent layer for configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2016 diff changeset	256
1590 2fdd8e57542d Added DELETE /imports/scheduler/{id:[0-9]+} to delete a schedule from the scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1589 diff changeset	257 return
2fdd8e57542d Added DELETE /imports/scheduler/{id:[0-9]+} to delete a schedule from the scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1589 diff changeset	258 }
2fdd8e57542d Added DELETE /imports/scheduler/{id:[0-9]+} to delete a schedule from the scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1589 diff changeset	259
1627 b10aa02d7819 Refactored: Moved REST /api/imports/scheduler to /api/imports/config Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1592 diff changeset	260 func addImportConfig(
1589 e0bd82f6ee14 Added PUT /api/imports/scheduler to add a import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1583 diff changeset	261 input interface{},
e0bd82f6ee14 Added PUT /api/imports/scheduler to add a import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1583 diff changeset	262 req *http.Request,
e0bd82f6ee14 Added PUT /api/imports/scheduler to add a import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1583 diff changeset	263 conn *sql.Conn,
e0bd82f6ee14 Added PUT /api/imports/scheduler to add a import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1583 diff changeset	264 ) (jr JSONResult, err error) {
e0bd82f6ee14 Added PUT /api/imports/scheduler to add a import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1583 diff changeset	265
2051 7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	266 cfg := input.(*imports.ImportConfigIn)
1589 e0bd82f6ee14 Added PUT /api/imports/scheduler to add a import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1583 diff changeset	267
2051 7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	268 kind := imports.JobKind(cfg.Kind)
1589 e0bd82f6ee14 Added PUT /api/imports/scheduler to add a import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1583 diff changeset	269
2051 7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	270 ctor := imports.ImportModelForJobKind(kind)
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	271 if ctor == nil {
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	272 err = JSONError{
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	273 Code: http.StatusBadRequest,
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	274 Message: fmt.Sprintf("No kind %s found", string(cfg.Kind)),
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	275 }
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	276 return
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	277 }
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	278 config := ctor()
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	279 if err = json.Unmarshal(cfg.Config, config); err != nil {
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	280 return
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	281 }
1589 e0bd82f6ee14 Added PUT /api/imports/scheduler to add a import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1583 diff changeset	282
2051 7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	283 session, _ := auth.GetSession(req)
1589 e0bd82f6ee14 Added PUT /api/imports/scheduler to add a import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1583 diff changeset	284
2051 7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	285 pc := imports.PersistentConfig{
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	286 User: session.User,
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	287 Kind: string(cfg.Kind),
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	288 Attributes: common.Attributes{},
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	289 }
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	290 pc.Attributes.Marshal(config)
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	291
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	292 ctx := req.Context()
1589 e0bd82f6ee14 Added PUT /api/imports/scheduler to add a import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1583 diff changeset	293
2051 7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	294 var tx *sql.Tx
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	295 if tx, err = conn.BeginTx(ctx, nil); err != nil {
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	296 return
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	297 }
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	298 defer tx.Rollback()
1702 49b89575ab31 Import configuration: [WIP] Added table for extra configuration attributes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1654 diff changeset	299
2051 7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	300 var id int64
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	301 if id, err = pc.StoreContext(ctx, tx); err != nil {
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	302 return
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	303 }
2042 d29ac997eb34 This breaks this branch!!!! Starting to remove the old persistent layer for configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2016 diff changeset	304
2051 7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	305 // Need to start a scheduler job right away?
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	306 if cron, ok := pc.Attributes.Get("cron"); ok {
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	307 if err = scheduler.BindAction(string(cfg.Kind), cron, id); err != nil {
1589 e0bd82f6ee14 Added PUT /api/imports/scheduler to add a import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1583 diff changeset	308 return
e0bd82f6ee14 Added PUT /api/imports/scheduler to add a import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1583 diff changeset	309 }
2051 7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	310 }
1589 e0bd82f6ee14 Added PUT /api/imports/scheduler to add a import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1583 diff changeset	311
2051 7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	312 if err = tx.Commit(); err != nil {
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	313 scheduler.UnbindByID(id)
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	314 return
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	315 }
1589 e0bd82f6ee14 Added PUT /api/imports/scheduler to add a import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1583 diff changeset	316
2051 7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	317 var result = struct {
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	318 ID int64 `json:"id"`
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	319 }{
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	320 ID: id,
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	321 }
1589 e0bd82f6ee14 Added PUT /api/imports/scheduler to add a import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1583 diff changeset	322
2051 7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	323 jr = JSONResult{
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	324 Code: http.StatusCreated,
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	325 Result: &result,
7d627258e045 Imports: Re-enabled /imports/config POST. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2050 diff changeset	326 }
1589 e0bd82f6ee14 Added PUT /api/imports/scheduler to add a import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1583 diff changeset	327 return
e0bd82f6ee14 Added PUT /api/imports/scheduler to add a import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1583 diff changeset	328 }
e0bd82f6ee14 Added PUT /api/imports/scheduler to add a import configuration. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1583 diff changeset	329
1627 b10aa02d7819 Refactored: Moved REST /api/imports/scheduler to /api/imports/config Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1592 diff changeset	330 func listImportConfigs(
1582 dc727824183a Started with REST API for scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	331 _ interface{},
dc727824183a Started with REST API for scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	332 req *http.Request,
dc727824183a Started with REST API for scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	333 conn *sql.Conn,
dc727824183a Started with REST API for scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	334 ) (jr JSONResult, err error) {
1583 caedd9b176f2 Added GET to /api/imports/scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1582 diff changeset	335
2049 d1a680be7ae4 Imports. Re-enabled /imports/config GET. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2048 diff changeset	336 ctx := req.Context()
d1a680be7ae4 Imports. Re-enabled /imports/config GET. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2048 diff changeset	337 configs := []*imports.ImportConfigOut{}
2042 d29ac997eb34 This breaks this branch!!!! Starting to remove the old persistent layer for configured imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2016 diff changeset	338
2049 d1a680be7ae4 Imports. Re-enabled /imports/config GET. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2048 diff changeset	339 if err = imports.ListAllPersistentConfigurationsContext(
d1a680be7ae4 Imports. Re-enabled /imports/config GET. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2048 diff changeset	340 ctx, conn,
d1a680be7ae4 Imports. Re-enabled /imports/config GET. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2048 diff changeset	341 func(config *imports.ImportConfigOut) error {
d1a680be7ae4 Imports. Re-enabled /imports/config GET. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2048 diff changeset	342 configs = append(configs, config)
d1a680be7ae4 Imports. Re-enabled /imports/config GET. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2048 diff changeset	343 return nil
d1a680be7ae4 Imports. Re-enabled /imports/config GET. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2048 diff changeset	344 },
d1a680be7ae4 Imports. Re-enabled /imports/config GET. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2048 diff changeset	345 ); err != nil {
d1a680be7ae4 Imports. Re-enabled /imports/config GET. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2048 diff changeset	346 return
d1a680be7ae4 Imports. Re-enabled /imports/config GET. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2048 diff changeset	347 }
d1a680be7ae4 Imports. Re-enabled /imports/config GET. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2048 diff changeset	348 jr = JSONResult{Result: configs}
1582 dc727824183a Started with REST API for scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	349 return
dc727824183a Started with REST API for scheduler. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	350 }

Mercurial > gemma

annotate pkg/controllers/importconfig.go @ 3552:ffc8fb059d1a