update name of blob service (#42015)

m-nash · web-flow · commit f46ae2e267e0 · 2024-02-15T10:46:29.000-08:00
* hard code blob service name

* update after merge

* update api
diff --git a/sdk/provisioning/Azure.Provisioning/api/Azure.Provisioning.net6.0.cs b/sdk/provisioning/Azure.Provisioning/api/Azure.Provisioning.net6.0.cs
@@ -215,7 +215,7 @@ namespace Azure.Provisioning.Storage
 {
     public partial class BlobService : Azure.Provisioning.Resource<Azure.ResourceManager.Storage.BlobServiceData>
     {
-        public BlobService(Azure.Provisioning.IConstruct scope, string name = "blob") : base (default(Azure.Provisioning.IConstruct), default(Azure.Provisioning.Resource), default(string), default(Azure.Core.ResourceType), default(string), default(System.Func<string, Azure.ResourceManager.Storage.BlobServiceData>)) { }
+        public BlobService(Azure.Provisioning.IConstruct scope) : base (default(Azure.Provisioning.IConstruct), default(Azure.Provisioning.Resource), default(string), default(Azure.Core.ResourceType), default(string), default(System.Func<string, Azure.ResourceManager.Storage.BlobServiceData>)) { }
         protected override Azure.Provisioning.Resource? FindParentInScope(Azure.Provisioning.IConstruct scope) { throw null; }
     }
     public partial class StorageAccount : Azure.Provisioning.Resource<Azure.ResourceManager.Storage.StorageAccountData>
@@ -226,7 +226,7 @@ public partial class StorageAccount : Azure.Provisioning.Resource<Azure.Resource
     }
     public static partial class StorageExtensions
     {
-        public static Azure.Provisioning.Storage.BlobService AddBlobService(this Azure.Provisioning.IConstruct scope, string name = "blob") { throw null; }
+        public static Azure.Provisioning.Storage.BlobService AddBlobService(this Azure.Provisioning.IConstruct scope) { throw null; }
         public static Azure.Provisioning.Storage.StorageAccount AddStorageAccount(this Azure.Provisioning.IConstruct scope, Azure.ResourceManager.Storage.Models.StorageKind kind, Azure.ResourceManager.Storage.Models.StorageSkuName sku, Azure.Provisioning.ResourceManager.ResourceGroup? parent = null, string name = "sa") { throw null; }
     }
 }
diff --git a/sdk/provisioning/Azure.Provisioning/api/Azure.Provisioning.netstandard2.0.cs b/sdk/provisioning/Azure.Provisioning/api/Azure.Provisioning.netstandard2.0.cs
@@ -215,7 +215,7 @@ namespace Azure.Provisioning.Storage
 {
     public partial class BlobService : Azure.Provisioning.Resource<Azure.ResourceManager.Storage.BlobServiceData>
     {
-        public BlobService(Azure.Provisioning.IConstruct scope, string name = "blob") : base (default(Azure.Provisioning.IConstruct), default(Azure.Provisioning.Resource), default(string), default(Azure.Core.ResourceType), default(string), default(System.Func<string, Azure.ResourceManager.Storage.BlobServiceData>)) { }
+        public BlobService(Azure.Provisioning.IConstruct scope) : base (default(Azure.Provisioning.IConstruct), default(Azure.Provisioning.Resource), default(string), default(Azure.Core.ResourceType), default(string), default(System.Func<string, Azure.ResourceManager.Storage.BlobServiceData>)) { }
         protected override Azure.Provisioning.Resource? FindParentInScope(Azure.Provisioning.IConstruct scope) { throw null; }
     }
     public partial class StorageAccount : Azure.Provisioning.Resource<Azure.ResourceManager.Storage.StorageAccountData>
@@ -226,7 +226,7 @@ public partial class StorageAccount : Azure.Provisioning.Resource<Azure.Resource
     }
     public static partial class StorageExtensions
     {
-        public static Azure.Provisioning.Storage.BlobService AddBlobService(this Azure.Provisioning.IConstruct scope, string name = "blob") { throw null; }
+        public static Azure.Provisioning.Storage.BlobService AddBlobService(this Azure.Provisioning.IConstruct scope) { throw null; }
         public static Azure.Provisioning.Storage.StorageAccount AddStorageAccount(this Azure.Provisioning.IConstruct scope, Azure.ResourceManager.Storage.Models.StorageKind kind, Azure.ResourceManager.Storage.Models.StorageSkuName sku, Azure.Provisioning.ResourceManager.ResourceGroup? parent = null, string name = "sa") { throw null; }
     }
 }
