CMK and Log Template (#10370)

Azure · Sep 9, 2020 · 20b6c51 · 20b6c51
1 parent d2efa99
commit 20b6c51
Show file tree

Hide file tree

Showing 18 changed files with 309 additions and 31 deletions.
diff --git a/...nager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/containerregistry_build.json b/...nager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/containerregistry_build.json
@@ -382,6 +382,9 @@
           },
           "Registries_ScheduleRun_WithCustomCredentials": {
             "$ref": "./examples/RegistriesScheduleRun_WithCustomCredentials.json"
+          },
+          "Registries_ScheduleRun_WithLogTemplate": {
+            "$ref": "./examples/RegistriesScheduleRun_WithLogTemplate.json"
           }
         }
       }
@@ -1154,6 +1157,9 @@
           },
           "Tasks_Create_WithUserIdentities": {
             "$ref": "./examples/ManagedIdentity/TasksCreate_WithUserIdentities.json"
+          },
+          "Tasks_Create_QuickTask": {
+            "$ref": "./examples/TasksCreate_QuickTask.json"
           }
         }
       },
@@ -1269,6 +1275,9 @@
           },
           "Tasks_Update_WithOpaqueCustomCredentials": {
             "$ref": "./examples/TasksUpdate_WithOpaqueCustomCredentials.json"
+          },
+          "Tasks_Update_QuickTask": {
+            "$ref": "./examples/TasksUpdate_QuickTask.json"
           }
         }
       }
@@ -1459,6 +1468,10 @@
         "agentPoolName": {
           "description": "The dedicated agent pool for the run.",
           "type": "string"
+        },
+        "logTemplate": {
+          "description": "The template that describes the repository and tag information for run log artifact.",
+          "type": "string"
         }
       },
       "discriminator": "type"
@@ -1594,6 +1607,11 @@
           "description": "The update trigger token passed for the Run.",
           "type": "string"
         },
+        "logArtifact": {
+          "$ref": "#/definitions/ImageDescriptor",
+          "description": "The image description for the log artifact.",
+          "readOnly": true
+        },
         "provisioningState": {
           "description": "The provisioning state of a run.",
           "enum": [
@@ -2095,10 +2113,6 @@
     },
     "TaskProperties": {
       "description": "The properties of a task.",
-      "required": [
-        "platform",
-        "step"
-      ],
       "type": "object",
       "properties": {
         "provisioningState": {
@@ -2167,6 +2181,15 @@
         "credentials": {
           "$ref": "#/definitions/Credentials",
           "description": "The properties that describes a set of credentials that will be used when this run is invoked."
+        },
+        "logTemplate": {
+          "description": "The template that describes the repository and tag information for run log artifact.",
+          "type": "string"
+        },
+        "isSystemTask": {
+          "description": "The value of this property indicates whether the task resource is system task or not.",
+          "default": false,
+          "type": "boolean"
         }
       }
     },
@@ -2614,6 +2637,10 @@
         "credentials": {
           "$ref": "#/definitions/Credentials",
           "description": "The parameters that describes a set of credentials that will be used when this run is invoked."
+        },
+        "logTemplate": {
+          "description": "The template that describes the repository and tag information for run log artifact.",
+          "type": "string"
         }
       }
     },

diff --git a/.../2019-06-01-preview/examples/ManagedIdentity/TasksCreate_WithSystemAndUserIdentities.json b/.../2019-06-01-preview/examples/ManagedIdentity/TasksCreate_WithSystemAndUserIdentities.json
@@ -67,7 +67,9 @@
             "updateTriggerEndpoint": "https://user:pass@mycicd.webhook.com?token=foo",
             "updateTriggerPayloadType": "Default"
           }
-        }
+        },
+        "isSystemTask": false,
+        "logTemplate": null
       },
       "location": "eastus",
       "identity": {
@@ -141,7 +143,9 @@
               "updateTriggerEndpoint": null,
               "updateTriggerPayloadType": "Default"
             }
