Fix the issue of new resource

Author: wyunchi-ms

src/CostManagement/readme.md

@@ -48,8 +48,8 @@ In this directory, run AutoRest:
 require:
   - $(this-folder)/../readme.azure.noprofile.md
 input-file:
-  # - $(repo)/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json
-  - $(this-folder)/resources/costmanagement.json
+  - $(repo)/specification/cost-management/resource-manager/Microsoft.CostManagement/stable/2019-11-01/costmanagement.json
+  # - $(this-folder)/resources/costmanagement.json
 title: CostManagement
 module-version: 0.1.0
 
@@ -80,7 +80,7 @@ directive:
       verb: invoke
     remove: true
   - where:
-      subject: Alert|AlertExternal|Dimension|ExportExecutionHistory|View
+      subject: Alert|AlertExternal|Dimension|View
     remove: true
   - from: source-file-csharp
     where: $
@@ -93,30 +93,30 @@ directive:
           - NextLink
           - Column
           - Row
-  # - from: swagger-document
-  #   where: $.definitions.AlertProperties.properties.details.properties.resourceGroupFilter.items
-  #   transform: >-
-  #       return {
-  #         "type": "string"
-  #       }
-  # - from: swagger-document
-  #   where: $.definitions.AlertProperties.properties.details.properties.resourceFilter.items
-  #   transform: >-
-  #       return {
-  #         "type": "string"
-  #       }
-  # - from: swagger-document
-  #   where: $.definitions.AlertProperties.properties.details.properties.meterFilter.items
-  #   transform: >-
-  #       return {
-  #         "type": "string"
-  #       }
-  # - from: swagger-document
-  #   where: $.definitions.QueryProperties.rows.items.items
-  #   transform: >-
-  #       return {
-  #         "type": "string"
-  #       }
+  - from: swagger-document
+    where: $.definitions.AlertProperties.properties.details.properties.resourceGroupFilter.items
+    transform: >-
+        return {
+          "type": "string"
+        }
+  - from: swagger-document
+    where: $.definitions.AlertProperties.properties.details.properties.resourceFilter.items
+    transform: >-
+        return {
+          "type": "string"
+        }
+  - from: swagger-document
+    where: $.definitions.AlertProperties.properties.details.properties.meterFilter.items
+    transform: >-
+        return {
+          "type": "string"
+        }
+  - from: swagger-document
+    where: $.definitions.QueryProperties.properties.rows.items.items
+    transform: >-
+        return {
+          "type": "string"
+        }
 
   - no-inline:
     - QueryFilter

src/CostManagement/resources/Create.ps1

@@ -3,17 +3,18 @@ $QueryOrTag = New-AzCostManagementQueryComparisonExpressionObject -Name 'Environ
 $QueryFilterOr = New-AzCostManagementQueryFilterObject -or @((New-AzCostManagementQueryFilterObject -Dimension $QueryOrDimension), (New-AzCostManagementQueryFilterObject -Tag $QueryOrTag))
 $QueryAndDimension = New-AzCostManagementQueryComparisonExpressionObject -Name 'ResourceGroup' -Operator In -Value 'API'
 $a = New-AzCostManagementQueryFilterObject -Dimension $QueryAndDimension
+$tag = New-AzCostManagementQueryFilterObject -Tag $QueryAndDimension
 $QueryFileterAnd = New-AzCostManagementQueryFilterObject -And @($QueryFilterOr, $a) 
 
 $Aggregation1 = @{ name = 'PreTaxCost'; function='sum'}
 $Aggregation2 = @{ name = 'Cost'; function='sum'}
 $AggregationDict = @{costsum=$aggregation1; cost=$aggregation2}
 
-New-AzCostManagementExport -Debug -Scope "subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/lucas-manual-test" -Name "TestExport9" `
-    -ScheduleStatus "Active" -ScheduleRecurrence "Daily" -RecurrencePeriodFrom "2020-06-29T20:00:00Z" `
-    -RecurrencePeriodTo "2020-07-01T00:00:00Z" -Format "Csv" `
+New-AzCostManagementExport -Debug -Scope "subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f" -Name "TestExportDatasetAggregation" `
+    -ScheduleStatus "Active" -ScheduleRecurrence "Daily" -RecurrencePeriodFrom "2020-07-03T20:00:00Z" `
+    -RecurrencePeriodTo "2020-07-10T00:00:00Z" -Format "Csv" `
     -DestinationResourceId "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/resourceGroups/wyunchi-costmanagement/providers/Microsoft.Storage/storageAccounts/wyunchistorageaccount" `
     -DestinationContainer "exports" -DestinationRootFolderPath "ad-hoc" -DefinitionType "Usage" -DefinitionTimeframe "MonthToDate" `
-    -DatasetGranularity "Daily"
+    -DatasetGranularity "Daily" -DatasetAggregation $AggregationDict
 # Invoke-AzCostManagementUsageQuery -Type AmortizedCost -Scope "subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f" -Timeframe 'MonthToDate' -DatasetGranularity 'Daily'
     # -DatasetFilter $QueryFilterOr -DatasetGranularity 'Daily'