removed confirm action from new cmdlets

makadiri · makadiri · commit 52e34dfcee55 · 2019-07-15T16:46:44.000-07:00
diff --git a/src/DataShare/DataShare/Account/NewAzDataShareAccount.cs b/src/DataShare/DataShare/Account/NewAzDataShareAccount.cs
@@ -73,22 +73,15 @@ public class NewAzDataShareAccount : AzureDataShareCmdletBase
 
         public override void ExecuteCmdlet()
         {
-            this.ConfirmAction(
-                string.Format(Resources.ResourceCreateConfirmation, this.Name),
-                this.Name,
-                this.NewAccount);
-        }
-
-        private void NewAccount()
-        {
-            if (this.ShouldProcess(this.Name, "Create"))
+            if (this.ShouldProcess(this.Name, $"Creating data share account '{this.Name}'."))
             {
                 Account dataShareAccount = this.DataShareManagementClient.Accounts.Create(
                     this.ResourceGroupName,
                     this.Name,
                     new Account()
                     {
-                        Location = this.Location, Tags = this.Tag?.ToDictionaryTags(),
+                        Location = this.Location,
+                        Tags = this.Tag?.ToDictionaryTags(),
                         Identity = new Identity
                         {
                             Type = "SystemAssigned"
diff --git a/src/DataShare/DataShare/DataSet/NewAzDataShareDataSet.cs b/src/DataShare/DataShare/DataSet/NewAzDataShareDataSet.cs
@@ -229,7 +229,7 @@ public override void ExecuteCmdlet()
                 ParameterSetNames.BlobDataSetParameterSet,
                 StringComparison.OrdinalIgnoreCase))
             {
-                if (this.ShouldProcess(this.Name, "Create"))
+                if (this.ShouldProcess(this.Name, $"Creating data set '{this.Name}'"))
                 {
                     if (this.FilePath != null)
                     {
@@ -297,7 +297,7 @@ public override void ExecuteCmdlet()
                 StringComparison.OrdinalIgnoreCase))
             {
 
-                if (this.ShouldProcess(this.Name, "Create"))
+                if (this.ShouldProcess(this.Name, $"Creating data set '{this.Name}'"))
                 {
                     if (this.FilePath != null)
                     {
@@ -365,7 +365,7 @@ public override void ExecuteCmdlet()
                 StringComparison.OrdinalIgnoreCase))
             {
                 storageAccountName = parsedStorageResourceId.GetAccountName();
-                if (this.ShouldProcess(this.Name, "Create"))
+                if (this.ShouldProcess(this.Name, $"Creating data set '{this.Name}'"))
                 {
                     if (this.FileName != null)
                     {
diff --git a/src/DataShare/DataShare/DataSetMapping/NewAzDataShareDataSetMapping.cs b/src/DataShare/DataShare/DataSetMapping/NewAzDataShareDataSetMapping.cs
@@ -198,7 +198,7 @@ public override void ExecuteCmdlet()
                 ParameterSetNames.BlobDataSetParameterSet,
                 StringComparison.OrdinalIgnoreCase))
             {
-                if (this.ShouldProcess(this.Name, "Create"))
+                if (this.ShouldProcess(this.Name, $"Creating data set mapping '{this.Name}'"))
                 {
                     if (this.FilePath != null)
                     {
@@ -269,7 +269,7 @@ public override void ExecuteCmdlet()
                 StringComparison.OrdinalIgnoreCase))
             {
 
-                if (this.ShouldProcess(this.Name, "Create"))
+                if (this.ShouldProcess(this.Name, $"Creating data set mapping '{this.Name}'"))
                 {
                     if (this.FilePath != null)
                     {
diff --git a/src/DataShare/DataShare/Invitation/GetAzDataShareInvitation.cs b/src/DataShare/DataShare/Invitation/GetAzDataShareInvitation.cs
@@ -83,6 +83,7 @@ public class GetAzDataShareInvitation : AzureDataShareCmdletBase
             HelpMessage = "Azure data share invitation name",
             ParameterSetName = ParameterSetNames.FieldsParameterSet)]
         [ValidateNotNullOrEmpty]
+        [ResourceNameCompleter(ResourceTypes.Invitation, "ResourceGroupName", "AccountName","ShareName")]
         public string Name { get; set; }
 
         /// <summary>
diff --git a/src/DataShare/DataShare/Invitation/NewAzDataShareInvitation.cs b/src/DataShare/DataShare/Invitation/NewAzDataShareInvitation.cs
@@ -127,55 +127,39 @@ public override void ExecuteCmdlet()
         {
             if (this.ParameterSetName.Equals(ParameterSetNames.InvitationEmailParameterSet, StringComparison.OrdinalIgnoreCase))
             {
-                this.ConfirmAction(
-                    string.Format(Resources.ResourceCreateConfirmation, this.Name),
-                    this.Name,
-                    this.NewEmailInvitation);
-            }
-
-            if (this.ParameterSetName.Equals(ParameterSetNames.InvitationTenantParameterSet, StringComparison.OrdinalIgnoreCase))
-            {
-                this.ConfirmAction(
-                    string.Format(Resources.ResourceCreateConfirmation, this.Name),
-                    this.Name,
-                    this.NewObjectIdInvitation);
-            }
-        }
+                if (this.ShouldProcess(this.Name, $"Creating invitation '{this.Name}'"))
+                {
+                    Invitation newInvitation = this.DataShareManagementClient.Invitations.Create(
+                        this.ResourceGroupName,
+                        this.AccountName,
+                        this.ShareName,
+                        this.Name,
+                        new Invitation()
+                        {
+                            TargetEmail = this.TargetEmail
+                        });
 
-        private void NewEmailInvitation()
-        {
-            if (this.ShouldProcess(this.Name, "Create"))
-            {
-                Invitation newInvitation = this.DataShareManagementClient.Invitations.Create(
-                    this.ResourceGroupName,
-                    this.AccountName,
-                    this.ShareName,
-                    this.Name,
-                    new Invitation()
-                    {
-                        TargetEmail = this.TargetEmail
-                    });
-
-                this.WriteObject(newInvitation.ToPsObject());
+                    this.WriteObject(newInvitation.ToPsObject());
+                }
             }
-        }
 
-        private void NewObjectIdInvitation()
-        {
-            if (this.ShouldProcess(this.Name, "Create"))
+            if (this.ParameterSetName.Equals(ParameterSetNames.InvitationTenantParameterSet, StringComparison.OrdinalIgnoreCase))
             {
-                Invitation newInvitation = this.DataShareManagementClient.Invitations.Create(
-                    this.ResourceGroupName,
-                    this.AccountName,
-                    this.ShareName,
-                    this.Name,
-                    new Invitation()
-                    {
-                        TargetObjectId = this.TargetObjectId,
-                        TargetActiveDirectoryId = this.TargetTenantId
-                    });
+                if (this.ShouldProcess(this.Name, $"Creating invitation '{this.Name}'"))
+                {
+                    Invitation newInvitation = this.DataShareManagementClient.Invitations.Create(
+                        this.ResourceGroupName,
+                        this.AccountName,
+                        this.ShareName,
+                        this.Name,
+                        new Invitation()
+                        {
+                            TargetObjectId = this.TargetObjectId,
+                            TargetActiveDirectoryId = this.TargetTenantId
+                        });
 
-                this.WriteObject(newInvitation.ToPsObject());
+                    this.WriteObject(newInvitation.ToPsObject());
+                }
             }
         }
     }
diff --git a/src/DataShare/DataShare/Invitation/RemoveAzDataShareInvitation.cs b/src/DataShare/DataShare/Invitation/RemoveAzDataShareInvitation.cs
@@ -80,6 +80,7 @@ public class RemoveAzDataShareInvitation : AzureDataShareCmdletBase
             ValueFromPipelineByPropertyName = true,
             ParameterSetName = ParameterSetNames.FieldsParameterSet,
             HelpMessage = "Azure data share invitation name")]
+        [ResourceNameCompleter(ResourceTypes.Invitation, "ResourceGroupName", "AccountName", "ShareName")]
         public string Name { get; set; }
 
 
diff --git a/src/DataShare/DataShare/ParameterSetNames.cs b/src/DataShare/DataShare/ParameterSetNames.cs
@@ -10,5 +10,6 @@ class ParameterSetNames
         public const string BlobDataSetParameterSet = "ByBlobDataSetParamaterSet";
         public const string AdlsGen2DataSetParameterSet = "ByAdlsGen2DataSetParameterSet";
         public const string AdlsGen1DataSetParameterSet = "ByAdlsGen1DataSetParameterSet";
+        public const string ProviderShareSubscriptionParameterSet = "ByProviderShareSubscriptionParameterSet";
     }
 }
diff --git a/src/DataShare/DataShare/Properties/AssemblyInfo.cs b/src/DataShare/DataShare/Properties/AssemblyInfo.cs
@@ -25,5 +25,5 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 [assembly: Guid("d90791a2-8102-47fc-8150-de25ae796eb1")]
-[assembly: AssemblyVersion("1.1.0")]
-[assembly: AssemblyFileVersion("1.1.0")]
+[assembly: AssemblyVersion("0.1.0")]
+[assembly: AssemblyFileVersion("0.1.0")]
diff --git a/src/DataShare/DataShare/ProviderShareSubscriptions/GrantAzDataShareSubscriptionAccess.cs b/src/DataShare/DataShare/ProviderShareSubscriptions/GrantAzDataShareSubscriptionAccess.cs
@@ -80,8 +80,7 @@ public class GrantAzDataShareSubscriptionAccess : AzureDataShareCmdletBase
             Mandatory = true,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "The share subscription id of the provider share subscription",
-            ParameterSetName = ParameterSetNames.ResourceIdParameterSet)]
-        [ResourceIdCompleter(ResourceTypes.ShareSubscription)]
+            ParameterSetName = ParameterSetNames.ProviderShareSubscriptionParameterSet)]
         [ValidateNotNullOrEmpty]
         public string ShareSubscriptionId { get; set; }
 