-          }
+          },
+          "isSystemTask": false,
+          "logTemplate": null
         },
         "id": "/subscriptions/4385cf00-2d3a-425a-832f-f4285b1c9dce/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/tasks/myTask",
         "name": "myTask",
@@ -222,7 +226,9 @@
               "updateTriggerEndpoint": null,
               "updateTriggerPayloadType": "Default"
             }
-          }
+          },
+          "isSystemTask": false,
+          "logTemplate": null
         },
         "id": "/subscriptions/4385cf00-2d3a-425a-832f-f4285b1c9dce/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/tasks/myTask",
         "name": "myTask",

diff --git a/...y/preview/2019-06-01-preview/examples/ManagedIdentity/TasksCreate_WithSystemIdentity.json b/...y/preview/2019-06-01-preview/examples/ManagedIdentity/TasksCreate_WithSystemIdentity.json
@@ -65,7 +65,9 @@
             "name": "myBaseImageTrigger",
             "baseImageTriggerType": "Runtime"
           }
-        }
+        },
+        "isSystemTask": false,
+        "logTemplate": null
       },
       "location": "eastus",
       "identity": {
@@ -134,7 +136,9 @@
               "status": "Enabled",
               "baseImageTriggerType": "Runtime"
             }
-          }
+          },
+          "isSystemTask": false,
+          "logTemplate": null
         },
         "id": "/subscriptions/4385cf00-2d3a-425a-832f-f4285b1c9dce/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/tasks/myTask",
         "name": "myTask",
@@ -207,7 +211,9 @@
               "status": "Enabled",
               "baseImageTriggerType": "Runtime"
             }
-          }
+          },
+          "isSystemTask": false,
+          "logTemplate": null
         },
         "id": "/subscriptions/4385cf00-2d3a-425a-832f-f4285b1c9dce/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/tasks/myTask",
         "name": "myTask",

diff --git a/...y/preview/2019-06-01-preview/examples/ManagedIdentity/TasksCreate_WithUserIdentities.json b/...y/preview/2019-06-01-preview/examples/ManagedIdentity/TasksCreate_WithUserIdentities.json
@@ -67,7 +67,9 @@
             "updateTriggerEndpoint": "https://user:pass@mycicd.webhook.com?token=foo",
             "updateTriggerPayloadType": "Default"
           }
-        }
+        },
+        "isSystemTask": false,
+        "logTemplate": null
       },
       "location": "eastus",
       "identity": {
@@ -142,7 +144,9 @@
               "updateTriggerEndpoint": null,
               "updateTriggerPayloadType": "Default"
             }
-          }
+          },
+          "isSystemTask": false,
+          "logTemplate": null
         },
         "id": "/subscriptions/4385cf00-2d3a-425a-832f-f4285b1c9dce/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/tasks/myTask",
         "name": "myTask",
@@ -225,7 +229,9 @@
               "updateTriggerEndpoint": null,
               "updateTriggerPayloadType": "Default"
             }
-          }
+          },
+          "isSystemTask": false,
+          "logTemplate": null
         },
         "id": "/subscriptions/4385cf00-2d3a-425a-832f-f4285b1c9dce/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/tasks/myTask",
         "name": "myTask",

diff --git a/...019-06-01-preview/examples/ManagedIdentity/TasksUpdate_WithKeyVaultCustomCredentials.json b/...019-06-01-preview/examples/ManagedIdentity/TasksUpdate_WithKeyVaultCustomCredentials.json
@@ -48,7 +48,8 @@
               "identity": "[system]"
             }
           }
-        }
+        },
+        "logTemplate": null
       },
       "tags": {
         "testkey": "value"
@@ -121,7 +122,8 @@
               "myregistry.azurecr.io": null
             },
             "sourceRegistry": null
