fix-e2e-test-for-codegen (Azure#12)

* fix-e2e-test-for-codegen * fix-location error * fix-sku error * fix-kusto-e2e-codegen-test
changlong-liu · Dec 25, 2020 · 1cdc143 · 1cdc143
1 parent 8203cf0
commit 1cdc143
Show file tree

Hide file tree

Showing 20 changed files with 66 additions and 64 deletions.
diff --git a/specification/datafactory/resource-manager/readme.az.md b/specification/datafactory/resource-manager/readme.az.md
@@ -11,7 +11,6 @@ az:
   disable-checks: true
 az-output-folder:  $(azure-cli-extension-folder)/src/datafactory
 python-sdk-output-folder: "$(az-output-folder)/azext_datafactory/vendored_sdks/datafactory"
-sdk-flatten: true
 
 input-file:
 - Microsoft.DataFactory/stable/2018-06-01/entityTypes/DataFlow.json

diff --git a/...t.Kusto/stable/2020-06-14/examples/KustoAttachedDatabaseConfigurationsCreateOrUpdate.json b/...t.Kusto/stable/2020-06-14/examples/KustoAttachedDatabaseConfigurationsCreateOrUpdate.json
@@ -6,7 +6,7 @@
     "attachedDatabaseConfigurationName": "attachedDatabaseConfigurations1",
     "api-version": "2020-06-14",
     "parameters": {
-      "location": "westus",
+      "location": "southcentralus",
       "properties": {
         "clusterResourceId": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterLeader",
         "databaseName": "kustodatabase",
@@ -20,7 +20,7 @@
         "id": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterRPTest4/attachedDatabaseConfigurations/attachedDatabaseConfigurations1",
         "name": "KustoClusterRPTest4/attachedDatabaseConfigurations1",
         "type": "Microsoft.Kusto/Clusters/AttachedDatabaseConfigurations",
-        "location": "westus",
+        "location": "southcentralus",
         "properties": {
           "clusterResourceId": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterLeader",
           "databaseName": "db1",
@@ -34,7 +34,7 @@
         "id": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterRPTest4/attachedDatabaseConfigurations/attachedDatabaseConfigurations1",
         "name": "KustoClusterRPTest4/attachedDatabaseConfigurations1",
         "type": "Microsoft.Kusto/Clusters/AttachedDatabaseConfigurations",
-        "location": "westus",
+        "location": "southcentralus",
         "properties": {
           "clusterResourceId": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterLeader",
           "databaseName": "db1",
@@ -48,7 +48,7 @@
         "id": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterRPTest4/attachedDatabaseConfigurations/attachedDatabaseConfigurations1",
         "name": "KustoClusterRPTest4/attachedDatabaseConfigurations1",
         "type": "Microsoft.Kusto/Clusters/AttachedDatabaseConfigurations",
-        "location": "westus",
+        "location": "southcentralus",
         "properties": {
           "clusterResourceId": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterLeader",
           "databaseName": "db1",

diff --git a/...er/Microsoft.Kusto/stable/2020-06-14/examples/KustoAttachedDatabaseConfigurationsGet.json b/...er/Microsoft.Kusto/stable/2020-06-14/examples/KustoAttachedDatabaseConfigurationsGet.json
@@ -12,7 +12,7 @@
         "id": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterRPTest4/AttachedDatabaseConfigurations/attachedDatabaseConfigurations1",
         "name": "KustoClusterRPTest4/attachedDatabaseConfigurations1",
         "type": "Microsoft.Kusto/Clusters/AttachedDatabaseConfigurations",
-        "location": "westus",
+        "location": "southcentralus",
         "properties": {
           "clusterResourceId": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterRPTest4",
           "databaseName": "*",

diff --git a/...ft.Kusto/stable/2020-06-14/examples/KustoAttachedDatabaseConfigurationsListByCluster.json b/...ft.Kusto/stable/2020-06-14/examples/KustoAttachedDatabaseConfigurationsListByCluster.json
@@ -13,7 +13,7 @@
             "id": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterRPTest4/AttachedDatabaseConfigurations/KustoDatabase8",
             "name": "KustoClusterRPTest4/KustoDatabase8",
             "type": "Microsoft.Kusto/Clusters/AttachedDatabaseConfigurations",
-            "location": "westus",
+            "location": "southcentralus",
             "properties": {
               "clusterResourceId": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterLeader",
               "databaseName": "db1",
@@ -25,7 +25,7 @@
             "id": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterRPTest4/AttachedDatabaseConfigurations/KustoDatabase9",
             "name": "KustoClusterRPTest4/KustoDatabase9",
             "type": "Microsoft.Kusto/Clusters/AttachedDatabaseConfigurations",
-            "location": "westus",
+            "location": "southcentralus",
             "properties": {
               "clusterResourceId": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterLeader",
               "databaseName": "db1",

diff --git a/...ource-manager/Microsoft.Kusto/stable/2020-06-14/examples/KustoClustersCreateOrUpdate.json b/...ource-manager/Microsoft.Kusto/stable/2020-06-14/examples/KustoClustersCreateOrUpdate.json
@@ -5,9 +5,9 @@
     "clusterName": "kustoclusterrptest4",
     "api-version": "2020-06-14",
     "parameters": {
-      "location": "westus",
+      "location": "southcentralus",
       "sku": {
-        "name": "Standard_L8s",
+        "name": "Standard_D11_v2",
         "capacity": 2,
         "tier": "Standard"
       },
@@ -27,7 +27,7 @@
         "id": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterRPTest4",
         "name": "KustoClusterRPTest4",
         "type": "Microsoft.Kusto/Clusters",
-        "location": "westus",
+        "location": "southcentralus",
         "properties": {
           "provisioningState": "Succeeded",
           "enableStreamingIngest": true,
@@ -40,7 +40,7 @@
           }
         },
         "sku": {
-          "name": "Standard_L8s",
+          "name": "Standard_D11_v2",
           "capacity": 2,
           "tier": "Standard"
         },
@@ -57,7 +57,7 @@
         "id": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterRPTest4",
         "name": "KustoClusterRPTest4",
         "type": "Microsoft.Kusto/Clusters",
-        "location": "westus",
+        "location": "southcentralus",
         "properties": {
           "provisioningState": "Succeeded",
           "enableStreamingIngest": true,
@@ -70,7 +70,7 @@
           }
         },
         "sku": {
-          "name": "Standard_L8s",
+          "name": "Standard_D11_v2",
           "capacity": 2,
           "tier": "Standard"
         },

diff --git a/...n/kusto/resource-manager/Microsoft.Kusto/stable/2020-06-14/examples/KustoClustersGet.json b/...n/kusto/resource-manager/Microsoft.Kusto/stable/2020-06-14/examples/KustoClustersGet.json
@@ -11,7 +11,7 @@
         "id": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterRPTest4",
         "name": "KustoClusterRPTest4",
         "type": "Microsoft.Kusto/Clusters",
-        "location": "westus",
+        "location": "southcentralus",
         "properties": {
           "provisioningState": "Succeeded",
           "enableStreamingIngest": true,
@@ -23,7 +23,7 @@
           }
         },
         "sku": {
-          "name": "Standard_L8s",
+          "name": "Standard_D11_v2",
           "capacity": 2,
           "tier": "Standard"
         },

diff --git a/.../kusto/resource-manager/Microsoft.Kusto/stable/2020-06-14/examples/KustoClustersList.json b/.../kusto/resource-manager/Microsoft.Kusto/stable/2020-06-14/examples/KustoClustersList.json
@@ -11,7 +11,7 @@
             "id": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterRPTest4",
             "name": "KustoClusterRPTest4",
             "type": "Microsoft.Kusto/Clusters",
-            "location": "westus",
+            "location": "southcentralus",
             "properties": {
               "provisioningState": "Succeeded",
               "keyVaultProperties": {
@@ -21,7 +21,7 @@
               }
             },
             "sku": {
-              "name": "Standard_L8s",
+              "name": "Standard_D11_v2",
               "capacity": 2,
               "tier": "Standard"
             }
@@ -30,12 +30,12 @@
             "id": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterRPTest3",
             "name": "KustoClusterRPTest3",
             "type": "Microsoft.Kusto/Clusters",
-            "location": "westus",
+            "location": "southcentralus",
             "properties": {
               "provisioningState": "Succeeded"
             },
             "sku": {
-              "name": "Standard_L8s",
+              "name": "Standard_D11_v2",
               "capacity": 2,
               "tier": "Standard"
             }

diff --git a/...-manager/Microsoft.Kusto/stable/2020-06-14/examples/KustoClustersListByResourceGroup.json b/...-manager/Microsoft.Kusto/stable/2020-06-14/examples/KustoClustersListByResourceGroup.json
@@ -12,7 +12,7 @@
             "id": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterRPTest4",
             "name": "KustoClusterRPTest4",
             "type": "Microsoft.Kusto/Clusters",
-            "location": "westus",
+            "location": "southcentralus",
             "properties": {
               "provisioningState": "Succeeded",
               "keyVaultProperties": {
@@ -22,7 +22,7 @@
               }
             },
             "sku": {
-              "name": "Standard_L8s",
+              "name": "Standard_D11_v2",
               "capacity": 2,
               "tier": "Standard"
             }
@@ -31,12 +31,12 @@
             "id": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterRPTest3",
             "name": "KustoClusterRPTest3",
             "type": "Microsoft.Kusto/Clusters",
-            "location": "westus",
+            "location": "southcentralus",
             "properties": {
               "provisioningState": "Succeeded"
             },
             "sku": {
-              "name": "Standard_L8s",
+              "name": "Standard_D11_v2",
               "capacity": 2,
               "tier": "Standard"
             }

diff --git a/...rce-manager/Microsoft.Kusto/stable/2020-06-14/examples/KustoClustersListResourceSkus.json b/...rce-manager/Microsoft.Kusto/stable/2020-06-14/examples/KustoClustersListResourceSkus.json
@@ -38,7 +38,7 @@
           {
             "resourceType": "clusters",
             "sku": {
-              "name": "Standard_L8s",
+              "name": "Standard_D11_v2",
               "tier": "Standard"
             },
             "capacity": {

diff --git a/...usto/resource-manager/Microsoft.Kusto/stable/2020-06-14/examples/KustoClustersUpdate.json b/...usto/resource-manager/Microsoft.Kusto/stable/2020-06-14/examples/KustoClustersUpdate.json
@@ -5,7 +5,7 @@
     "clusterName": "kustoclusterrptest4",
     "api-version": "2020-06-14",
     "parameters": {
-      "location": "westus"
+      "location": "southcentralus"
     },
     "identity": {
       "type": "SystemAssigned"
@@ -26,7 +26,7 @@
         "id": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterRPTest4",
         "name": "KustoClusterRPTest4",
         "type": "Microsoft.Kusto/Clusters",
-        "location": "westus",
+        "location": "southcentralus",
         "properties": {
           "provisioningState": "Succeeded",
           "enableStreamingIngest": true,
@@ -38,7 +38,7 @@
           }
         },
         "sku": {
-          "name": "Standard_L8s",
+          "name": "Standard_D11_v2",
           "capacity": 2,
           "tier": "Standard"
         },
@@ -55,7 +55,7 @@
         "id": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterRPTest4",
         "name": "KustoClusterRPTest4",
         "type": "Microsoft.Kusto/Clusters",
-        "location": "westus",
+        "location": "southcentralus",
         "properties": {
           "provisioningState": "Succeeded",
           "enableStreamingIngest": true,
@@ -67,7 +67,7 @@
           }
         },
         "sku": {
-          "name": "Standard_L8s",
+          "name": "Standard_D11_v2",
           "capacity": 2,
           "tier": "Standard"
         },
@@ -84,14 +84,14 @@
         "id": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterRPTest4",
         "name": "KustoClusterRPTest4",
         "type": "Microsoft.Kusto/Clusters",
-        "location": "westus",
+        "location": "southcentralus",
         "properties": {
           "provisioningState": "Succeeded",
           "enableStreamingIngest": true,
           "enablePurge": true
         },
         "sku": {
-          "name": "Standard_L8s",
+          "name": "Standard_D11_v2",
           "capacity": 2,
           "tier": "Standard"
         },

diff --git a/...anager/Microsoft.Kusto/stable/2020-06-14/examples/KustoDataConnectionsCreateOrUpdate.json b/...anager/Microsoft.Kusto/stable/2020-06-14/examples/KustoDataConnectionsCreateOrUpdate.json
@@ -7,7 +7,7 @@
     "api-version": "2020-06-14",
     "dataConnectionName": "DataConnections8",
     "parameters": {
-      "location": "westus",
+      "location": "southcentralus",
       "kind": "EventHub",
       "properties": {
         "eventHubResourceId": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.EventHub/namespaces/eventhubTestns1/eventhubs/eventhubTest1",
@@ -21,7 +21,7 @@
         "id": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterRPTest4/Databases/KustoDatabase8/DataConnections/DataConnections8",
         "name": "KustoClusterRPTest4/KustoDatabase8/DataConnections8",
         "type": "Microsoft.Kusto/Clusters/Databases/DataConnections",
-        "location": "westus",
+        "location": "southcentralus",
         "kind": "EventHub",
         "properties": {
           "eventHubResourceId": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.EventHub/namespaces/eventhubTestns1/eventhubs/eventhubTest1",
@@ -34,7 +34,7 @@
         "id": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterRPTest4/Databases/KustoDatabase8/DataConnections/DataConnections8",
         "name": "KustoClusterRPTest4/KustoDatabase8/DataConnections8",
         "type": "Microsoft.Kusto/Clusters/Databases/DataConnections",
-        "location": "westus",
+        "location": "southcentralus",
         "kind": "EventHub",
         "properties": {
           "eventHubResourceId": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.EventHub/namespaces/eventhubTestns1/eventhubs/eventhubTest1",
@@ -47,7 +47,7 @@
         "id": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterRPTest4/Databases/KustoDatabase8/DataConnections/DataConnections8",
         "name": "KustoClusterRPTest4/KustoDatabase8/DataConnections8",
         "type": "Microsoft.Kusto/Clusters/Databases/DataConnections",
-        "location": "westus",
+        "location": "southcentralus",
         "kind": "EventHub",
         "properties": {
           "eventHubResourceId": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.EventHub/namespaces/eventhubTestns1/eventhubs/eventhubTest1",

diff --git a/.../resource-manager/Microsoft.Kusto/stable/2020-06-14/examples/KustoDataConnectionsGet.json b/.../resource-manager/Microsoft.Kusto/stable/2020-06-14/examples/KustoDataConnectionsGet.json
@@ -13,7 +13,7 @@
         "id": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterRPTest4/Databases/KustoDatabase8/DataConnections/DataConnections8",
         "name": "KustoClusterRPTest4/KustoDatabase8/DataConnections8",
         "type": "Microsoft.Kusto/Clusters/Databases/DataConnections",
-        "location": "westus",
+        "location": "southcentralus",
         "kind": "EventHub",
         "properties": {
           "eventHubResourceId": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.EventHub/namespaces/eventhubTestns1/eventhubs/eventhubTest1",

diff --git a/...anager/Microsoft.Kusto/stable/2020-06-14/examples/KustoDataConnectionsListByDatabase.json b/...anager/Microsoft.Kusto/stable/2020-06-14/examples/KustoDataConnectionsListByDatabase.json
@@ -14,7 +14,7 @@
             "id": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterRPTest4/Databases/KustoDatabase8/DataConnections/KustoDataConnection8",
             "name": "KustoClusterRPTest4/KustoDatabase8/KustoDataConnection8",
             "type": "Microsoft.Kusto/Clusters/Databases/DataConnections",
-            "location": "westus",
+            "location": "southcentralus",
             "kind": "EventHub",
             "properties": {
               "eventHubResourceId": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.EventHub/namespaces/eventhubTestns1/eventhubs/eventhubTest1",
@@ -25,7 +25,7 @@
             "id": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterRPTest4/Databases/KustoDatabase9/DataConnections/KustoDataConnection9",
             "name": "KustoClusterRPTest4/KustoDatabase9/KustoDataConnection9",
             "type": "Microsoft.Kusto/Clusters/Databases/DataConnections",
-            "location": "westus",
+            "location": "southcentralus",
             "kind": "EventHub",
             "properties": {
               "eventHubResourceId": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.EventHub/namespaces/eventhubTestns2/eventhubs/eventhubTest2",

diff --git a/...source-manager/Microsoft.Kusto/stable/2020-06-14/examples/KustoDataConnectionsUpdate.json b/...source-manager/Microsoft.Kusto/stable/2020-06-14/examples/KustoDataConnectionsUpdate.json
@@ -7,7 +7,7 @@
     "api-version": "2020-06-14",
     "dataConnectionName": "DataConnections8",
     "parameters": {
-      "location": "westus",
+      "location": "southcentralus",
       "kind": "EventHub",
       "properties": {
         "eventHubResourceId": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.EventHub/namespaces/eventhubTestns1/eventhubs/eventhubTest1",
@@ -21,7 +21,7 @@
         "id": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterRPTest4/Databases/KustoDatabase8/DataConnections/DataConnections8",
         "name": "KustoClusterRPTest4/KustoDatabase8/DataConnections8",
         "type": "Microsoft.Kusto/Clusters/Databases/DataConnections",
-        "location": "westus",
+        "location": "southcentralus",
         "kind": "EventHub",
         "properties": {
           "eventHubResourceId": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.EventHub/namespaces/eventhubTestns1/eventhubs/eventhubTest1",
@@ -34,7 +34,7 @@
         "id": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterRPTest4/Databases/KustoDatabase8/DataConnections/DataConnections8",
         "name": "KustoClusterRPTest4/KustoDatabase8/DataConnections8",
         "type": "Microsoft.Kusto/Clusters/Databases/DataConnections",
-        "location": "westus",
+        "location": "southcentralus",
         "kind": "EventHub",
         "properties": {
           "eventHubResourceId": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.EventHub/namespaces/eventhubTestns1/eventhubs/eventhubTest1",
@@ -47,7 +47,7 @@
         "id": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.Kusto/Clusters/KustoClusterRPTest4/Databases/KustoDatabase8/DataConnections/DataConnections8",
         "name": "KustoClusterRPTest4/KustoDatabase8/DataConnections8",
         "type": "Microsoft.Kusto/Clusters/Databases/DataConnections",
-        "location": "westus",
+        "location": "southcentralus",
         "kind": "EventHub",
         "properties": {
           "eventHubResourceId": "/subscriptions/12345678-1234-1234-1234-123456789098/resourceGroups/kustorptest/providers/Microsoft.EventHub/namespaces/eventhubTestns1/eventhubs/eventhubTest1",