diff --git a/client.yml b/client.yml index f0c991a..04892f3 100644 --- a/client.yml +++ b/client.yml @@ -15,7 +15,7 @@ info: license: name: Apache 2.0 url: https://www.apache.org/licenses/LICENSE-2.0.html - version: 0.26.34 + version: 0.26.35 host: demo.ziti.dev basePath: /edge/client/v1 paths: @@ -4517,6 +4517,7 @@ definitions: - sdkInfo - roleAttributes - hasEdgeRouterConnection + - edgeRouterConnectionStatus - hasApiSession - isMfaEnabled - serviceHostingPrecedences @@ -4549,6 +4550,12 @@ definitions: type: string format: date-time x-nullable: true + edgeRouterConnectionStatus: + type: string + enum: + - online + - offline + - unknown enrollment: $ref: '#/definitions/identityEnrollments' envInfo: diff --git a/management.yml b/management.yml index 1b226f3..6ca12c8 100644 --- a/management.yml +++ b/management.yml @@ -15,7 +15,7 @@ info: license: name: Apache 2.0 url: https://www.apache.org/licenses/LICENSE-2.0.html - version: 0.26.34 + version: 0.26.35 host: demo.ziti.dev basePath: /edge/management/v1 paths: @@ -18129,6 +18129,7 @@ definitions: - sdkInfo - roleAttributes - hasEdgeRouterConnection + - edgeRouterConnectionStatus - hasApiSession - isMfaEnabled - serviceHostingPrecedences @@ -18161,6 +18162,12 @@ definitions: type: string format: date-time x-nullable: true + edgeRouterConnectionStatus: + type: string + enum: + - online + - offline + - unknown enrollment: $ref: '#/definitions/identityEnrollments' envInfo: diff --git a/rest_client_api_server/doc.go b/rest_client_api_server/doc.go index 238fcc5..eb06965 100644 --- a/rest_client_api_server/doc.go +++ b/rest_client_api_server/doc.go @@ -30,7 +30,7 @@ // https // Host: demo.ziti.dev // BasePath: /edge/client/v1 -// Version: 0.26.34 +// Version: 0.26.35 // License: Apache 2.0 https://www.apache.org/licenses/LICENSE-2.0.html // Contact: OpenZiti https://openziti.discourse.group // diff --git a/rest_client_api_server/embedded_spec.go b/rest_client_api_server/embedded_spec.go index a506028..34ad869 100644 --- a/rest_client_api_server/embedded_spec.go +++ b/rest_client_api_server/embedded_spec.go @@ -64,7 +64,7 @@ func init() { "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, - "version": "0.26.34" + "version": "0.26.35" }, "host": "demo.ziti.dev", "basePath": "/edge/client/v1", @@ -6277,6 +6277,7 @@ func init() { "sdkInfo", "roleAttributes", "hasEdgeRouterConnection", + "edgeRouterConnectionStatus", "hasApiSession", "isMfaEnabled", "serviceHostingPrecedences", @@ -6319,6 +6320,14 @@ func init() { "format": "date-time", "x-nullable": true }, + "edgeRouterConnectionStatus": { + "type": "string", + "enum": [ + "online", + "offline", + "unknown" + ] + }, "enrollment": { "$ref": "#/definitions/identityEnrollments" }, @@ -7813,7 +7822,7 @@ func init() { "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, - "version": "0.26.34" + "version": "0.26.35" }, "host": "demo.ziti.dev", "basePath": "/edge/client/v1", @@ -14109,6 +14118,7 @@ func init() { "sdkInfo", "roleAttributes", "hasEdgeRouterConnection", + "edgeRouterConnectionStatus", "hasApiSession", "isMfaEnabled", "serviceHostingPrecedences", @@ -14151,6 +14161,14 @@ func init() { "format": "date-time", "x-nullable": true }, + "edgeRouterConnectionStatus": { + "type": "string", + "enum": [ + "online", + "offline", + "unknown" + ] + }, "enrollment": { "$ref": "#/definitions/identityEnrollments" }, diff --git a/rest_management_api_server/doc.go b/rest_management_api_server/doc.go index 354fb72..1b0912d 100644 --- a/rest_management_api_server/doc.go +++ b/rest_management_api_server/doc.go @@ -30,7 +30,7 @@ // https // Host: demo.ziti.dev // BasePath: /edge/management/v1 -// Version: 0.26.34 +// Version: 0.26.35 // License: Apache 2.0 https://www.apache.org/licenses/LICENSE-2.0.html // Contact: OpenZiti https://openziti.discourse.group // diff --git a/rest_management_api_server/embedded_spec.go b/rest_management_api_server/embedded_spec.go index d3180dd..01722b0 100644 --- a/rest_management_api_server/embedded_spec.go +++ b/rest_management_api_server/embedded_spec.go @@ -64,7 +64,7 @@ func init() { "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, - "version": "0.26.34" + "version": "0.26.35" }, "host": "demo.ziti.dev", "basePath": "/edge/management/v1", @@ -25120,6 +25120,7 @@ func init() { "sdkInfo", "roleAttributes", "hasEdgeRouterConnection", + "edgeRouterConnectionStatus", "hasApiSession", "isMfaEnabled", "serviceHostingPrecedences", @@ -25162,6 +25163,14 @@ func init() { "format": "date-time", "x-nullable": true }, + "edgeRouterConnectionStatus": { + "type": "string", + "enum": [ + "online", + "offline", + "unknown" + ] + }, "enrollment": { "$ref": "#/definitions/identityEnrollments" }, @@ -28658,7 +28667,7 @@ func init() { "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, - "version": "0.26.34" + "version": "0.26.35" }, "host": "demo.ziti.dev", "basePath": "/edge/management/v1", @@ -53814,6 +53823,7 @@ func init() { "sdkInfo", "roleAttributes", "hasEdgeRouterConnection", + "edgeRouterConnectionStatus", "hasApiSession", "isMfaEnabled", "serviceHostingPrecedences", @@ -53856,6 +53866,14 @@ func init() { "format": "date-time", "x-nullable": true }, + "edgeRouterConnectionStatus": { + "type": "string", + "enum": [ + "online", + "offline", + "unknown" + ] + }, "enrollment": { "$ref": "#/definitions/identityEnrollments" }, diff --git a/rest_model/identity_detail.go b/rest_model/identity_detail.go index b2e7ad9..e67df50 100644 --- a/rest_model/identity_detail.go +++ b/rest_model/identity_detail.go @@ -31,6 +31,7 @@ package rest_model import ( "context" + "encoding/json" "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" @@ -78,6 +79,11 @@ type IdentityDetail struct { // Format: date-time DisabledUntil *strfmt.DateTime `json:"disabledUntil,omitempty"` + // edge router connection status + // Required: true + // Enum: [online offline unknown] + EdgeRouterConnectionStatus *string `json:"edgeRouterConnectionStatus"` + // enrollment // Required: true Enrollment *IdentityEnrollments `json:"enrollment"` @@ -168,6 +174,8 @@ func (m *IdentityDetail) UnmarshalJSON(raw []byte) error { DisabledUntil *strfmt.DateTime `json:"disabledUntil,omitempty"` + EdgeRouterConnectionStatus *string `json:"edgeRouterConnectionStatus"` + Enrollment *IdentityEnrollments `json:"enrollment"` EnvInfo *EnvInfo `json:"envInfo"` @@ -220,6 +228,8 @@ func (m *IdentityDetail) UnmarshalJSON(raw []byte) error { m.DisabledUntil = dataAO1.DisabledUntil + m.EdgeRouterConnectionStatus = dataAO1.EdgeRouterConnectionStatus + m.Enrollment = dataAO1.Enrollment m.EnvInfo = dataAO1.EnvInfo @@ -281,6 +291,8 @@ func (m IdentityDetail) MarshalJSON() ([]byte, error) { DisabledUntil *strfmt.DateTime `json:"disabledUntil,omitempty"` + EdgeRouterConnectionStatus *string `json:"edgeRouterConnectionStatus"` + Enrollment *IdentityEnrollments `json:"enrollment"` EnvInfo *EnvInfo `json:"envInfo"` @@ -330,6 +342,8 @@ func (m IdentityDetail) MarshalJSON() ([]byte, error) { dataAO1.DisabledUntil = m.DisabledUntil + dataAO1.EdgeRouterConnectionStatus = m.EdgeRouterConnectionStatus + dataAO1.Enrollment = m.Enrollment dataAO1.EnvInfo = m.EnvInfo @@ -413,6 +427,10 @@ func (m *IdentityDetail) Validate(formats strfmt.Registry) error { res = append(res, err) } + if err := m.validateEdgeRouterConnectionStatus(formats); err != nil { + res = append(res, err) + } + if err := m.validateEnrollment(formats); err != nil { res = append(res, err) } @@ -625,6 +643,40 @@ func (m *IdentityDetail) validateDisabledUntil(formats strfmt.Registry) error { return nil } +var identityDetailTypeEdgeRouterConnectionStatusPropEnum []interface{} + +func init() { + var res []string + if err := json.Unmarshal([]byte(`["online","offline","unknown"]`), &res); err != nil { + panic(err) + } + for _, v := range res { + identityDetailTypeEdgeRouterConnectionStatusPropEnum = append(identityDetailTypeEdgeRouterConnectionStatusPropEnum, v) + } +} + +// property enum +func (m *IdentityDetail) validateEdgeRouterConnectionStatusEnum(path, location string, value string) error { + if err := validate.EnumCase(path, location, value, identityDetailTypeEdgeRouterConnectionStatusPropEnum, true); err != nil { + return err + } + return nil +} + +func (m *IdentityDetail) validateEdgeRouterConnectionStatus(formats strfmt.Registry) error { + + if err := validate.Required("edgeRouterConnectionStatus", "body", m.EdgeRouterConnectionStatus); err != nil { + return err + } + + // value enum + if err := m.validateEdgeRouterConnectionStatusEnum("edgeRouterConnectionStatus", "body", *m.EdgeRouterConnectionStatus); err != nil { + return err + } + + return nil +} + func (m *IdentityDetail) validateEnrollment(formats strfmt.Registry) error { if err := validate.Required("enrollment", "body", m.Enrollment); err != nil { diff --git a/source/client.yml b/source/client.yml index 695c52f..eff9075 100644 --- a/source/client.yml +++ b/source/client.yml @@ -1,7 +1,7 @@ --- swagger: '2.0' info: - version: 0.26.34 + version: 0.26.35 title: Ziti Edge Client description: OpenZiti Edge Client API contact: diff --git a/source/management.yml b/source/management.yml index 8e42fbf..c2e6f48 100644 --- a/source/management.yml +++ b/source/management.yml @@ -1,7 +1,7 @@ --- swagger: '2.0' info: - version: 0.26.34 + version: 0.26.35 title: Ziti Edge Management description: OpenZiti Edge Management API contact: diff --git a/source/shared/identities.yml b/source/shared/identities.yml index 0ea2d0c..8d5e098 100644 --- a/source/shared/identities.yml +++ b/source/shared/identities.yml @@ -24,6 +24,7 @@ definitions: - sdkInfo - roleAttributes - hasEdgeRouterConnection + - edgeRouterConnectionStatus - hasApiSession - isMfaEnabled - serviceHostingPrecedences @@ -56,6 +57,12 @@ definitions: $ref: 'base-entity.yml#/definitions/attributes' hasEdgeRouterConnection: type: boolean + edgeRouterConnectionStatus: + type: string + enum: + - online + - offline + - unknown hasApiSession: type: boolean isMfaEnabled: @@ -63,7 +70,7 @@ definitions: authPolicyId: type: string authPolicy: - $ref: 'base-entity.yml#/definitions/entityRef' + $ref: 'base-entity.yml#/definitions/entityRef' defaultHostingPrecedence: $ref: 'terminators.yml#/definitions/terminatorPrecedence' defaultHostingCost: