Merge pull request #1144 from yoavrubin/dev

ogail · ogail · commit 8d0528c9f16a · 2015-10-21T14:57:42.000-07:00
SQL Audit cmdlets to use table storage endpoints from the environment
diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/AuditingTests.cs b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/AuditingTests.cs
@@ -49,14 +49,15 @@ public void TestAuditingDatabaseUpdatePolicyWithStorage()
             RunPowerShellTest("Test-AuditingDatabaseUpdatePolicyWithStorage");
         }
 
-        [Fact(Skip = "PSGet: TODO fix by moving SM specific logic to test setup")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.Sql)]
         public void TestAuditingDatabaseUpdatePolicyWithStorageV2()
         {
             RunPowerShellTest("Test-AuditingDatabaseUpdatePolicyWithStorageV2");
         }
 
-        [Fact(Skip = "PSGet: TODO fix by moving SM specific logic to test setup")]        [Trait(Category.AcceptanceType, Category.Sql)]
+        [Fact(Skip = "PSGet: TODO fix by moving SM specific logic to test setup")]        
+        [Trait(Category.AcceptanceType, Category.Sql)]
         public void TestAuditingServerUpdatePolicyWithStorage()
         {
             RunPowerShellTest("Test-AuditingServerUpdatePolicyWithStorage");
diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/AuditingTests.ps1 b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/AuditingTests.ps1
@@ -20,7 +20,7 @@ Tests that when setting the storage account property's value in a database's aud
 function Test-AuditingDatabaseUpdatePolicyWithStorageV2
 {
 	# Setup
-	$testSuffix = 102
+	$testSuffix = 1029
 	Create-TestEnvironmentWithStorageV2 $testSuffix
 	$params = Get-SqlAuditingTestEnvironmentParameters $testSuffix
 
@@ -215,7 +215,7 @@ Tests that when modifying the eventType property of a databases's auditing polic
 function Test-AuditingDatabaseUpdatePolicyWithEventTypes
 {
 	# Setup
-	$testSuffix = 501
+	$testSuffix = 5011
 	Create-TestEnvironment $testSuffix
 	$params = Get-SqlAuditingTestEnvironmentParameters $testSuffix
 
diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SqlEvnSetupHelper.cs b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SqlEvnSetupHelper.cs
@@ -92,7 +92,7 @@ public void SetupEnvironment()
 
                     var environment = AzureRmProfileProvider.Instance.Profile.Environments[AzureRmProfileProvider.Instance.Profile.Context.Subscription.Environment];
                     environment.Endpoints[AzureEnvironment.Endpoint.Graph] = csmEnvironment.Endpoints.GraphUri.AbsoluteUri;
-
+                    environment.Endpoints[AzureEnvironment.Endpoint.StorageEndpointSuffix] = "core.windows.net"; 
                     AzureRmProfileProvider.Instance.Profile.Save();
                 }
             }
diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SqlTestsBase.cs b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SqlTestsBase.cs
@@ -79,7 +79,6 @@ protected void RunPowerShellTest(params string[] scripts)
                     helper.RMStorageModule, 
                     helper.GetRMModulePath(@"AzureRM.Insights.psd1"), 
                     helper.GetRMModulePath(@"AzureRM.Sql.psd1"));
-
                 helper.RunPowerShellTest(scripts);
             }
         }
diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests/TestAuditingDatabaseUpdatePolicyWithStorageV2.json b/src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests/TestAuditingDatabaseUpdatePolicyWithStorageV2.json
diff --git a/src/ResourceManager/Sql/Commands.Sql/Auditing/Cmdlet/SqlDatabaseAuditingCmdletBase.cs b/src/ResourceManager/Sql/Commands.Sql/Auditing/Cmdlet/SqlDatabaseAuditingCmdletBase.cs
@@ -50,7 +50,7 @@ protected override SqlAuditAdapter InitModelAdapter(AzureSubscription subscripti
         /// <param name="model">The model object with the data to be sent to the REST endpoints</param>
         protected override DatabaseAuditingPolicyModel PersistChanges(DatabaseAuditingPolicyModel model)
         {
-            ModelAdapter.SetDatabaseAuditingPolicy(model, clientRequestId);
+            ModelAdapter.SetDatabaseAuditingPolicy(model, clientRequestId, DefaultContext.Environment.Endpoints[AzureEnvironment.Endpoint.StorageEndpointSuffix]);
             return null;
         }
     }
