Merge branch 'release-app-Microsoft.app-2025-01-01' into release-app-…

…Microsoft.app-2025-01-01
Azure · Jan 10, 2025 · 6dae834 · 6dae834
2 parents af73b8f + be9f51a
commit 6dae834
Show file tree

Hide file tree

Showing 33 changed files with 1,259 additions and 31 deletions.
diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/AuthConfigs.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/AuthConfigs.json
@@ -258,7 +258,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
         }
       ],
       "properties": {

diff --git a/...ation/app/resource-manager/Microsoft.App/stable/2025-01-01/AvailableWorkloadProfiles.json b/...ation/app/resource-manager/Microsoft.App/stable/2025-01-01/AvailableWorkloadProfiles.json
@@ -62,7 +62,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
         }
       ],
       "properties": {

diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/BillingMeters.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/BillingMeters.json
@@ -59,7 +59,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
         }
       ],
       "properties": {

diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/CommonDefinitions.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/CommonDefinitions.json
@@ -318,6 +318,10 @@
             "read"
           ]
         },
+        "certificateKeyVaultProperties": {
+          "description": "Certificate stored in Azure Key Vault.",
+          "$ref": "#/definitions/CertificateKeyVaultProperties"
+        },
         "certificateValue": {
           "format": "byte",
           "description": "PFX or PEM blob",
@@ -759,7 +763,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
         }
       ],
       "properties": {
@@ -956,12 +960,27 @@
         }
       }
     },
+    "CertificateKeyVaultProperties": {
+      "description": "Properties for a certificate stored in a Key Vault.",
+      "type": "object",
+      "properties": {
+        "identity": {
+          "description": "Resource ID of a managed identity to authenticate with Azure Key Vault, or System to use a system-assigned identity.",
+          "type": "string"
+        },
+        "keyVaultUrl": {
+          "description": "URL pointing to the Azure Key Vault secret that holds the certificate.",
+          "type": "string",
+          "format": "uri"
+        }
+      }
+    },
     "Certificate": {
       "description": "Certificate used for Custom Domain bindings of Container Apps in a Managed Environment",
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource"
         }
       ],
       "properties": {
@@ -985,6 +1004,10 @@
                 "modelAsString": true
               }
             },
+            "certificateKeyVaultProperties": {
+              "description": "Properties for a certificate stored in a Key Vault.",
+              "$ref": "#/definitions/CertificateKeyVaultProperties"
+            },
             "password": {
               "description": "Certificate password.",
               "type": "string",
@@ -1091,7 +1114,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource"
         }
       ],
       "properties": {

diff --git a/...ification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironments.json b/...ification/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironments.json
@@ -371,7 +371,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource"
         }
       ],
       "properties": {

diff --git a/...n/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsStorages.json b/...n/app/resource-manager/Microsoft.App/stable/2025-01-01/ConnectedEnvironmentsStorages.json
@@ -252,7 +252,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
         }
       ],
       "properties": {

diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/ContainerApps.json
@@ -669,7 +669,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource"
         }
       ],
       "properties": {
@@ -1395,7 +1395,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource"
         }
       ],
       "properties": {

diff --git a/...fication/app/resource-manager/Microsoft.App/stable/2025-01-01/ContainerAppsRevisions.json b/...fication/app/resource-manager/Microsoft.App/stable/2025-01-01/ContainerAppsRevisions.json
@@ -395,7 +395,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
         }
       ],
       "properties": {
@@ -525,7 +525,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
         }
       ],
       "properties": {

diff --git a/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/Diagnostics.json b/specification/app/resource-manager/Microsoft.App/stable/2025-01-01/Diagnostics.json
@@ -612,7 +612,7 @@
       "type": "object",
       "allOf": [
         {
-          "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
+          "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
         }
       ],
       "properties": {