diff --git a/sdk/provisioning/Azure.Provisioning/src/storage/BlobService.cs b/sdk/provisioning/Azure.Provisioning/src/storage/BlobService.cs
@@ -17,10 +17,9 @@ public class BlobService : Resource<BlobServiceData>
         /// Initializes a new instance of the <see cref="BlobService"/>.
         /// </summary>
         /// <param name="scope">The scope.</param>
-        /// <param name="name">The name.</param>
-        public BlobService(IConstruct scope, string name = "blob")
-            : base(scope, null, name, ResourceTypeName, "2022-09-01", (name) => ArmStorageModelFactory.BlobServiceData(
-                name: name,
+        public BlobService(IConstruct scope)
+            : base(scope, null, "default", ResourceTypeName, "2022-09-01", (name) => ArmStorageModelFactory.BlobServiceData(
+                name: "default",
                 resourceType: ResourceTypeName))
         {
         }
diff --git a/sdk/provisioning/Azure.Provisioning/src/storage/StorageExtensions.cs b/sdk/provisioning/Azure.Provisioning/src/storage/StorageExtensions.cs
@@ -29,11 +29,10 @@ public static StorageAccount AddStorageAccount(this IConstruct scope, StorageKin
         /// Adds a <see cref="BlobService"/> to the construct.
         /// </summary>
         /// <param name="scope">The scope.</param>
-        /// <param name="name">The name.</param>
         /// <returns></returns>
-        public static BlobService AddBlobService(this IConstruct scope, string name = "blob")
+        public static BlobService AddBlobService(this IConstruct scope)
         {
-            return new BlobService(scope, name);
+            return new BlobService(scope);
         }
     }
 }
diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/main.bicep
@@ -9,9 +9,9 @@ resource resourceGroup_I6QNkoPsb 'Microsoft.Resources/resourceGroups@2023-07-01'
   }
 }
 
