Merge branch 'master' into 314-update-to-micronaut-41

typespec/models/ContainerRequest.tsp

@@ -1,5 +1,7 @@
 import "./ContainerConfig.tsp";
 import "./Packages.tsp";
+import "./ScanMode.tsp";
+import "./ScanLevel.tsp";
 
 @doc("Request payload for creating a container token.")
 model ContainerRequest {
@@ -16,7 +18,10 @@ model ContainerRequest {
   format: "sif" | "docker";
   freeze?: boolean;
   nameStrategy?: "none" | "tagPrefix" | "imageSuffix";
+  mirrorRegistry?: string;
   packages?: Packages;
+  scanMode?: ScanMode;
+  scanLevels?: ScanLevel[];
   timestamp: string;
   towerAccessToken?: string;
   towerEndpoint?: string;

typespec/models/ContainerResponse.tsp

@@ -1,10 +1,16 @@
+import "./ContainerStatus.tsp";
+
 @doc("Response payload for container token creation.")
 model ContainerResponse {
   buildId: string;
   cached: boolean;
   containerImage: string;
   containerToken: string;
   expiration: string;
-  freeze?: boolean;
+  freeze: boolean;
+  mirror: boolean;
+  requestId: string;
+  scanId: string;
+  status: ContainerStatus;
   targetImage: string;
-}
+}

typespec/models/ContainerStatus.tsp

@@ -0,0 +1,6 @@
+enum ContainerStatus {
+    PENDING,
+    BUILDING,
+    SCANNING,
+    DONE
+}

typespec/models/ContainerStatusResponse.tsp

@@ -0,0 +1,21 @@
+import "./ContainerStatus.tsp";
+
+@doc("Response payload for container status.")
+model ContainerStatusResponse {
+  id: string;
+  status: ContainerStatus;
+  buildId: string;
+  mirrorId: string;
+  scanId: string;
+  vulnerabilities: Record<vulnerability>;
+  succeeded: boolean;
+  reason: string;
+  detailsUri: string;
+  creationTime: string;
+  duration: string;
+}
+
+model vulnerability {
+  severity: string;
+  count: int32
+}

typespec/models/ScanLevel.tsp

@@ -0,0 +1,6 @@
+enum ScanLevel {
+    LOW,
+    MEDIUM,
+    HIGH,
+    CRITICAL
+}

typespec/models/ScanMode.tsp

@@ -0,0 +1,5 @@
+enum ScanMode{
+    none,
+    async,
+    required
+}

typespec/models/models.tsp

@@ -9,3 +9,4 @@ import "./WaveBuildRecord.tsp";
 import "./ValidateRegistryCredsRequest.tsp";
 import "./WaveContainerRecord.tsp";
 import "./ContainerMirrorResponse.tsp";
+import "./ContainerStatusResponse.tsp";

typespec/routes.tsp

@@ -16,13 +16,21 @@ namespace wave {
     @statusCode statusCode: 200;
     };
 
-    @route("/{token}")
-    @get op getContainerDetails(@path token: string): {
+    @route("/container/{requestId}")
+    @get op getContainerDetails(@path requestId: string): {
       @body response: WaveContainerRecord;
       @statusCode statusCode: 200;
     }|{
       @statusCode statusCode: 404;
       };
+
+    @route("/{requestId}/status")
+    @get op getContainerStatus(@path requestId: string): {
+      @body response: ContainerStatusResponse;
+      @statusCode statusCode: 200;
+    }|{
+      @statusCode statusCode: 404;
+      };
   }
 
   @route("/v1alpha1/builds/{buildId}")