Added back billing periods and merging from master

* Remove TrackedResource from Swagger spec "$ref": "../../common/v1/definitions.json#/definitions/TrackedResource" * More updates on referring common types More updates on referring common types * Add UpdateParameters and Updateproperties * Update example * updated example * update examples Introducing new API for Azure Security Center Settings (Azure#3511) * Add new API for Azure Security Center Settings * Changed SettingsPUT API to receive parameter and not definition. * - changed settings parameter name in example and in security parameter definition - changes typo comment on settings get all example reference * changes settings to setting in Settings API * settings kind to setting kind in settings CSM API Update batch resource-manager Node.js package version to 3.1.2 (Azure#3732) IoTHub conf py (Azure#3733) Reports API moved from stable to preview version with addition of documentation of a couple of new APIs (Azure#3640) * Consumption specifications for cost insights and reporting operations * Fixed $ref for ReportConfigDelete * Silly me!! Fixed bad reference again * Fixed schema validation issues * Fixing validation errors around datetime and dynamic respones * Fixed parameters in examples * Fixed parameter name in example * Removed x-ms-odata method for POST op * Fixed ARM review comments * Moved reports and usage analysis from microsoft.consumption to microsoft.costmanagament * Merged with master again * Updated reports api documentation * Undo remove of API from stable version providing description for new introduced property isRecurringCharge fix example issues Microsoft.ResourceGraph public preview spec (Azure#3716) Add new microsoft.logic version (Azure#3683) * Copy of the source version (2016-06-01) to seed the new version (2018-07-01-preview) * Update Microsoft.Logic from 2016-06-01 to 2018-07-01-preview * Remove extra prep files, update the readme Fix Go SDK codegen for containerinstance (Azure#3735) The package-2018-06 tag was incorrecly using the 2018-04 tag. Moved Go SDK config section to its own config file. Microsoft.NetApp first version (Azure#3639) * Microsoft.NetApp first version * Addressing pullrequest comments added back billingperiod
ncalagar · Aug 27, 2018 · 94fa245 · 94fa245
1 parent be4ee83
commit 94fa245
Show file tree

Hide file tree

Showing 169 changed files with 20,770 additions and 449 deletions.
diff --git a/specification/batch/resource-manager/readme.nodejs.md b/specification/batch/resource-manager/readme.nodejs.md
@@ -7,7 +7,7 @@ Please also specify `--node-sdks-folder=<path to root folder of your azure-sdk-f
 nodejs:
   azure-arm: true
   package-name: azure-arm-batch
-  package-version: 3.0.0
+  package-version: 3.1.2
   output-folder: $(node-sdks-folder)/lib/services/batchManagement
   payload-flattening-threshold: 1
   generate-license-txt: true

diff --git a/...ion/consumption/resource-manager/Microsoft.Consumption/stable/2018-08-31/consumption.json b/...ion/consumption/resource-manager/Microsoft.Consumption/stable/2018-08-31/consumption.json
@@ -3103,13 +3103,8 @@
           "type": "string",
           "readOnly": true
         },
-        "additionalInfo": {
-          "description": "Additional info of this usage item.",
-          "type": "string",
-          "readOnly": true
-        },
         "isRecurringCharge": {
-          "description": "",
+          "description": "Flag indicating whether this is a recurring charge or not.",
           "type": "boolean",
           "readOnly": true
         }
@@ -4018,6 +4013,11 @@
       "description": "The properties of the Management Group Aggregated Cost.",
       "type": "object",
       "properties": {
+        "billingPeriodId": {
+          "description": "The id of the billing period resource that the aggregated cost belongs to.",
+          "type": "string",
+          "readOnly": true
+        },
         "usageStart": {
           "description": "The start of the date time range covered by aggregated cost.",
           "type": "string",

diff --git a/...er/Microsoft.Consumption/stable/2018-08-31/examples/MarketplacesByBillingAccountList.json b/...er/Microsoft.Consumption/stable/2018-08-31/examples/MarketplacesByBillingAccountList.json
@@ -17,7 +17,7 @@
             },
             "properties": {
               "accountName": "Account1",
-              "additionalInfo": "additionalInfo",
+              "additionalProperties": "additionalProperties",
               "costCenter": "Center1",
               "departmentName": "Department1",
               "billingPeriodId": "/providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702",

diff --git a/...sumption/stable/2018-08-31/examples/MarketplacesByBillingAccountListForBillingPeriod.json b/...sumption/stable/2018-08-31/examples/MarketplacesByBillingAccountListForBillingPeriod.json
@@ -18,7 +18,7 @@
             },
             "properties": {
               "accountName": "Account1",
-              "additionalInfo": "additionalInfo",
+              "additionalProperties": "additionalProperties",
               "costCenter": "Center1",
               "departmentName": "Department1",
               "billingPeriodId": "/providers/Microsoft.Billing/billingAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702",

diff --git a/...anager/Microsoft.Consumption/stable/2018-08-31/examples/MarketplacesByDepartmentList.json b/...anager/Microsoft.Consumption/stable/2018-08-31/examples/MarketplacesByDepartmentList.json
@@ -18,7 +18,7 @@
             },
             "properties": {
               "accountName": "Account1",
-              "additionalInfo": "additionalInfo",
+              "additionalProperties": "additionalProperties",
               "costCenter": "Center1",
               "departmentName": "Department1",
               "billingPeriodId": "/providers/Microsoft.Billing/departments/123456/providers/Microsoft.Billing/billingPeriods/201702",

diff --git a/....Consumption/stable/2018-08-31/examples/MarketplacesByDepartment_ListByBillingPeriod.json b/....Consumption/stable/2018-08-31/examples/MarketplacesByDepartment_ListByBillingPeriod.json
@@ -18,7 +18,7 @@
             },
             "properties": {
               "accountName": "Account1",
-              "additionalInfo": "additionalInfo",
+              "additionalProperties": "additionalProperties",
               "costCenter": "Center1",
               "departmentName": "Department1",
               "billingPeriodId": "/providers/Microsoft.Billing/departments/123456/providers/Microsoft.Billing/billingPeriods/201702",

diff --git a/...Microsoft.Consumption/stable/2018-08-31/examples/MarketplacesByEnrollmentAccountList.json b/...Microsoft.Consumption/stable/2018-08-31/examples/MarketplacesByEnrollmentAccountList.json
@@ -18,7 +18,7 @@
             },
             "properties": {
               "accountName": "Account1",
-              "additionalInfo": "additionalInfo",
+              "additionalProperties": "additionalProperties",
               "costCenter": "Center1",
               "departmentName": "Department1",
               "billingPeriodId": "/providers/Microsoft.Billing/enrollmentAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702",

diff --git a/...tion/stable/2018-08-31/examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json b/...tion/stable/2018-08-31/examples/MarketplacesByEnrollmentAccounts_ListByBillingPeriod.json
@@ -18,7 +18,7 @@
             },
             "properties": {
               "accountName": "Account1",
-              "additionalInfo": "additionalInfo",
+              "additionalProperties": "additionalProperties",
               "costCenter": "Center1",
               "departmentName": "Department1",
               "billingPeriodId": "/providers/Microsoft.Billing/enrollmentAccounts/123456/providers/Microsoft.Billing/billingPeriods/201702",

diff --git a/...n/resource-manager/Microsoft.Consumption/stable/2018-08-31/examples/MarketplacesList.json b/...n/resource-manager/Microsoft.Consumption/stable/2018-08-31/examples/MarketplacesList.json
@@ -17,7 +17,7 @@
             },
             "properties": {
               "accountName": "Account1",
-              "additionalInfo": "additionalInfo",
+              "additionalProperties": "additionalProperties",
               "costCenter": "Center1",
               "departmentName": "Department1",
               "billingPeriodId": "/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201702",

diff --git a/...er/Microsoft.Consumption/stable/2018-08-31/examples/MarketplacesListForBillingPeriod.json b/...er/Microsoft.Consumption/stable/2018-08-31/examples/MarketplacesListForBillingPeriod.json
@@ -18,7 +18,7 @@
             },
             "properties": {
 			        "accountName": "Account1",
-			        "additionalInfo": "additionalInfo",
+			        "additionalProperties": "additionalProperties",
 			        "costCenter": "Center1",
 			        "departmentName": "Department1",
               "billingPeriodId": "/subscriptions/subid/providers/Microsoft.Billing/billingPeriods/201702",
@@ -39,8 +39,8 @@
               "resourceRate": 0.24,
               "subscriptionGuid": "00000000-0000-0000-0000-000000000000",
               "subscriptionName": "azure subscription",
-			  "unitOfMeasure": "10 Hours",
-			  "isRecurringCharge": false
+			        "unitOfMeasure": "10 Hours",
+			        "isRecurringCharge": false
             }
           }
         ]

diff --git a/specification/containerinstance/resource-manager/readme.go.md b/specification/containerinstance/resource-manager/readme.go.md
@@ -0,0 +1,76 @@
+## Go
+
+These settings apply only when `--go` is specified on the command line.
+
+``` yaml $(go)
+go:
+  license-header: MICROSOFT_APACHE_NO_VERSION
+  namespace: containerinstance
+  clear-output-folder: true
+```
+
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2018-06
+  - tag: package-2018-04
+  - tag: package-2018-02-preview
+  - tag: package-2017-12-preview
+  - tag: package-2017-10-preview
+  - tag: package-2017-08-preview
+```
+
+### Tag: package-2018-06 and go
+
+These settings apply only when `--tag=package-2018-06 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-06' && $(go)
+output-folder: $(go-sdk-folder)/services/containerinstance/mgmt/2018-06-01/containerinstance
+```
+
+### Tag: package-2018-04 and go
+
+These settings apply only when `--tag=package-2018-04 --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-04' && $(go)
+output-folder: $(go-sdk-folder)/services/containerinstance/mgmt/2018-04-01/containerinstance
+```
+
+### Tag: package-2018-02-preview and go
+
+These settings apply only when `--tag=package-2018-02-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-02-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance
+```
+
+### Tag: package-2017-12-preview and go
+
+These settings apply only when `--tag=package-2017-12-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-12-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/containerinstance/mgmt/2017-12-01-preview/containerinstance
+```
+
+### Tag: package-2017-10-preview and go
+
+These settings apply only when `--tag=package-2017-10-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-10-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/containerinstance/mgmt/2017-10-01-preview/containerinstance
+```
+
+### Tag: package-2017-08-preview and go
+
+These settings apply only when `--tag=package-2017-08-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2017-08-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/containerinstance/mgmt/2017-08-01-preview/containerinstance
+```
diff --git a/specification/containerinstance/resource-manager/readme.md b/specification/containerinstance/resource-manager/readme.md
@@ -151,85 +151,6 @@ python:
   output-folder: $(python-sdks-folder)/azure-mgmt-containerinstance
 ```
 
-
-## Go
-
-These settings apply only when `--go` is specified on the command line.
-
-``` yaml $(go)
-go:
-  license-header: MICROSOFT_APACHE_NO_VERSION
-  namespace: containerinstance
-  clear-output-folder: true
-```
-
-### Go multi-api
-
-``` yaml $(go) && $(multiapi)
-batch:
-  - tag: package-2018-06
-  - tag: package-2018-04
-  - tag: package-2018-02-preview
-  - tag: package-2017-12-preview
-  - tag: package-2017-10-preview
-  - tag: package-2017-08-preview
-```
-
-### Tag: package-2018-06 and go
-
-These settings apply only when `--tag=package-2018-06 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-04' && $(go)
-output-folder: $(go-sdk-folder)/services/containerinstance/mgmt/2018-06-01/containerinstance
-```
-
-### Tag: package-2018-04 and go
-
-These settings apply only when `--tag=package-2018-04 --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-04' && $(go)
-output-folder: $(go-sdk-folder)/services/containerinstance/mgmt/2018-04-01/containerinstance
-```
-
-### Tag: package-2018-02-preview and go
-
-These settings apply only when `--tag=package-2018-02-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2018-02-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/containerinstance/mgmt/2018-02-01-preview/containerinstance
-```
-
-### Tag: package-2017-12-preview and go
-
-These settings apply only when `--tag=package-2017-12-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-12-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/containerinstance/mgmt/2017-12-01-preview/containerinstance
-```
-
-### Tag: package-2017-10-preview and go
-
-These settings apply only when `--tag=package-2017-10-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-10-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/containerinstance/mgmt/2017-10-01-preview/containerinstance
-```
-
-### Tag: package-2017-08-preview and go
-
-These settings apply only when `--tag=package-2017-08-preview --go` is specified on the command line.
-Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
-
-``` yaml $(tag) == 'package-2017-08-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/containerinstance/mgmt/2017-08-01-preview/containerinstance
-```
-
-
 ## Java
 
 These settings apply only when `--java` is specified on the command line.