Merge pull request #272 from wastoresh/preview

cormacpayne · web-flow · commit faabfab2c94e · 2017-09-08T17:48:55.000Z
Use Microsoft.Storage as default KeySource since server behavior change
diff --git a/src/ResourceManager/Storage/Commands.Management.Storage/StorageAccount/StorageAccountBaseCmdlet.cs b/src/ResourceManager/Storage/Commands.Management.Storage/StorageAccount/StorageAccountBaseCmdlet.cs
@@ -169,15 +169,15 @@ protected static Encryption ParseEncryption(EncryptionSupportServiceEnum? Enable
                 accountEncryption.Services.File = new EncryptionService();
                 accountEncryption.Services.File.Enabled = false;
             }
-            if (storageEncryption)
-            {
-                accountEncryption.KeySource = "Microsoft.Storage";
-            }
             if (keyVaultEncryption)
             {
                 accountEncryption.KeySource = "Microsoft.Keyvault";
                 accountEncryption.KeyVaultProperties = new KeyVaultProperties(keyName, keyVersion, keyVaultUri);
             }
+            else
+            {
+                accountEncryption.KeySource = "Microsoft.Storage";
+            }
             return accountEncryption;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -169,15 +169,15 @@ protected static Encryption ParseEncryption(EncryptionSupportServiceEnum? Enable`
`169`	`169`	`accountEncryption.Services.File = new EncryptionService();`
`170`	`170`	`accountEncryption.Services.File.Enabled = false;`
`171`	`171`	`}`
`172`		`- if (storageEncryption)`
`173`		`- {`
`174`		`- accountEncryption.KeySource = "Microsoft.Storage";`
`175`		`- }`
`176`	`172`	`if (keyVaultEncryption)`
`177`	`173`	`{`
`178`	`174`	`accountEncryption.KeySource = "Microsoft.Keyvault";`
`179`	`175`	`accountEncryption.KeyVaultProperties = new KeyVaultProperties(keyName, keyVersion, keyVaultUri);`
`180`	`176`	`}`
	`177`	`+ else`
	`178`	`+ {`
	`179`	`+ accountEncryption.KeySource = "Microsoft.Storage";`
	`180`	`+ }`
`181`	`181`	`return accountEncryption;`
`182`	`182`	`}`
`183`	`183`