@@ -92,7 +91,7 @@ public class GrantAzDataShareSubscriptionAccess : AzureDataShareCmdletBase
             Mandatory = true,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "The resource id of the azure data share",
-            ParameterSetName = ParameterSetNames.ResourceIdParameterSet)]
+            ParameterSetName = ParameterSetNames.ProviderShareSubscriptionParameterSet)]
         [ResourceIdCompleter(ResourceTypes.Share)]
         [ValidateNotNullOrEmpty]
         public string ResourceId { get; set; }
diff --git a/src/DataShare/DataShare/ProviderShareSubscriptions/RevokeAzDataShareSubscriptionAccess.cs b/src/DataShare/DataShare/ProviderShareSubscriptions/RevokeAzDataShareSubscriptionAccess.cs
@@ -81,7 +81,7 @@ public class RevokeAzDataShareSubscriptionAccess : AzureDataShareCmdletBase
             Mandatory = true,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "The share subscription id of the provider share subscription",
-            ParameterSetName = ParameterSetNames.ResourceIdParameterSet)]
+            ParameterSetName = ParameterSetNames.ProviderShareSubscriptionParameterSet)]
         [ValidateNotNullOrEmpty]
         public string ShareSubscriptionId { get; set; }
 
@@ -92,7 +92,7 @@ public class RevokeAzDataShareSubscriptionAccess : AzureDataShareCmdletBase
             Mandatory = true,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "The resource id of the azure data share",
