diff --git a/federation/service/node.go b/federation/service/node.go index f3365d351..8bbfce28d 100644 --- a/federation/service/node.go +++ b/federation/service/node.go @@ -506,7 +506,7 @@ func (svc node) fetchFederatedUser(ctx context.Context, n *types.Node) (*sysType // // Four parts are collected from the given URI: // 1) node host from URI's host -// 2) shared node ID (rom URI's username +// 2) shared node ID from URI's username // 3) shared token from URI's password // 4) name of the node from query string param "name" (optional) func (node) decodePairingURI(uri string) (*types.Node, error) { diff --git a/federation/service/sync_worker_structure.go b/federation/service/sync_worker_structure.go index e77feb301..23aadec00 100644 --- a/federation/service/sync_worker_structure.go +++ b/federation/service/sync_worker_structure.go @@ -8,7 +8,6 @@ import ( "github.com/cortezaproject/corteza-server/federation/types" "github.com/cortezaproject/corteza-server/pkg/auth" - "github.com/davecgh/go-spew/spew" "go.uber.org/zap" ) @@ -131,7 +130,6 @@ func (w *syncWorkerStructure) Watch(ctx context.Context, delay time.Duration, li default: } s, _ := url.Url.String() - spew.Dump("URL", s) meta := url.Meta.(*structureProcesser) // use the authToken from node pairing diff --git a/pkg/options/federation.gen.go b/pkg/options/federation.gen.go index 5df883f35..1af9aef21 100644 --- a/pkg/options/federation.gen.go +++ b/pkg/options/federation.gen.go @@ -29,7 +29,7 @@ func Federation() (o *FederationOpt) { o = &FederationOpt{ Enabled: false, Label: "Federation label", - Host: "Federation host", + Host: "local.cortezaproject.org", StructureMonitorInterval: time.Minute * 2, StructurePageSize: 1, DataMonitorInterval: time.Second * 60, diff --git a/pkg/options/federation.yaml b/pkg/options/federation.yaml index 50dcbec94..717646241 100644 --- a/pkg/options/federation.yaml +++ b/pkg/options/federation.yaml @@ -1,5 +1,3 @@ -name: federation - imports: - time @@ -18,7 +16,7 @@ props: - name: Host type: string - default: "Federation host" + default: "local.cortezaproject.org" env: FEDERATION_HOST description: Host that is used during node pairing, also included in invitation diff --git a/pkg/rbac/service.go b/pkg/rbac/service.go index f2829a7ff..9c04cecca 100644 --- a/pkg/rbac/service.go +++ b/pkg/rbac/service.go @@ -92,7 +92,6 @@ func NewService(logger *zap.Logger, s rbacRulesStore) (svc *service) { // When not explicitly allowed through rules or fallbacks, function will return FALSE. func (svc service) Can(roles []uint64, res Resource, op Operation, ff ...CheckAccessFunc) bool { // Checking rules - // spew.Dump("checking rules", res.RBACResource(), roles, svc.Check(res.RBACResource(), op, roles...), "end checking rules") var v = svc.Check(res.RBACResource(), op, roles...) if v != Inherit { return v == Allow