more naming alignment

controller/list.go

@@ -22,10 +22,10 @@ func listEnvironmentsHandler(_ metadata.ListEnvironmentsParams, principal *rest_
 	var out rest_model_zrok.Environments
 	for _, env := range envs {
 		out = append(out, &rest_model_zrok.Environment{
-			Active:    env.Active,
-			CreatedAt: env.CreatedAt.String(),
-			UpdatedAt: env.UpdatedAt.String(),
-			ZitiID:    env.ZitiIdentityId,
+			Active:         env.Active,
+			CreatedAt:      env.CreatedAt.String(),
+			UpdatedAt:      env.UpdatedAt.String(),
+			ZitiIdentityID: env.ZitiIdentityId,
 		})
 	}
 	return metadata.NewListEnvironmentsOK().WithPayload(out)

rest_model_zrok/environment.go

@@ -20,14 +20,23 @@ type Environment struct {
 	// active
 	Active bool `json:"active,omitempty"`
 
+	// address
+	Address string `json:"address,omitempty"`
+
 	// created at
 	CreatedAt string `json:"createdAt,omitempty"`
 
+	// description
+	Description string `json:"description,omitempty"`
+
+	// host
+	Host string `json:"host,omitempty"`
+
 	// updated at
 	UpdatedAt string `json:"updatedAt,omitempty"`
 
-	// ziti Id
-	ZitiID string `json:"zitiId,omitempty"`
+	// ziti identity Id
+	ZitiIdentityID string `json:"zitiIdentityId,omitempty"`
 }
 
 // Validate validates this environment

rest_server_zrok/embedded_spec.go

@@ -295,13 +295,22 @@ func init() {
         "active": {
           "type": "boolean"
         },
+        "address": {
+          "type": "string"
+        },
         "createdAt": {
           "type": "string"
         },
+        "description": {
+          "type": "string"
+        },
+        "host": {
+          "type": "string"
+        },
         "updatedAt": {
           "type": "string"
         },
-        "zitiId": {
+        "zitiIdentityId": {
           "type": "string"
         }
       }
@@ -660,13 +669,22 @@ func init() {
         "active": {
           "type": "boolean"
         },
+        "address": {
+          "type": "string"
+        },
         "createdAt": {
           "type": "string"
         },
+        "description": {
+          "type": "string"
+        },
+        "host": {
+          "type": "string"
+        },
         "updatedAt": {
           "type": "string"
         },
-        "zitiId": {
+        "zitiIdentityId": {
           "type": "string"
         }
       }

specs/zrok.yml

@@ -180,7 +180,13 @@ definitions:
   environment:
     type: object
     properties:
-      zitiId:
+      description:
+        type: string
+      host:
+        type: string
+      address:
+        type: string
+      zitiIdentityId:
         type: string
       active:
         type: boolean

ui/src/Environments.js

@@ -7,8 +7,8 @@ const Environments = (props) => {
 
     const columns = [
         {
-            name: 'Ziti ID',
-            selector: row => row.zitiId,
+            name: 'Ziti Identity',
+            selector: row => row.zitiIdentityId,
             sortable: true,
         },
         {

ui/src/api/types.js

@@ -28,7 +28,10 @@
  * @typedef environment
  * @memberof module:types
  * 
- * @property {string} zitiId 
+ * @property {string} description 
+ * @property {string} host 
+ * @property {string} address 
+ * @property {string} zitiIdentityId 
  * @property {boolean} active 
  * @property {string} createdAt 
  * @property {string} updatedAt