-            ParameterSetName = ParameterSetNames.ResourceIdParameterSet)]
+            ParameterSetName = ParameterSetNames.ProviderShareSubscriptionParameterSet)]
         [ResourceIdCompleter(ResourceTypes.Share)]
         [ValidateNotNullOrEmpty]
         public string ResourceId { get; set; }
diff --git a/src/DataShare/DataShare/Share/GetAzDataShareProviderShareSubscription.cs b/src/DataShare/DataShare/Share/GetAzDataShareProviderShareSubscription.cs
@@ -86,7 +86,7 @@ public class GetAzDataShareProviderShareSubscription : AzureDataShareCmdletBase
             Mandatory = false,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "The share subscription id of the provider share subscription",
-            ParameterSetName = ParameterSetNames.ResourceIdParameterSet)]
+            ParameterSetName = ParameterSetNames.ProviderShareSubscriptionParameterSet)]
         [ValidateNotNullOrEmpty]
         public string ShareSubscriptionId { get; set; }
 
@@ -97,7 +97,7 @@ public class GetAzDataShareProviderShareSubscription : AzureDataShareCmdletBase
             Mandatory = true,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "The resource id of the share",
-            ParameterSetName = ParameterSetNames.ResourceIdParameterSet)]
+            ParameterSetName = ParameterSetNames.ProviderShareSubscriptionParameterSet)]
         [ResourceIdCompleter(ResourceTypes.Share)]
         [ValidateNotNullOrEmpty]
         public string ResourceId { get; set; }
