Merge branch 'main' into 209-expose-metrics

liquidmetal-dev · Jan 26, 2022 · 6903ad8 · 6903ad8
2 parents e60a8d2 + 054c6c3
commit 6903ad8
Show file tree

Hide file tree

Showing 50 changed files with 551 additions and 555 deletions.
diff --git a/api/events/spec.go b/api/events/spec.go
@@ -6,6 +6,8 @@ type MicroVMSpecCreated struct {
 	ID string
 	// Namespace is the namespace of the created microvm.
 	Namespace string
+	// UID is the unique id of the created microvm.
+	UID string
 }
 
 // MicroVMSpecUpdated is an event for when a microvm spec is updated.
@@ -14,6 +16,8 @@ type MicroVMSpecUpdated struct {
 	ID string
 	// Namespace is the namespace of the updated microvm.
 	Namespace string
+	// UID is the unique id of the updated microvm.
+	UID string
 }
 
 // MicroVMSpecDeleted is an event for when a microvm spec is deleted.
@@ -22,4 +26,6 @@ type MicroVMSpecDeleted struct {
 	ID string
 	// Namespace is the namespace of the deleted microvm.
 	Namespace string
+	// UID is the unique id of the deleted microvm.
+	UID string
 }
diff --git a/api/services/microvm/v1alpha1/microvms.pb.go b/api/services/microvm/v1alpha1/microvms.pb.go
diff --git a/api/services/microvm/v1alpha1/microvms.pb.gw.go b/api/services/microvm/v1alpha1/microvms.pb.gw.go
diff --git a/api/services/microvm/v1alpha1/microvms.proto b/api/services/microvm/v1alpha1/microvms.proto
@@ -30,12 +30,12 @@ service MicroVM {
   }
   rpc DeleteMicroVM(DeleteMicroVMRequest) returns (google.protobuf.Empty) {
     option (google.api.http) = {
-      delete: "/v1alpha1/microvm/{namespace}/{id}"
+      delete: "/v1alpha1/microvm/{uid}"
     };
   }
   rpc GetMicroVM(GetMicroVMRequest) returns (GetMicroVMResponse) {
     option (google.api.http) = {
-      get: "/v1alpha1/microvm/{namespace}/{id}"
+      get: "/v1alpha1/microvm/{uid}"
     };
   }
   rpc ListMicroVMs(ListMicroVMsRequest) returns (ListMicroVMsResponse) {
@@ -56,13 +56,11 @@ message CreateMicroVMResponse {
 }
 
 message DeleteMicroVMRequest {
-  string id = 1;
-  string namespace = 2;
+  string uid = 1;
 }
 
 message GetMicroVMRequest {
-  string id = 1;
-  string namespace = 2;
+  string uid = 1;
 }
 
 message GetMicroVMResponse {

diff --git a/api/services/microvm/v1alpha1/microvms.swagger.json b/api/services/microvm/v1alpha1/microvms.swagger.json
@@ -69,7 +69,7 @@
         ]
       }
     },
-    "/v1alpha1/microvm/{namespace}/{id}": {
+    "/v1alpha1/microvm/{uid}": {
       "get": {
         "operationId": "MicroVM_GetMicroVM",
         "responses": {
@@ -88,13 +88,7 @@
         },
         "parameters": [
           {
-            "name": "namespace",
-            "in": "path",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "id",
+            "name": "uid",
             "in": "path",
             "required": true,
             "type": "string"
@@ -122,13 +116,7 @@
         },
         "parameters": [
           {
-            "name": "namespace",
-            "in": "path",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "id",
+            "name": "uid",
             "in": "path",
             "required": true,
             "type": "string"
@@ -333,6 +321,10 @@
           "type": "string",
           "format": "date-time",
           "description": "DeletedAt indicates the time the microvm was marked as deleted."
+        },
+        "uid": {
+          "type": "string",
+          "description": "UID is a globally unique identifier of the microvm."
         }
       },
       "description": "MicroVMSpec represents the specification for a microvm."