Support 'default' property in JSON schemas (#2225)

Azure · Jul 12, 2024 · fa344a1 · fa344a1
1 parent b475f29
commit fa344a1
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 54 deletions.
diff --git a/src/autorest.bicep/src/schema-generator.ts b/src/autorest.bicep/src/schema-generator.ts
@@ -285,20 +285,23 @@ export function generateSchema(host: AutorestExtensionHost, definition: Provider
       return {
         type: 'string',
         format: combinedSchema.format,
+        default: combinedSchema.defaultValue,
       };
     }
 
     if (combinedSchema instanceof UuidSchema) {
       return {
         type: 'string',
-        pattern: '^[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}$'
+        pattern: '^[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}$',
+        default: combinedSchema.defaultValue,
       };
     }
 
     if (combinedSchema instanceof StringSchema) {
       return {
         type: 'string',
         pattern: combinedSchema.pattern,
+        default: combinedSchema.defaultValue,
         minLength: combinedSchema.minLength,
         maxLength: combinedSchema.maxLength,
       };
@@ -307,6 +310,7 @@ export function generateSchema(host: AutorestExtensionHost, definition: Provider
     if (combinedSchema instanceof NumberSchema) {
       return {
         type: combinedSchema.type,
+        default: combinedSchema.defaultValue,
         minimum: combinedSchema.minimum,
         maximum: combinedSchema.maximum,
         multipleOf: combinedSchema.multipleOf,
@@ -315,6 +319,7 @@ export function generateSchema(host: AutorestExtensionHost, definition: Provider
 
     return {
       type: toBuiltInTypeKind(combinedSchema),
+      default: combinedSchema.defaultValue,
     };
   }
 

diff --git a/...utorest.bicep/test/integration/generated/arm-schema/basic/test.rp1/2021-10-31/schema.json b/...utorest.bicep/test/integration/generated/arm-schema/basic/test.rp1/2021-10-31/schema.json
@@ -473,6 +473,17 @@
             }
           ]
         },
+        "intWithDefaultValue": {
+          "oneOf": [
+            {
+              "default": 7,
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
         "password": {
           "oneOf": [
             {
@@ -551,6 +562,17 @@
             }
           ]
         },
+        "intWithDefaultValue": {
+          "oneOf": [
+            {
+              "default": 7,
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
         "locationData": {
           "description": "Metadata pertaining to the geographic location of the resource.",
           "oneOf": [