diff --git a/src/ResourceManager/Sql/Commands.Sql/Auditing/Cmdlet/SqlDatabaseServerAuditingCmdletBase.cs b/src/ResourceManager/Sql/Commands.Sql/Auditing/Cmdlet/SqlDatabaseServerAuditingCmdletBase.cs
@@ -58,7 +58,7 @@ protected override SqlAuditAdapter InitModelAdapter(AzureSubscription subscripti
         /// <param name="model">The model object with the data to be sent to the REST endpoints</param>
         protected override ServerAuditingPolicyModel PersistChanges(ServerAuditingPolicyModel model)
         {
-            ModelAdapter.SetServerAuditingPolicy(model, clientRequestId);
+            ModelAdapter.SetServerAuditingPolicy(model, clientRequestId, DefaultContext.Environment.Endpoints[AzureEnvironment.Endpoint.StorageEndpointSuffix]);
             return null;
         }
     }
diff --git a/src/ResourceManager/Sql/Commands.Sql/Auditing/Services/SqlAuditAdapter.cs b/src/ResourceManager/Sql/Commands.Sql/Auditing/Services/SqlAuditAdapter.cs
@@ -243,22 +243,22 @@ private void ModelizeRetentionInfo(BaseAuditingPolicyModel model, string retenti
         /// <summary>
         /// Transforms the given model to its endpoints acceptable structure and sends it to the endpoint
         /// </summary>
-        public void SetServerAuditingPolicy(ServerAuditingPolicyModel model, String clientId)
+        public void SetServerAuditingPolicy(ServerAuditingPolicyModel model, String clientId, string storageEndpointSuffix)
         {
-            ServerAuditingPolicyCreateOrUpdateParameters parameters = PolicizeServerAuditingModel(model);
+            ServerAuditingPolicyCreateOrUpdateParameters parameters = PolicizeServerAuditingModel(model, storageEndpointSuffix);
             Communicator.SetServerAuditingPolicy(model.ResourceGroupName, model.ServerName, clientId, parameters);
         }
 
         /// <summary>
         /// Transforms the given model to its endpoints acceptable structure and sends it to the endpoint
         /// </summary>
-        public void SetDatabaseAuditingPolicy(DatabaseAuditingPolicyModel model, String clientId)
+        public void SetDatabaseAuditingPolicy(DatabaseAuditingPolicyModel model, String clientId, string storageEndpointSuffix)
         {
             if (!IsDatabaseInServiceTierForPolicy(model, clientId))
             {
                 throw new Exception(Microsoft.Azure.Commands.Sql.Properties.Resources.DatabaseNotInServiceTierForAuditingPolicy);
             }
-            DatabaseAuditingPolicyCreateOrUpdateParameters parameters = PolicizeDatabaseAuditingModel(model);
+            DatabaseAuditingPolicyCreateOrUpdateParameters parameters = PolicizeDatabaseAuditingModel(model, storageEndpointSuffix);
             Communicator.SetDatabaseAuditingPolicy(model.ResourceGroupName, model.ServerName, model.DatabaseName, clientId, parameters);
         }
 
@@ -280,7 +280,7 @@ private bool IsDatabaseInServiceTierForPolicy(DatabaseAuditingPolicyModel model,
         /// </summary>
         /// <param name="model">The AuditingPolicy model object</param>
         /// <returns>The communication model object</returns>
-        private DatabaseAuditingPolicyCreateOrUpdateParameters PolicizeDatabaseAuditingModel(DatabaseAuditingPolicyModel model)
+        private DatabaseAuditingPolicyCreateOrUpdateParameters PolicizeDatabaseAuditingModel(DatabaseAuditingPolicyModel model, string storageEndpointSuffix)
         {
             DatabaseAuditingPolicyCreateOrUpdateParameters updateParameters = new DatabaseAuditingPolicyCreateOrUpdateParameters();
             DatabaseAuditingPolicyProperties properties = new DatabaseAuditingPolicyProperties();
@@ -290,7 +290,7 @@ private DatabaseAuditingPolicyCreateOrUpdateParameters PolicizeDatabaseAuditingM
             properties.StorageAccountName = ExtractStorageAccountName(model);
             properties.StorageAccountResourceGroupName = ExtractStorageAccountResourceGroup(properties.StorageAccountName);
             properties.StorageAccountSubscriptionId = ExtractStorageAccountSubscriptionId(properties.StorageAccountName);
-            properties.StorageTableEndpoint = ExtractStorageAccountTableEndpoint(properties.StorageAccountName);
+            properties.StorageTableEndpoint = ExtractStorageAccountTableEndpoint(properties.StorageAccountName, storageEndpointSuffix);
             properties.StorageAccountKey = ExtractStorageAccountKey(properties.StorageAccountName, model, properties.StorageAccountResourceGroupName, StorageKeyKind.Primary);
             properties.StorageAccountSecondaryKey = ExtractStorageAccountKey(properties.StorageAccountName, model, properties.StorageAccountResourceGroupName, StorageKeyKind.Secondary);
             properties.EventTypesToAudit = ExtractEventTypes(model);
@@ -304,7 +304,7 @@ private DatabaseAuditingPolicyCreateOrUpdateParameters PolicizeDatabaseAuditingM
         /// </summary>
         /// <param name="model">The AuditingPolicy model object</param>
         /// <returns>The communication model object</returns>
-        private ServerAuditingPolicyCreateOrUpdateParameters PolicizeServerAuditingModel(ServerAuditingPolicyModel model)
+        private ServerAuditingPolicyCreateOrUpdateParameters PolicizeServerAuditingModel(ServerAuditingPolicyModel model, string storageEndpointSuffix)
         {
             ServerAuditingPolicyCreateOrUpdateParameters updateParameters = new ServerAuditingPolicyCreateOrUpdateParameters();
             ServerAuditingPolicyProperties properties = new ServerAuditingPolicyProperties();
@@ -313,7 +313,7 @@ private ServerAuditingPolicyCreateOrUpdateParameters PolicizeServerAuditingModel
             properties.StorageAccountName = ExtractStorageAccountName(model);
             properties.StorageAccountResourceGroupName = ExtractStorageAccountResourceGroup(properties.StorageAccountName);
             properties.StorageAccountSubscriptionId = ExtractStorageAccountSubscriptionId(properties.StorageAccountName);
-            properties.StorageTableEndpoint = ExtractStorageAccountTableEndpoint(properties.StorageAccountName);
+            properties.StorageTableEndpoint = ExtractStorageAccountTableEndpoint(properties.StorageAccountName, storageEndpointSuffix);
             properties.StorageAccountKey = ExtractStorageAccountKey(properties.StorageAccountName, model, properties.StorageAccountResourceGroupName, StorageKeyKind.Primary);
             properties.StorageAccountSecondaryKey = ExtractStorageAccountKey(properties.StorageAccountName, model, properties.StorageAccountResourceGroupName, StorageKeyKind.Secondary);
             properties.EventTypesToAudit = ExtractEventTypes(model);
@@ -421,7 +421,7 @@ private bool IsEventTypeOn(AuditEventType lookedForType, AuditEventType[] userSe
         /// <summary>
         /// Extracts the storage account endpoint
         /// </summary>
-        private string ExtractStorageAccountTableEndpoint(string storageName)
+        private string ExtractStorageAccountTableEndpoint(string storageName, string endpointSuffix)
         {
             if (IgnoreStorage)
             {
@@ -431,7 +431,7 @@ private string ExtractStorageAccountTableEndpoint(string storageName)
             {
                 return FetchedStorageAccountTableEndpoint;
             }
-            return AzureCommunicator.GetStorageTableEndpoint(Context, storageName);
+            return string.Format("https://{0}.table.{1}", storageName, endpointSuffix);
         }
 
         /// <summary>
diff --git a/src/ResourceManager/Sql/Commands.Sql/Common/AzureEndpointsCommunicator.cs b/src/ResourceManager/Sql/Commands.Sql/Common/AzureEndpointsCommunicator.cs
@@ -199,29 +199,6 @@ public string GetStorageResourceGroup(string storageAccountName)
             }
         }
 
-        /// <summary>
-        /// Gets the storage table endpoint the given storage account
-        /// </summary>
-        public string GetStorageTableEndpoint(AzureContext context, string storageAccountName)
-        {
-            try
-            {
-                List<Uri> endpoints = new List<Uri>(GetCurrentStorageClient(context).StorageAccounts.Get(storageAccountName).StorageAccount.Properties.Endpoints);
-                return endpoints.Find(u => u.AbsoluteUri.Contains(".table.")).AbsoluteUri;
-            }
-            catch
-            {
-                try
-                {
-                    return GetCurrentStorageV2Client(context).StorageAccounts.List().StorageAccounts.Where(a => a.Name == storageAccountName).First().PrimaryEndpoints.Table.AbsoluteUri;
-                }
-                catch
-                {
-                    throw new Exception(string.Format(Microsoft.Azure.Commands.Sql.Properties.Resources.StorageAccountNotFound, storageAccountName));
-                }
-            }
-        }
-
         /// <summary>
         /// Lazy creation of a single instance of a storage client
         /// </summary>

Original file line number	Diff line number	Diff line change
`@@ -49,14 +49,15 @@ public void TestAuditingDatabaseUpdatePolicyWithStorage()`
`49`	`49`	`RunPowerShellTest("Test-AuditingDatabaseUpdatePolicyWithStorage");`
`50`	`50`	`}`
`51`	`51`
`52`		`- [Fact(Skip = "PSGet: TODO fix by moving SM specific logic to test setup")]`
	`52`	`+ [Fact]`
`53`	`53`	`[Trait(Category.AcceptanceType, Category.Sql)]`
`54`	`54`	`public void TestAuditingDatabaseUpdatePolicyWithStorageV2()`
`55`	`55`	`{`
`56`	`56`	`RunPowerShellTest("Test-AuditingDatabaseUpdatePolicyWithStorageV2");`
`57`	`57`	`}`
`58`	`58`
`59`		`- [Fact(Skip = "PSGet: TODO fix by moving SM specific logic to test setup")] [Trait(Category.AcceptanceType, Category.Sql)]`
	`59`	`+ [Fact(Skip = "PSGet: TODO fix by moving SM specific logic to test setup")]`
	`60`	`+ [Trait(Category.AcceptanceType, Category.Sql)]`
`60`	`61`	`public void TestAuditingServerUpdatePolicyWithStorage()`
`61`	`62`	`{`
`62`	`63`	`RunPowerShellTest("Test-AuditingServerUpdatePolicyWithStorage");`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public void SetupEnvironment()`
`92`	`92`
`93`	`93`	`var environment = AzureRmProfileProvider.Instance.Profile.Environments[AzureRmProfileProvider.Instance.Profile.Context.Subscription.Environment];`
`94`	`94`	`environment.Endpoints[AzureEnvironment.Endpoint.Graph] = csmEnvironment.Endpoints.GraphUri.AbsoluteUri;`
`95`		`-`
	`95`	`+ environment.Endpoints[AzureEnvironment.Endpoint.StorageEndpointSuffix] = "core.windows.net";`
`96`	`96`	`AzureRmProfileProvider.Instance.Profile.Save();`
`97`	`97`	`}`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,6 @@ protected void RunPowerShellTest(params string[] scripts)`
`79`	`79`	`helper.RMStorageModule,`
`80`	`80`	`helper.GetRMModulePath(@"AzureRM.Insights.psd1"),`
`81`	`81`	`helper.GetRMModulePath(@"AzureRM.Sql.psd1"));`
`82`		`-`
`83`	`82`	`helper.RunPowerShellTest(scripts);`
`84`	`83`	`}`
`85`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ protected override SqlAuditAdapter InitModelAdapter(AzureSubscription subscripti`
`50`	`50`	`/// <param name="model">The model object with the data to be sent to the REST endpoints</param>`
`51`	`51`	`protected override DatabaseAuditingPolicyModel PersistChanges(DatabaseAuditingPolicyModel model)`
`52`	`52`	`{`
`53`		`- ModelAdapter.SetDatabaseAuditingPolicy(model, clientRequestId);`
	`53`	`+ ModelAdapter.SetDatabaseAuditingPolicy(model, clientRequestId, DefaultContext.Environment.Endpoints[AzureEnvironment.Endpoint.StorageEndpointSuffix]);`
`54`	`54`	`return null;`
`55`	`55`	`}`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ protected override SqlAuditAdapter InitModelAdapter(AzureSubscription subscripti`
`58`	`58`	`/// <param name="model">The model object with the data to be sent to the REST endpoints</param>`
`59`	`59`	`protected override ServerAuditingPolicyModel PersistChanges(ServerAuditingPolicyModel model)`
`60`	`60`	`{`
`61`		`- ModelAdapter.SetServerAuditingPolicy(model, clientRequestId);`
	`61`	`+ ModelAdapter.SetServerAuditingPolicy(model, clientRequestId, DefaultContext.Environment.Endpoints[AzureEnvironment.Endpoint.StorageEndpointSuffix]);`
`62`	`62`	`return null;`
`63`	`63`	`}`
`64`	`64`	`}`