-resource storageAccount_TDwXOzG67 'Microsoft.Storage/storageAccounts@2022-09-01' = {
+resource storageAccount_SIHb28RDV 'Microsoft.Storage/storageAccounts@2022-09-01' = {
   scope: resourceGroup_I6QNkoPsb
-  name: 'photoAcct-7f1b0ebf61714c'
+  name: 'photoAcct-4f6f922c331347'
   location: 'westus'
   sku: {
     name: 'Premium_LRS'
@@ -21,9 +21,9 @@ resource storageAccount_TDwXOzG67 'Microsoft.Storage/storageAccounts@2022-09-01'
   }
 }
 
-resource blobService_JcufSwMPd 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = {
-  parent: storageAccount_TDwXOzG67
-  name: 'photos-TEST'
+resource blobService_lyt6uqODr 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = {
+  parent: storageAccount_SIHb28RDV
+  name: 'default'
   properties: {
     cors: {
     }
diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/main.bicep
@@ -9,9 +9,9 @@ resource resourceGroup_I6QNkoPsb 'Microsoft.Resources/resourceGroups@2023-07-01'
   }
 }
 
-resource storageAccount_LayX88MCA 'Microsoft.Storage/storageAccounts@2022-09-01' = {
+resource storageAccount_bhaja5ROZ 'Microsoft.Storage/storageAccounts@2022-09-01' = {
   scope: resourceGroup_I6QNkoPsb
-  name: 'photoAcct-94212d55456a47'
+  name: 'photoAcct-96a1eefb1ac845'
   location: 'westus'
   sku: {
     name: 'Premium_LRS'
@@ -21,9 +21,9 @@ resource storageAccount_LayX88MCA 'Microsoft.Storage/storageAccounts@2022-09-01'
   }
 }
 
-resource blobService_mmxB2GeFN 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = {
-  parent: storageAccount_LayX88MCA
-  name: 'photos-TEST'
+resource blobService_PQ7aICJK8 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = {
+  parent: storageAccount_bhaja5ROZ
+  name: 'default'
   properties: {
     cors: {
     }
diff --git a/sdk/provisioning/Azure.Provisioning/tests/ProvisioningTests.cs b/sdk/provisioning/Azure.Provisioning/tests/ProvisioningTests.cs
@@ -103,7 +103,7 @@ public void StorageBlobDefaults()
         {
             var infra = new TestInfrastructure();
             infra.AddStorageAccount(name: "photoAcct", sku: StorageSkuName.PremiumLrs, kind: StorageKind.BlockBlobStorage);
-            infra.AddBlobService(name: "photos");
+            infra.AddBlobService();
             infra.Build(GetOutputPath());
         }
 
@@ -112,7 +112,7 @@ public void StorageBlobDropDown()
         {
             var infra = new TestInfrastructure();
             infra.AddStorageAccount(name: "photoAcct", sku: StorageSkuName.PremiumLrs, kind: StorageKind.BlockBlobStorage);
-            var blob = infra.AddBlobService(name: "photos");
+            var blob = infra.AddBlobService();
             blob.Properties.DeleteRetentionPolicy = new DeleteRetentionPolicy()
             {
                 IsEnabled = true

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ namespace Azure.Provisioning.Storage`
`215`	`215`	`{`
`216`	`216`	`public partial class BlobService : Azure.Provisioning.Resource<Azure.ResourceManager.Storage.BlobServiceData>`
`217`	`217`	`{`
`218`		`- public BlobService(Azure.Provisioning.IConstruct scope, string name = "blob") : base (default(Azure.Provisioning.IConstruct), default(Azure.Provisioning.Resource), default(string), default(Azure.Core.ResourceType), default(string), default(System.Func<string, Azure.ResourceManager.Storage.BlobServiceData>)) { }`
	`218`	`+ public BlobService(Azure.Provisioning.IConstruct scope) : base (default(Azure.Provisioning.IConstruct), default(Azure.Provisioning.Resource), default(string), default(Azure.Core.ResourceType), default(string), default(System.Func<string, Azure.ResourceManager.Storage.BlobServiceData>)) { }`
`219`	`219`	`protected override Azure.Provisioning.Resource? FindParentInScope(Azure.Provisioning.IConstruct scope) { throw null; }`
`220`	`220`	`}`
`221`	`221`	`public partial class StorageAccount : Azure.Provisioning.Resource<Azure.ResourceManager.Storage.StorageAccountData>`
`@@ -226,7 +226,7 @@ public partial class StorageAccount : Azure.Provisioning.Resource<Azure.Resource`
`226`	`226`	`}`
`227`	`227`	`public static partial class StorageExtensions`
`228`	`228`	`{`
`229`		`- public static Azure.Provisioning.Storage.BlobService AddBlobService(this Azure.Provisioning.IConstruct scope, string name = "blob") { throw null; }`
	`229`	`+ public static Azure.Provisioning.Storage.BlobService AddBlobService(this Azure.Provisioning.IConstruct scope) { throw null; }`
`230`	`230`	`public static Azure.Provisioning.Storage.StorageAccount AddStorageAccount(this Azure.Provisioning.IConstruct scope, Azure.ResourceManager.Storage.Models.StorageKind kind, Azure.ResourceManager.Storage.Models.StorageSkuName sku, Azure.Provisioning.ResourceManager.ResourceGroup? parent = null, string name = "sa") { throw null; }`
`231`	`231`	`}`
`232`	`232`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,9 @@ public class BlobService : Resource<BlobServiceData>`
`17`	`17`	`/// Initializes a new instance of the <see cref="BlobService"/>.`
`18`	`18`	`/// </summary>`
`19`	`19`	`/// <param name="scope">The scope.</param>`
`20`		`- /// <param name="name">The name.</param>`
`21`		`- public BlobService(IConstruct scope, string name = "blob")`
`22`		`- : base(scope, null, name, ResourceTypeName, "2022-09-01", (name) => ArmStorageModelFactory.BlobServiceData(`
`23`		`- name: name,`
	`20`	`+ public BlobService(IConstruct scope)`
	`21`	`+ : base(scope, null, "default", ResourceTypeName, "2022-09-01", (name) => ArmStorageModelFactory.BlobServiceData(`
	`22`	`+ name: "default",`
`24`	`23`	`resourceType: ResourceTypeName))`
`25`	`24`	`{`
`26`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,10 @@ public static StorageAccount AddStorageAccount(this IConstruct scope, StorageKin`
`29`	`29`	`/// Adds a <see cref="BlobService"/> to the construct.`
`30`	`30`	`/// </summary>`
`31`	`31`	`/// <param name="scope">The scope.</param>`
`32`		`- /// <param name="name">The name.</param>`
`33`	`32`	`/// <returns></returns>`
`34`		`- public static BlobService AddBlobService(this IConstruct scope, string name = "blob")`
	`33`	`+ public static BlobService AddBlobService(this IConstruct scope)`
`35`	`34`	`{`
`36`		`- return new BlobService(scope, name);`
	`35`	`+ return new BlobService(scope);`
`37`	`36`	`}`
`38`	`37`	`}`
`39`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ resource resourceGroup_I6QNkoPsb 'Microsoft.Resources/resourceGroups@2023-07-01'`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`
`12`		`-resource storageAccount_TDwXOzG67 'Microsoft.Storage/storageAccounts@2022-09-01' = {`
	`12`	`+resource storageAccount_SIHb28RDV 'Microsoft.Storage/storageAccounts@2022-09-01' = {`
`13`	`13`	`scope: resourceGroup_I6QNkoPsb`
`14`		`- name: 'photoAcct-7f1b0ebf61714c'`
	`14`	`+ name: 'photoAcct-4f6f922c331347'`
`15`	`15`	`location: 'westus'`
`16`	`16`	`sku: {`
`17`	`17`	`name: 'Premium_LRS'`
`@@ -21,9 +21,9 @@ resource storageAccount_TDwXOzG67 'Microsoft.Storage/storageAccounts@2022-09-01'`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`		`-resource blobService_JcufSwMPd 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = {`
`25`		`- parent: storageAccount_TDwXOzG67`
`26`		`- name: 'photos-TEST'`
	`24`	`+resource blobService_lyt6uqODr 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = {`
	`25`	`+ parent: storageAccount_SIHb28RDV`
	`26`	`+ name: 'default'`
`27`	`27`	`properties: {`
`28`	`28`	`cors: {`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public void StorageBlobDefaults()`
`103`	`103`	`{`
`104`	`104`	`var infra = new TestInfrastructure();`
`105`	`105`	`infra.AddStorageAccount(name: "photoAcct", sku: StorageSkuName.PremiumLrs, kind: StorageKind.BlockBlobStorage);`
`106`		`- infra.AddBlobService(name: "photos");`
	`106`	`+ infra.AddBlobService();`
`107`	`107`	`infra.Build(GetOutputPath());`
`108`	`108`	`}`
`109`	`109`
`@@ -112,7 +112,7 @@ public void StorageBlobDropDown()`
`112`	`112`	`{`
`113`	`113`	`var infra = new TestInfrastructure();`
`114`	`114`	`infra.AddStorageAccount(name: "photoAcct", sku: StorageSkuName.PremiumLrs, kind: StorageKind.BlockBlobStorage);`
`115`		`- var blob = infra.AddBlobService(name: "photos");`
	`115`	`+ var blob = infra.AddBlobService();`
`116`	`116`	`blob.Properties.DeleteRetentionPolicy = new DeleteRetentionPolicy()`
`117`	`117`	`{`
`118`	`118`	`IsEnabled = true`