diff --git a/src/DataShare/DataShare/Share/NewAzDataShare.cs b/src/DataShare/DataShare/Share/NewAzDataShare.cs
@@ -82,15 +82,7 @@ public class NewAzDataShare : AzureDataShareCmdletBase
 
         public override void ExecuteCmdlet()
         {
-            this.ConfirmAction(
-                string.Format(Resources.ResourceCreateConfirmation, this.Name),
-                this.Name,
-                this.NewShare);
-        }
-
-        private void NewShare()
-        {
-            if (this.ShouldProcess(this.Name, "Create"))
+            if (this.ShouldProcess(this.Name, $"Creating data share '{this.Name}'"))
             {
                 Share dataShare = this.DataShareManagementClient.Shares.Create(
                     this.ResourceGroupName,
diff --git a/src/DataShare/DataShare/ShareSubscription/NewAzDataShareSubscription.cs b/src/DataShare/DataShare/ShareSubscription/NewAzDataShareSubscription.cs
@@ -74,15 +74,7 @@ public class NewAzDataShareSubscription : AzureDataShareCmdletBase
 
         public override void ExecuteCmdlet()
         {
-            this.ConfirmAction(
-                string.Format(Resources.ResourceCreateConfirmation, this.Name),
-                this.Name,
-                this.NewShareSubscription);
-        }
-
-        private void NewShareSubscription()
-        {
-            if (this.ShouldProcess(this.Name, "Create"))
+            if (this.ShouldProcess(this.Name, $"Creating share subscription '{this.Name}'"))
             {
                 ShareSubscription shareSubscription = this.DataShareManagementClient.ShareSubscriptions.Create(
                     this.ResourceGroupName,
diff --git a/src/DataShare/DataShare/SynchronizationSettings/NewAzDataShareSynchronizationSetting.cs b/src/DataShare/DataShare/SynchronizationSettings/NewAzDataShareSynchronizationSetting.cs
@@ -108,7 +108,7 @@ public class NewAzDataShareSynchronizationSetting : AzureDataShareCmdletBase
 
         public override void ExecuteCmdlet()
         {
-            if (this.ShouldProcess(this.Name, "Create"))
+            if (this.ShouldProcess(this.Name, $"Creating share synchronization '{this.Name}'"))
             {
                 var setting = new ScheduledSynchronizationSetting(
                     recurrenceInterval: this.RecurrenceInterval,

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ public override void ExecuteCmdlet()`
`229`	`229`	`ParameterSetNames.BlobDataSetParameterSet,`
`230`	`230`	`StringComparison.OrdinalIgnoreCase))`
`231`	`231`	`{`
`232`		`- if (this.ShouldProcess(this.Name, "Create"))`
	`232`	`+ if (this.ShouldProcess(this.Name, $"Creating data set '{this.Name}'"))`
`233`	`233`	`{`
`234`	`234`	`if (this.FilePath != null)`
`235`	`235`	`{`
`@@ -297,7 +297,7 @@ public override void ExecuteCmdlet()`
`297`	`297`	`StringComparison.OrdinalIgnoreCase))`
`298`	`298`	`{`
`299`	`299`
`300`		`- if (this.ShouldProcess(this.Name, "Create"))`
	`300`	`+ if (this.ShouldProcess(this.Name, $"Creating data set '{this.Name}'"))`
`301`	`301`	`{`
`302`	`302`	`if (this.FilePath != null)`
`303`	`303`	`{`
`@@ -365,7 +365,7 @@ public override void ExecuteCmdlet()`
`365`	`365`	`StringComparison.OrdinalIgnoreCase))`
`366`	`366`	`{`
`367`	`367`	`storageAccountName = parsedStorageResourceId.GetAccountName();`
`368`		`- if (this.ShouldProcess(this.Name, "Create"))`
	`368`	`+ if (this.ShouldProcess(this.Name, $"Creating data set '{this.Name}'"))`
`369`	`369`	`{`
`370`	`370`	`if (this.FileName != null)`
`371`	`371`	`{`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ public override void ExecuteCmdlet()`
`198`	`198`	`ParameterSetNames.BlobDataSetParameterSet,`
`199`	`199`	`StringComparison.OrdinalIgnoreCase))`
`200`	`200`	`{`
`201`		`- if (this.ShouldProcess(this.Name, "Create"))`
	`201`	`+ if (this.ShouldProcess(this.Name, $"Creating data set mapping '{this.Name}'"))`
`202`	`202`	`{`
`203`	`203`	`if (this.FilePath != null)`
`204`	`204`	`{`
`@@ -269,7 +269,7 @@ public override void ExecuteCmdlet()`
`269`	`269`	`StringComparison.OrdinalIgnoreCase))`
`270`	`270`	`{`
`271`	`271`
`272`		`- if (this.ShouldProcess(this.Name, "Create"))`
	`272`	`+ if (this.ShouldProcess(this.Name, $"Creating data set mapping '{this.Name}'"))`
`273`	`273`	`{`
`274`	`274`	`if (this.FilePath != null)`
`275`	`275`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,6 @@ class ParameterSetNames`
`10`	`10`	`public const string BlobDataSetParameterSet = "ByBlobDataSetParamaterSet";`
`11`	`11`	`public const string AdlsGen2DataSetParameterSet = "ByAdlsGen2DataSetParameterSet";`
`12`	`12`	`public const string AdlsGen1DataSetParameterSet = "ByAdlsGen1DataSetParameterSet";`
	`13`	`+ public const string ProviderShareSubscriptionParameterSet = "ByProviderShareSubscriptionParameterSet";`
`13`	`14`	`}`
`14`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public class NewAzDataShareSynchronizationSetting : AzureDataShareCmdletBase`
`108`	`108`
`109`	`109`	`public override void ExecuteCmdlet()`
`110`	`110`	`{`
`111`		`- if (this.ShouldProcess(this.Name, "Create"))`
	`111`	`+ if (this.ShouldProcess(this.Name, $"Creating share synchronization '{this.Name}'"))`
`112`	`112`	`{`
`113`	`113`	`var setting = new ScheduledSynchronizationSetting(`
`114`	`114`	`recurrenceInterval: this.RecurrenceInterval,`