gsadmin/ziti
1
0
Fork 0
mirror of https://github.com/openziti/ziti.git synced 2026-10-13 07:41:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix create config and create identity cli commands. Update release notes

Browse Source
This commit is contained in:
Paul Lorenz
2020-06-17 00:46:48 -04:00
parent e023e48e6c
commit bb257e17c9
5 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/release-notes.md
+3 -3
View File
@@ -1,5 +1,5 @@
# Release 0.14.13
Ziti 0.14.13 includes the following:
# Release 0.15.0
Ziti 0.15.0 includes the following:
* [Create fabric mgmt API to request database snapshot/backup be created](https://github.com/openziti/fabric/issues/99)
* [Remove postgres store code including migrations](https://github.com/openziti/edge/issues/195)
@@ -13,7 +13,7 @@ The ziti-fabric tool can now be used to trigger the creation of a dabase backup/
$ ziti-fabric snapshot-db
This will create a copy of the database file within a bolt transaction. The file name will have the data and time appended to it. Snapshotting can be done at most once per minute. Support to trigger this from the Edge REST API will be comming in a follow up release.
This will create a copy of the database file within a bolt transaction. The file name will have the data and time appended to it. Snapshotting can be done at most once per minute. Support to trigger this from the Edge REST API will be comming in a follow-up release.
# Release 0.14.13
Ziti 0.14.13 includes the following:
go.mod
+6 -6
View File
@@ -2,13 +2,13 @@ module github.com/openziti/ziti
go 1.14
// replace github.com/openziti/foundation => ../foundation
replace github.com/openziti/foundation => ../foundation
// replace github.com/openziti/fabric => ../fabric
// replace github.com/openziti/sdk-golang => ../sdk-golang
// replace github.com/openziti/edge => ../edge
replace github.com/openziti/edge => ../edge
require (
github.com/Jeffail/gabs v1.4.0
@@ -25,10 +25,10 @@ require (
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19
github.com/michaelquigley/pfxlog v0.0.0-20190813191113-2be43bd0dccc
github.com/openziti/edge v0.14.35
github.com/openziti/fabric v0.11.40
github.com/openziti/foundation v0.11.2
github.com/openziti/sdk-golang v0.13.3
github.com/openziti/edge v0.14.37
github.com/openziti/fabric v0.11.41
github.com/openziti/foundation v0.11.4
github.com/openziti/sdk-golang v0.13.6
github.com/pborman/uuid v1.2.0
github.com/pkg/errors v0.9.1
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0
go.sum
+4 -8
View File
@@ -319,14 +319,10 @@ github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU=
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/openziti/edge v0.14.35 h1:wo5XIsI9YI+9sTpBPU8zs2emfzWJpzWIe0qbJnyZz70=
github.com/openziti/edge v0.14.35/go.mod h1:nK17nIrX+WUA6zOQ0np/t1cLjOka5s7BqFHF029tKaI=
github.com/openziti/fabric v0.11.40 h1:IebmkMrAa7R216cBd1ROhON5RgiPFm9TVyqo7a2Aknk=
github.com/openziti/fabric v0.11.40/go.mod h1:LsIAeOvc0ygIPZ2QCuh2l/nWbt2pp2e431KAhNtixws=
github.com/openziti/foundation v0.11.2 h1:h6jsPLDkNzH1WTVPb8MPaECgYqEwzlXFwLRFeO1Aojk=
github.com/openziti/foundation v0.11.2/go.mod h1:E+z3Ne+G1IrApCxg/+kKLFg5hUubElHyylvfCLJg4fk=
github.com/openziti/sdk-golang v0.13.3 h1:FU28BkuRrQvPDgP2eGhUtfWF7ttZc7G0r5Hnh7kezgQ=
github.com/openziti/sdk-golang v0.13.3/go.mod h1:sBp8VaoiF6GXi0ZfP6sF/xj1f+Q9Jw5kSFlImFH0fAM=
github.com/openziti/fabric v0.11.41 h1:9nF3r7K76hNngDqEr1WkC7bTSZP08hhPCjeyAmvWYfY=
github.com/openziti/fabric v0.11.41/go.mod h1:5m9QZeM62MiHLo5/QyY121oRypPc9atu1W8DUzyhDpM=
github.com/openziti/sdk-golang v0.13.6 h1:wlO+VljW4pNXwY8tANLWBLOOM91oRoZHvlBtv7JBbBI=
github.com/openziti/sdk-golang v0.13.6/go.mod h1:TM1BobbkOY7TOVMXlciKQJaZQlSgqap89MHi0AgmRMM=
github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6 h1:lNCW6THrCKBiJBpz8kbVGjC7MgdCGKwuvBgc7LoD6sw=
github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI=
github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g=
ziti/cmd/ziti/cmd/edge_controller/create_config.go
+1 -1
View File
@@ -102,7 +102,7 @@ func runCreateConfig(o *createConfigOptions) error {
entityData := gabs.New()
setJSONValue(entityData, o.Args[0], "name")
setJSONValue(entityData, configTypeId, "type")
setJSONValue(entityData, configTypeId, "configTypeId")
setJSONValue(entityData, dataMap, "data")
result, err := createEntityOfType("configs", entityData.String(), &o.commonOptions)
ziti/cmd/ziti/cmd/edge_controller/create_identity.go
+5 -3
View File
@@ -150,9 +150,11 @@ func getIdentityJwt(o *createIdentityOptions, id string) error {
return err
}
jwtExpiration := newIdentity.Path("enrollment.ott.expiresAt").Data().(string)
if jwtExpiration != "" {
fmt.Printf("Enrollment expires at %v\n", jwtExpiration)
if container := newIdentity.Path("enrollment.ott.expiresAt"); container != nil && container.Data() != nil {
jwtExpiration := fmt.Sprintf("%v", container.Data())
if jwtExpiration != "" {
fmt.Printf("Enrollment expires at %v\n", jwtExpiration)
}
}
return err