Merge pull request #136 from openziti/edge-router-connection-status

Add edge router connection status to identity
openziti · Nov 1, 2024 · d76bff4 · d76bff4
2 parents c43eb5b + a42877e
commit d76bff4
Show file tree

Hide file tree

Showing 10 changed files with 120 additions and 11 deletions.
diff --git 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
@@ -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
diff --git a/rest_client_api_server/embedded_spec.go b/rest_client_api_server/embedded_spec.go
diff --git a/rest_management_api_server/doc.go b/rest_management_api_server/doc.go
diff --git a/rest_management_api_server/embedded_spec.go b/rest_management_api_server/embedded_spec.go
diff --git a/rest_model/identity_detail.go b/rest_model/identity_detail.go
diff --git 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
@@ -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
@@ -24,6 +24,7 @@ definitions:
           - sdkInfo
           - roleAttributes
           - hasEdgeRouterConnection
+          - edgeRouterConnectionStatus
           - hasApiSession
           - isMfaEnabled
           - serviceHostingPrecedences
@@ -56,14 +57,20 @@ definitions:
             $ref: 'base-entity.yml#/definitions/attributes'
           hasEdgeRouterConnection:
             type: boolean
+          edgeRouterConnectionStatus:
+            type: string
+            enum:
+              - online
+              - offline
+              - unknown
           hasApiSession:
             type: boolean
           isMfaEnabled:
             type: boolean
           authPolicyId:
             type: string
           authPolicy:
-              $ref: 'base-entity.yml#/definitions/entityRef'
+            $ref: 'base-entity.yml#/definitions/entityRef'
           defaultHostingPrecedence:
             $ref: 'terminators.yml#/definitions/terminatorPrecedence'
           defaultHostingCost: