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

merge release-0.15.0 again

Browse Source
This commit is contained in:
dovholuknf
2020-06-17 11:44:40 -04:00
parent 67edeb2df7 018bac13d5
commit e53ff1939f
6 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/release-notes.md
+3 -7
View File
@@ -1,15 +1,11 @@
# Release 0.15.0
Ziti 0.15.0 includes the following:
* cosmetic changes to the ziti-enroller binary
* cosmetic changes to the ziti-tunnel binary when running the enroll subcommand
# Release 0.14.13
Ziti 0.14.13 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)
* Remove deprecated AppWan and Clusters - These have been replaced by service policies and service edge router policies respectively
* cosmetic changes to the ziti-enroller binary
* cosmetic changes to the ziti-tunnel binary when running the enroll subcommand
## Removal of deprecated code
The code to migrate a Ziti instance from pre-0.9 releases has been removed. If you want to migrate from a pre-0.9 version you should first update to 0.14.12, then to new versions.
@@ -19,7 +15,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
+4 -4
View File
@@ -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.4
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
+10 -6
View File
@@ -319,16 +319,20 @@ 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/edge v0.14.37 h1:zEFk+Wow2Htcb9iTr3lAnWwfFs2PkwlgmVhGdXjo3Gw=
github.com/openziti/edge v0.14.37/go.mod h1:/FD4nh2v1GAq6vsoEBRYfLKjyHSt+ouxu8pznfcEXVQ=
github.com/openziti/fabric v0.11.40 h1:IebmkMrAa7R216cBd1ROhON5RgiPFm9TVyqo7a2Aknk=
github.com/openziti/fabric v0.11.40/go.mod h1:LsIAeOvc0ygIPZ2QCuh2l/nWbt2pp2e431KAhNtixws=
github.com/openziti/fabric v0.11.41 h1:9nF3r7K76hNngDqEr1WkC7bTSZP08hhPCjeyAmvWYfY=
github.com/openziti/fabric v0.11.41/go.mod h1:5m9QZeM62MiHLo5/QyY121oRypPc9atu1W8DUzyhDpM=
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/sdk-golang v0.13.4 h1:2u4FE154kGsYzGUu0bzGJLcKS8xSxGhrFsvBl2/RQAY=
github.com/openziti/sdk-golang v0.13.4/go.mod h1:p+DJisSGk7ggEjM/GoAWwIZYI+8EDVF5dVOQm301j2s=
github.com/openziti/foundation v0.11.3/go.mod h1:E+z3Ne+G1IrApCxg/+kKLFg5hUubElHyylvfCLJg4fk=
github.com/openziti/foundation v0.11.4 h1:3EZ+H1iJB/bdWnGTiQUoTQFp4vHYZ7oZWM2JkE7AQW4=
github.com/openziti/foundation v0.11.4/go.mod h1:E+z3Ne+G1IrApCxg/+kKLFg5hUubElHyylvfCLJg4fk=
github.com/openziti/sdk-golang v0.13.5/go.mod h1:SaHHvLkf4HnTqK4iOQmNmA23BsylRGc5Npb/x0g0hJc=
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
ziti/cmd/ziti/cmd/edge_controller/list.go
+8 -1
View File
@@ -110,7 +110,14 @@ func newListCmd(f cmdutil.Factory, out io.Writer, errOut io.Writer) *cobra.Comma
servicePolicyListRootCmd.AddCommand(newSubListCmdForEntityType("service-policies", "services", outputServices, newOptions()))
servicePolicyListRootCmd.AddCommand(newSubListCmdForEntityType("service-policies", "identities", outputIdentities, newOptions()))
cmd.AddCommand(configTypeListRootCmd, edgeRouterListRootCmd, edgeRouterPolicyListRootCmd, identityListRootCmd, serviceListRootCmd, servicePolicyListRootCmd)
cmd.AddCommand(configTypeListRootCmd,
edgeRouterListRootCmd,
edgeRouterPolicyListRootCmd,
identityListRootCmd,
serviceEdgeRouterPolicyListRootCmd,
serviceListRootCmd,
servicePolicyListRootCmd,
)
return cmd
}