-          }
+          },
+          "logTemplate": null
         },
         "id": "/subscriptions/4385cf00-2d3a-425a-832f-f4285b1c9dce/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/tasks/myTask",
         "name": "myTask",
@@ -202,7 +204,8 @@
               "myregistry.azurecr.io": null
             },
             "sourceRegistry": null
-          }
+          },
+          "logTemplate": null
         },
         "id": "/subscriptions/4385cf00-2d3a-425a-832f-f4285b1c9dce/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/tasks/myTask",
         "name": "myTask",

diff --git a/...iew/2019-06-01-preview/examples/ManagedIdentity/TasksUpdate_WithMSICustomCredentials.json b/...iew/2019-06-01-preview/examples/ManagedIdentity/TasksUpdate_WithMSICustomCredentials.json
@@ -40,7 +40,8 @@
               "identity": "[system]"
             }
           }
-        }
+        },
+        "logTemplate": null
       },
       "tags": {
         "testkey": "value"
@@ -111,7 +112,8 @@
               "myregistry.azure.io": null
             },
             "sourceRegistry": null
-          }
+          },
+          "logTemplate": null
         },
         "id": "/subscriptions/4385cf00-2d3a-425a-832f-f4285b1c9dce/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/tasks/myTask",
         "name": "myTask",
@@ -190,7 +192,8 @@
               "myregistry.azure.io": null
             },
             "sourceRegistry": null
-          }
+          },
+          "logTemplate": null
         },
         "id": "/subscriptions/4385cf00-2d3a-425a-832f-f4285b1c9dce/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/tasks/myTask",
         "name": "myTask",

diff --git a/...erRegistry/preview/2019-06-01-preview/examples/RegistriesScheduleRun_WithLogTemplate.json b/...erRegistry/preview/2019-06-01-preview/examples/RegistriesScheduleRun_WithLogTemplate.json
@@ -0,0 +1,55 @@
+{
+  "parameters": {
+    "subscriptionId": "4385cf00-2d3a-425a-832f-f4285b1c9dce",
+    "resourceGroupName": "myResourceGroup",
+    "registryName": "myRegistry",
+    "api-version": "2019-06-01-preview",
+    "runRequest": {
+      "type": "DockerBuildRequest",
+      "isArchiveEnabled": true,
+      "imageNames": [
+        "azurerest:testtag"
+      ],
+      "noCache": true,
+      "sourceLocation": "https://myaccount.blob.core.windows.net/sascontainer/source.zip?sv=2015-04-05&st=2015-04-29T22%3A18%3A26Z&se=2015-04-30T02%3A23%3A26Z&sr=b&sp=rw&sip=168.1.5.60-168.1.5.70&spr=https&sig=Z%2FRHIX5Xcg0Mq2rqI3OlWTjEg2tYkboXr1P9ZUXDtkk%3D",
+      "arguments": [
+        {
+          "name": "mytestargument",
+          "value": "mytestvalue",
+          "isSecret": false
+        },
+        {
+          "name": "mysecrettestargument",
+          "value": "mysecrettestvalue",
+          "isSecret": true
+        }
+      ],
+      "isPushEnabled": true,
+      "platform": {
+        "os": "Linux",
+        "architecture": "amd64"
+      },
+      "agentConfiguration": {
+        "cpu": 2
+      },
+      "dockerFilePath": "DockerFile",
+      "logTemplate": "acr/tasks:{{.Run.OS}}"
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "properties": {
+          "provisioningState": "Succeeded",
+          "runId": "0accec26-d6de-4757-8e74-d080f38eaaab",
+          "status": "Succeeded",
+          "lastUpdatedTime": "2018-01-25T05:13:51.617Z"
+        },
+        "id": "/subscriptions/4385cf00-2d3a-425a-832f-f4285b1c9dce/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/runs/0accec26-d6de-4757-8e74-d080f38eaaab",
+        "name": "0accec26-d6de-4757-8e74-d080f38eaaab",
+        "type": "Microsoft.ContainerRegistry/registries/run"
+      }
+    },
+    "202": {}
+  }
+}
diff --git a/...urce-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/RunsGet.json b/...urce-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/RunsGet.json
@@ -46,6 +46,12 @@
           },
           "agentConfiguration": {
             "cpu": 2
+          },
+          "logArtifact": {
+            "digest": "sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0",
+            "registry": "myregistry",
+            "repository": "acr/tasks",
+            "tag": "mytask-0accec26-d6de-4757-8e74-d080f38eaaab-log"
           }
         },
         "id": "/subscriptions/4385cf00-2d3a-425a-832f-f4285b1c9dce/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/runs/0accec26-d6de-4757-8e74-d080f38eaaab",

