Merge pull request #2319 from openziti/fix-patch-app-data

fix patch app data

Author: plorenz

CHANGELOG.md

@@ -1,3 +1,29 @@
+# Release 1.1.9
+
+* Bug fixes, enhancements and continuing progress on controller HA
+
+## Component Updates and Bug Fixes
+
+* github.com/openziti/agent: [v1.0.16 -> v1.0.17](https://github.com/openziti/agent/compare/v1.0.16...v1.0.17)
+* github.com/openziti/channel/v2: [v2.0.136 -> v2.0.137](https://github.com/openziti/channel/compare/v2.0.136...v2.0.137)
+* github.com/openziti/foundation/v2: [v2.0.47 -> v2.0.48](https://github.com/openziti/foundation/compare/v2.0.47...v2.0.48)
+* github.com/openziti/identity: [v1.0.81 -> v1.0.82](https://github.com/openziti/identity/compare/v1.0.81...v1.0.82)
+* github.com/openziti/metrics: [v1.2.56 -> v1.2.57](https://github.com/openziti/metrics/compare/v1.2.56...v1.2.57)
+* github.com/openziti/runzmd: [v1.0.49 -> v1.0.50](https://github.com/openziti/runzmd/compare/v1.0.49...v1.0.50)
+* github.com/openziti/sdk-golang: [v0.23.39 -> v0.23.40](https://github.com/openziti/sdk-golang/compare/v0.23.39...v0.23.40)
+    * [Issue #601](https://github.com/openziti/sdk-golang/issues/601) - Only send config types on service list if controller version supports it
+
+* github.com/openziti/transport/v2: [v2.0.138 -> v2.0.139](https://github.com/openziti/transport/compare/v2.0.138...v2.0.139)
+* github.com/openziti/ziti: [v1.1.8 -> v1.1.9](https://github.com/openziti/ziti/compare/v1.1.8...v1.1.9)
+    * [Issue #2318](https://github.com/openziti/ziti/issues/2318) - Unable to update appData on existing edge routers using PATCH
+    * [Issue #2281](https://github.com/openziti/ziti/issues/2281) - Session Certificates Should Return a Chain
+    * [Issue #2285](https://github.com/openziti/ziti/issues/2285) - routers sometimes report link metrics for closed links 
+    * [Issue #2282](https://github.com/openziti/ziti/issues/2282) - Investigate OIDC TOTP Redirect w/ application/json
+    * [Issue #2279](https://github.com/openziti/ziti/issues/2279) - Ensure xweb initialized before RAFT
+    * [Issue #2277](https://github.com/openziti/ziti/issues/2277) - docker controller and router deployments - generate a config by default
+    * [Issue #2154](https://github.com/openziti/ziti/issues/2154) - HA MFA Enrollment returns 500
+    * [Issue #2159](https://github.com/openziti/ziti/issues/2159) - API Session in HA return 400
+
 # Release 1.1.8
 
 ## What's New

controller/db/edge_router_store.go

@@ -179,7 +179,7 @@ func (store *edgeRouterStoreImpl) FillEntity(entity *EdgeRouter, bucket *boltz.T
 	entity.UnverifiedCertPem = bucket.GetString(FieldEdgeRouterUnverifiedCertPEM)
 
 	entity.RoleAttributes = bucket.GetStringList(FieldRoleAttributes)
-	entity.AppData = bucket.GetMap(FieldIdentityAppData)
+	entity.AppData = bucket.GetMap(FieldEdgeRouterAppData)
 
 }
 

controller/internal/routes/edge_router_api_model.go

@@ -24,11 +24,11 @@ import (
 	"github.com/go-openapi/strfmt"
 	"github.com/michaelquigley/pfxlog"
 	"github.com/openziti/edge-api/rest_model"
+	"github.com/openziti/foundation/v2/stringz"
 	"github.com/openziti/ziti/controller/env"
 	"github.com/openziti/ziti/controller/model"
-	"github.com/openziti/ziti/controller/response"
 	"github.com/openziti/ziti/controller/models"
-	"github.com/openziti/foundation/v2/stringz"
+	"github.com/openziti/ziti/controller/response"
 )
 
 const (

controller/internal/routes/edge_router_router.go

@@ -19,14 +19,16 @@ package routes
 import (
 	"github.com/go-openapi/runtime/middleware"
 	"github.com/openziti/edge-api/rest_management_api_server/operations/edge_router"
+	"github.com/openziti/storage/ast"
+	"github.com/openziti/storage/boltz"
 	"github.com/openziti/ziti/controller/apierror"
+	"github.com/openziti/ziti/controller/db"
 	"github.com/openziti/ziti/controller/env"
+	"github.com/openziti/ziti/controller/fields"
 	"github.com/openziti/ziti/controller/internal/permissions"
 	"github.com/openziti/ziti/controller/model"
-	"github.com/openziti/ziti/controller/response"
-	"github.com/openziti/ziti/controller/fields"
 	"github.com/openziti/ziti/controller/models"
-	"github.com/openziti/storage/ast"
+	"github.com/openziti/ziti/controller/response"
 )
 
 func init() {
@@ -132,7 +134,8 @@ func (r *EdgeRouterRouter) Update(ae *env.AppEnv, rc *response.RequestContext, p
 
 func (r *EdgeRouterRouter) Patch(ae *env.AppEnv, rc *response.RequestContext, params edge_router.PatchEdgeRouterParams) {
 	Patch(rc, func(id string, fields fields.UpdatedFields) error {
-		return ae.Managers.EdgeRouter.Update(MapPatchEdgeRouterToModel(params.ID, params.EdgeRouter), false, fields.FilterMaps("tags"), rc.NewChangeContext())
+		fieldChecker := fields.FilterMaps(boltz.FieldTags, db.FieldEdgeRouterAppData)
+		return ae.Managers.EdgeRouter.Update(MapPatchEdgeRouterToModel(params.ID, params.EdgeRouter), false, fieldChecker, rc.NewChangeContext())
 	})
 }
 

controller/model/edge_router_manager.go

@@ -47,6 +47,7 @@ func NewEdgeRouterManager(env Env) *EdgeRouterManager {
 			db.FieldRouterCost:                  struct{}{},
 			db.FieldRouterNoTraversal:           struct{}{},
 			db.FieldRouterDisabled:              struct{}{},
+			db.FieldEdgeRouterAppData:           struct{}{},
 		},
 	}
 

ziti/cmd/edge/create_edge_router.go

@@ -62,7 +62,7 @@ func NewCreateEdgeRouterCmd(out io.Writer, errOut io.Writer) *cobra.Command {
 	cmd.Flags().StringSliceVarP(&options.roleAttributes, "role-attributes", "a", nil, "comma-separated role attributes for the new router")
 	cmd.Flags().BoolVarP(&options.isTunnelerEnabled, "tunneler-enabled", "t", false, "Can this edge router be used as a tunneler")
 	cmd.Flags().StringVarP(&options.jwtOutputFile, "jwt-output-file", "o", "", "File to which to output the JWT used for enrolling the edge router")
-	cmd.Flags().StringToStringVar(&options.appData, "app-Data", nil, "Custom application data")
+	cmd.Flags().StringToStringVar(&options.appData, "app-data", nil, "Custom application data")
 	cmd.Flags().Uint16Var(&options.cost, "cost", 0, "Specifies the router cost. Default 0.")
 	cmd.Flags().BoolVar(&options.noTraversal, "no-traversal", false, "Disallow traversal for this edge router. Default to allowed(false).")
 	cmd.Flags().BoolVar(&options.disabled, "disabled", false, "Disabled routers can't connect to controllers")