Skip to content

Commit fa992ed

Browse files
magodogerrytan
authored andcommitted
exportTerraform: Change resourceId -> resourceIds; Add maskSensitive; Change fullConfig defaults (Azure#19178)
* exportTerraform: Change resourceId -> resourceIds; Add `maskSensitive`; Change `fullConfig` defaults * rename * rename * rename
1 parent 782510d commit fa992ed

File tree

2 files changed

+37
-20
lines changed

2 files changed

+37
-20
lines changed

specification/terraform/resource-manager/Microsoft.AzureTerraform/preview/2023-07-01-preview/examples/ExportTerraform.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"api-version": "2023-07-01-preview",
66
"subscriptionId": "00000000-0000-0000-0000-000000000000",
77
"exportParameter": {
8-
"type": "ExportResourceGroupParameter",
8+
"type": "ExportResourceGroup",
99
"resourceGroupName": "rg1"
1010
}
1111
},

specification/terraform/resource-manager/Microsoft.AzureTerraform/preview/2023-07-01-preview/export.json

Lines changed: 36 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -187,33 +187,45 @@
187187
}
188188
},
189189
"definitions": {
190-
"ExportResourceParameter": {
190+
"ExportResource": {
191191
"allOf": [
192192
{
193-
"$ref": "#/definitions/BaseExportParameter"
193+
"$ref": "#/definitions/BaseExportModel"
194194
}
195195
],
196196
"description": "Export parameter for a single resource",
197197
"required": [
198-
"resourceId"
198+
"resourceIds"
199199
],
200200
"properties": {
201-
"resourceId": {
201+
"resourceIds": {
202202
"description": "The id of the resource to be exported",
203-
"type": "string"
203+
"type": "array",
204+
"items": {
205+
"type": "string"
206+
}
204207
},
205-
"name": {
206-
"description": "The Terraform resource name",
208+
"resourceName": {
209+
"description": "The Terraform resource name. Only works when `resourceIds` contains only one item.",
207210
"type": "string",
208211
"default": "res-0"
212+
},
213+
"resourceType": {
214+
"description": "The Terraform resource type. Only works when `resourceIds` contains only one item.",
215+
"type": "string"
216+
},
217+
"namePattern": {
218+
"description": "The name pattern of the Terraform resources",
219+
"type": "string",
220+
"default": "res-"
209221
}
210222
},
211223
"type": "object"
212224
},
213-
"ExportResourceGroupParameter": {
225+
"ExportResourceGroup": {
214226
"allOf": [
215227
{
216-
"$ref": "#/definitions/BaseExportParameter"
228+
"$ref": "#/definitions/BaseExportModel"
217229
}
218230
],
219231
"description": "Export parameter for a resource group",
@@ -226,17 +238,17 @@
226238
"type": "string"
227239
},
228240
"namePattern": {
229-
"description": "The pattern of the Terraform resources",
241+
"description": "The name pattern of the Terraform resources",
230242
"type": "string",
231243
"default": "res-"
232244
}
233245
},
234246
"type": "object"
235247
},
236-
"ExportQueryParameter": {
248+
"ExportQuery": {
237249
"allOf": [
238250
{
239-
"$ref": "#/definitions/BaseExportParameter"
251+
"$ref": "#/definitions/BaseExportModel"
240252
}
241253
],
242254
"description": "Export parameter for resources queried by ARG (Azure Resource Graph)",
@@ -249,7 +261,7 @@
249261
"type": "string"
250262
},
251263
"namePattern": {
252-
"description": "The pattern of the Terraform resources",
264+
"description": "The name pattern of the Terraform resources",
253265
"type": "string",
254266
"default": "res-"
255267
},
@@ -261,7 +273,7 @@
261273
},
262274
"type": "object"
263275
},
264-
"BaseExportParameter": {
276+
"BaseExportModel": {
265277
"description": "The base export parameter",
266278
"discriminator": "type",
267279
"required": [
@@ -288,7 +300,12 @@
288300
"fullProperties": {
289301
"description": "Whether to output all non-computed properties in the generated Terraform configuration? This probably needs manual modifications to make it valid",
290302
"type": "boolean",
291-
"default": false
303+
"default": true
304+
},
305+
"maskSensitive": {
306+
"description": "Mask sensitive attributes in the Terraform configuration",
307+
"type": "boolean",
308+
"default": true
292309
}
293310
},
294311
"type": "object"
@@ -297,9 +314,9 @@
297314
"description": "The parameter type",
298315
"type": "string",
299316
"enum": [
300-
"ExportResourceParameter",
301-
"ExportResourceGroupParameter",
302-
"ExportQueryParameter"
317+
"ExportResource",
318+
"ExportResourceGroup",
319+
"ExportQuery"
303320
],
304321
"x-ms-enum": {
305322
"name": "parameterType",
@@ -383,7 +400,7 @@
383400
"name": "exportParameter",
384401
"required": true,
385402
"schema": {
386-
"$ref": "#/definitions/BaseExportParameter"
403+
"$ref": "#/definitions/BaseExportModel"
387404
},
388405
"x-ms-parameter-location": "method"
389406
}

0 commit comments

Comments
 (0)