diff --git a/...rce-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/RunsList.json b/...rce-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/RunsList.json
@@ -49,6 +49,12 @@
               },
               "agentConfiguration": {
                 "cpu": 2
+              },
+              "logArtifact": {
+                "digest": "sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0",
+                "registry": "myregistry",
+                "repository": "acr/tasks",
+                "tag": "mytask-0accec26-d6de-4757-8e74-d080f38eaaab-log"
               }
             },
             "id": "/subscriptions/4385cf00-2d3a-425a-832f-f4285b1c9dce/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/runs/0accec26-d6de-4757-8e74-d080f38eaaab",

diff --git a/...e-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/RunsUpdate.json b/...e-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/RunsUpdate.json
@@ -49,6 +49,12 @@
           },
           "agentConfiguration": {
             "cpu": 2
+          },
+          "logArtifact": {
+            "digest": "sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0",
+            "registry": "myregistry",
+            "repository": "acr/tasks",
+            "tag": "mytask-0accec26-d6de-4757-8e74-d080f38eaaab-log"
           }
         },
         "id": "/subscriptions/4385cf00-2d3a-425a-832f-f4285b1c9dce/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/runs/0accec26-d6de-4757-8e74-d080f38eaaab",
@@ -95,6 +101,12 @@
           },
           "agentConfiguration": {
             "cpu": 2
+          },
+          "logArtifact": {
+            "digest": "sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0",
+            "registry": "myregistry",
+            "repository": "acr/tasks",
+            "tag": "mytask-0accec26-d6de-4757-8e74-d080f38eaaab-log"
           }
         },
         "id": "/subscriptions/4385cf00-2d3a-425a-832f-f4285b1c9dce/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/runs/0accec26-d6de-4757-8e74-d080f38eaaab",

diff --git a/...-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/TasksCreate.json b/...-manager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/examples/TasksCreate.json
@@ -67,7 +67,9 @@
             "updateTriggerEndpoint": "https://user:pass@mycicd.webhook.com?token=foo",
             "updateTriggerPayloadType": "Token"
           }
-        }
+        },
+        "isSystemTask": false,
+        "logTemplate": "acr/tasks:{{.Run.OS}}"
       },
       "location": "eastus",
       "identity": {
@@ -138,7 +140,9 @@
               "updateTriggerEndpoint": null,
               "updateTriggerPayloadType": "Token"
             }
-          }
+          },
+          "isSystemTask": false,
+          "logTemplate": "acr/tasks:{{.Run.OS}}"
         },
         "id": "/subscriptions/4385cf00-2d3a-425a-832f-f4285b1c9dce/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/tasks/myTask",
         "name": "myTask",
@@ -213,7 +217,9 @@
               "updateTriggerEndpoint": null,
               "updateTriggerPayloadType": "Token"
             }
-          }
+          },
+          "isSystemTask": false,
+          "logTemplate": "acr/tasks:{{.Run.OS}}"
         },
         "id": "/subscriptions/4385cf00-2d3a-425a-832f-f4285b1c9dce/resourceGroups/myResourceGroup/providers/Microsoft.ContainerRegistry/registries/myRegistry/tasks/myTask",
         "name": "myTask",