Skip to content

Commit 7ade8dd

Browse files
lijinpei2008lijinpei2008
committed
update
1 parent 8c82eb3 commit 7ade8dd

File tree

5 files changed

+27
-27
lines changed

5 files changed

+27
-27
lines changed

‎src/DataBox/DataBox.Autorest/docs/Update-AzDataBoxJob.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ $DebugPreference = "Continue"
7979
# }
8080
# }
8181
82-
Update-AzDataBoxJob -Name "powershell10" -ResourceGroupName "resourceGroupName" -KeyEncryptionKey $keyEncryptionDetails -ContactDetail $contactDetail -ShippingAddress $ShippingDetails -EnableSystemAssignedIdentity:$true -UserAssignedIdentity "/subscriptions/SubscriptionId/resourceGroups/resourceGroupName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identityName"
82+
Update-AzDataBoxJob -Name "powershell10" -ResourceGroupName "resourceGroupName" -KeyEncryptionKey $keyEncryptionDetails -ContactDetail $contactDetail -ShippingAddress $ShippingDetails -EnableSystemAssignedIdentity $true -UserAssignedIdentity "/subscriptions/SubscriptionId/resourceGroups/resourceGroupName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identityName"
8383
8484
$keyEncryptionDetails
8585
```
@@ -98,13 +98,13 @@ Update databox job encryption from microsoft managed to customer managed with us
9898

9999
### Example 2: Update databox job encryption from microsoft managed to customer managed with system identities in 2 updates
100100
```powershell
101-
$databoxUpdate = Update-AzDataBoxJob -Name "pwshTestSAssigned" -ResourceGroupName "resourceGroupName" -ContactDetail $contactDetail -ShippingAddress $ShippingDetails -IdentityType "SystemAssigned"
101+
$databoxUpdate = Update-AzDataBoxJob -Name "pwshTestSAssigned" -ResourceGroupName "resourceGroupName" -ContactDetail $contactDetail -ShippingAddress $ShippingDetails -EnableSystemAssignedIdentity $true
102102
103103
$databoxUpdate.Identity
104104
105105
$keyEncryptionDetails = New-AzDataBoxKeyEncryptionKeyObject -KekType "CustomerManaged" -IdentityProperty @{Type = "SystemAssigned"} -KekUrl "keyIdentifier" -KekVaultResourceId "/subscriptions/SubscriptionId/resourceGroups/resourceGroupName/providers/Microsoft.KeyVault/vaults/keyVaultName"
106106
107-
$databoxUpdateWithCMK = Update-AzDataBoxJob -Name "pwshTestSAssigned" -ResourceGroupName "resourceGroupName" -ContactDetail $contactDetail -ShippingAddress $ShippingDetails -KeyEncryptionKey $keyEncryptionDetails
107+
$databoxUpdateWithCMK = Update-AzDataBoxJob -Name "pwshTestSAssigned" -ResourceGroupName "resourceGroupName" -ContactDetail $contactDetail -ShippingAddress $ShippingDetails -KeyEncryptionKey $keyEncryptionDetails
108108
109109
$databoxUpdateWithCMK.Identity
110110
@@ -133,7 +133,7 @@ For any failure re-run with $DebugPreference = "Continue" as mentioned in exampl
133133
$contactDetail = New-AzDataBoxContactDetailsObject -ContactName "random" -EmailList @("emailId") -Phone "1234567891"
134134
$ShippingDetails = New-AzDataBoxShippingAddressObject -StreetAddress1 "101 TOWNSEND ST" -StateOrProvince "CA" -Country "US" -City "San Francisco" -PostalCode "94107" -AddressType "Commercial"
135135
136-
Update-AzDataBoxJob -Name "pwshTestSAssigned" -ResourceGroupName "resourceGroupName" -KeyEncryptionKey $keyEncryptionDetails -ContactDetail $contactDetail -ShippingAddress $ShippingDetails -EnableSystemAssignedIdentity:$true -UserAssignedIdentity "/subscriptions/SubscriptionId/resourceGroups/resourceGroupName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identityName"
136+
Update-AzDataBoxJob -Name "pwshTestSAssigned" -ResourceGroupName "resourceGroupName" -KeyEncryptionKey $keyEncryptionDetails -ContactDetail $contactDetail -ShippingAddress $ShippingDetails -EnableSystemAssignedIdentity $true -UserAssignedIdentity "/subscriptions/SubscriptionId/resourceGroups/resourceGroupName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identityName"
137137
```
138138

139139
Update databox job from system assigned to user assigned with customer managed key encryption.

‎src/DataBox/DataBox.Autorest/examples/Update-AzDataBoxJob.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $DebugPreference = "Continue"
1616
# }
1717
# }
1818
19-
Update-AzDataBoxJob -Name "powershell10" -ResourceGroupName "resourceGroupName" -KeyEncryptionKey $keyEncryptionDetails -ContactDetail $contactDetail -ShippingAddress $ShippingDetails -EnableSystemAssignedIdentity:$true -UserAssignedIdentity "/subscriptions/SubscriptionId/resourceGroups/resourceGroupName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identityName"
19+
Update-AzDataBoxJob -Name "powershell10" -ResourceGroupName "resourceGroupName" -KeyEncryptionKey $keyEncryptionDetails -ContactDetail $contactDetail -ShippingAddress $ShippingDetails -EnableSystemAssignedIdentity $true -UserAssignedIdentity "/subscriptions/SubscriptionId/resourceGroups/resourceGroupName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identityName"
2020
2121
$keyEncryptionDetails
2222
```
@@ -34,13 +34,13 @@ Update databox job encryption from microsoft managed to customer managed with us
3434

3535
### Example 2: Update databox job encryption from microsoft managed to customer managed with system identities in 2 updates
3636
```powershell
37-
$databoxUpdate = Update-AzDataBoxJob -Name "pwshTestSAssigned" -ResourceGroupName "resourceGroupName" -ContactDetail $contactDetail -ShippingAddress $ShippingDetails -IdentityType "SystemAssigned"
37+
$databoxUpdate = Update-AzDataBoxJob -Name "pwshTestSAssigned" -ResourceGroupName "resourceGroupName" -ContactDetail $contactDetail -ShippingAddress $ShippingDetails -EnableSystemAssignedIdentity $true
3838
3939
$databoxUpdate.Identity
4040
4141
$keyEncryptionDetails = New-AzDataBoxKeyEncryptionKeyObject -KekType "CustomerManaged" -IdentityProperty @{Type = "SystemAssigned"} -KekUrl "keyIdentifier" -KekVaultResourceId "/subscriptions/SubscriptionId/resourceGroups/resourceGroupName/providers/Microsoft.KeyVault/vaults/keyVaultName"
4242
43-
$databoxUpdateWithCMK = Update-AzDataBoxJob -Name "pwshTestSAssigned" -ResourceGroupName "resourceGroupName" -ContactDetail $contactDetail -ShippingAddress $ShippingDetails -KeyEncryptionKey $keyEncryptionDetails
43+
$databoxUpdateWithCMK = Update-AzDataBoxJob -Name "pwshTestSAssigned" -ResourceGroupName "resourceGroupName" -ContactDetail $contactDetail -ShippingAddress $ShippingDetails -KeyEncryptionKey $keyEncryptionDetails
4444
4545
$databoxUpdateWithCMK.Identity
4646
@@ -67,7 +67,7 @@ Update databox job encryption from microsoft managed to customer managed to cust
6767
$contactDetail = New-AzDataBoxContactDetailsObject -ContactName "random" -EmailList @("emailId") -Phone "1234567891"
6868
$ShippingDetails = New-AzDataBoxShippingAddressObject -StreetAddress1 "101 TOWNSEND ST" -StateOrProvince "CA" -Country "US" -City "San Francisco" -PostalCode "94107" -AddressType "Commercial"
6969
70-
Update-AzDataBoxJob -Name "pwshTestSAssigned" -ResourceGroupName "resourceGroupName" -KeyEncryptionKey $keyEncryptionDetails -ContactDetail $contactDetail -ShippingAddress $ShippingDetails -EnableSystemAssignedIdentity:$true -UserAssignedIdentity "/subscriptions/SubscriptionId/resourceGroups/resourceGroupName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identityName"
70+
Update-AzDataBoxJob -Name "pwshTestSAssigned" -ResourceGroupName "resourceGroupName" -KeyEncryptionKey $keyEncryptionDetails -ContactDetail $contactDetail -ShippingAddress $ShippingDetails -EnableSystemAssignedIdentity $true -UserAssignedIdentity "/subscriptions/SubscriptionId/resourceGroups/resourceGroupName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identityName"
7171
```
7272

7373
Update databox job from system assigned to user assigned with customer managed key encryption. For any failure re-run with $DebugPreference = "Continue" as mentioned in example 1

‎src/DataBox/DataBox.Autorest/generate-info.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"generate_Id": "baf0dec0-a30d-4ccf-89a9-3edc1aebb539"
2+
"generate_Id": "c7b3fe42-cc21-405f-999c-3b14271aba04"
33
}

‎src/DataBox/DataBox.sln‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataBox", "DataBox\DataBox.
2121
EndProject
2222
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataBox.Autorest", "DataBox.Autorest", "{5F76ED46-72CC-F435-F4B7-31B1A1EB1AB3}"
2323
EndProject
24-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.DataBox", "..\..\generated\DataBox\DataBox.Autorest\Az.DataBox.csproj", "{9C186F7E-6D79-42D3-9673-0424BAB7B29B}"
24+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.DataBox", "..\..\generated\DataBox\DataBox.Autorest\Az.DataBox.csproj", "{DFEB26D5-D82E-4A44-B165-4F2DEE6B4254}"
2525
EndProject
2626
Global
2727
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -117,18 +117,18 @@ Global
117117
{F09CECC4-94D4-4BC2-82D6-8CBCA83A834A}.Release|x64.Build.0 = Release|Any CPU
118118
{F09CECC4-94D4-4BC2-82D6-8CBCA83A834A}.Release|x86.ActiveCfg = Release|Any CPU
119119
{F09CECC4-94D4-4BC2-82D6-8CBCA83A834A}.Release|x86.Build.0 = Release|Any CPU
120-
{9C186F7E-6D79-42D3-9673-0424BAB7B29B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
121-
{9C186F7E-6D79-42D3-9673-0424BAB7B29B}.Debug|Any CPU.Build.0 = Debug|Any CPU
122-
{9C186F7E-6D79-42D3-9673-0424BAB7B29B}.Debug|x64.ActiveCfg = Debug|Any CPU
123-
{9C186F7E-6D79-42D3-9673-0424BAB7B29B}.Debug|x64.Build.0 = Debug|Any CPU
124-
{9C186F7E-6D79-42D3-9673-0424BAB7B29B}.Debug|x86.ActiveCfg = Debug|Any CPU
125-
{9C186F7E-6D79-42D3-9673-0424BAB7B29B}.Debug|x86.Build.0 = Debug|Any CPU
126-
{9C186F7E-6D79-42D3-9673-0424BAB7B29B}.Release|Any CPU.ActiveCfg = Release|Any CPU
127-
{9C186F7E-6D79-42D3-9673-0424BAB7B29B}.Release|Any CPU.Build.0 = Release|Any CPU
128-
{9C186F7E-6D79-42D3-9673-0424BAB7B29B}.Release|x64.ActiveCfg = Release|Any CPU
129-
{9C186F7E-6D79-42D3-9673-0424BAB7B29B}.Release|x64.Build.0 = Release|Any CPU
130-
{9C186F7E-6D79-42D3-9673-0424BAB7B29B}.Release|x86.ActiveCfg = Release|Any CPU
131-
{9C186F7E-6D79-42D3-9673-0424BAB7B29B}.Release|x86.Build.0 = Release|Any CPU
120+
{DFEB26D5-D82E-4A44-B165-4F2DEE6B4254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
121+
{DFEB26D5-D82E-4A44-B165-4F2DEE6B4254}.Debug|Any CPU.Build.0 = Debug|Any CPU
122+
{DFEB26D5-D82E-4A44-B165-4F2DEE6B4254}.Debug|x64.ActiveCfg = Debug|Any CPU
123+
{DFEB26D5-D82E-4A44-B165-4F2DEE6B4254}.Debug|x64.Build.0 = Debug|Any CPU
124+
{DFEB26D5-D82E-4A44-B165-4F2DEE6B4254}.Debug|x86.ActiveCfg = Debug|Any CPU
125+
{DFEB26D5-D82E-4A44-B165-4F2DEE6B4254}.Debug|x86.Build.0 = Debug|Any CPU
126+
{DFEB26D5-D82E-4A44-B165-4F2DEE6B4254}.Release|Any CPU.ActiveCfg = Release|Any CPU
127+
{DFEB26D5-D82E-4A44-B165-4F2DEE6B4254}.Release|Any CPU.Build.0 = Release|Any CPU
128+
{DFEB26D5-D82E-4A44-B165-4F2DEE6B4254}.Release|x64.ActiveCfg = Release|Any CPU
129+
{DFEB26D5-D82E-4A44-B165-4F2DEE6B4254}.Release|x64.Build.0 = Release|Any CPU
130+
{DFEB26D5-D82E-4A44-B165-4F2DEE6B4254}.Release|x86.ActiveCfg = Release|Any CPU
131+
{DFEB26D5-D82E-4A44-B165-4F2DEE6B4254}.Release|x86.Build.0 = Release|Any CPU
132132
EndGlobalSection
133133
GlobalSection(SolutionProperties) = preSolution
134134
HideSolutionNode = FALSE
@@ -140,6 +140,6 @@ Global
140140
{0CBD7F56-9ACE-4D0C-841F-256077AE517A} = {8FCA943C-A853-4DCB-AF3A-E3848949D629}
141141
{2B53E025-DCB9-463E-A405-983D2A666A76} = {8FCA943C-A853-4DCB-AF3A-E3848949D629}
142142
{9D84884F-7FA3-404D-9FBF-8DE6CB4A7320} = {8FCA943C-A853-4DCB-AF3A-E3848949D629}
143-
{9C186F7E-6D79-42D3-9673-0424BAB7B29B} = {5F76ED46-72CC-F435-F4B7-31B1A1EB1AB3}
143+
{DFEB26D5-D82E-4A44-B165-4F2DEE6B4254} = {5F76ED46-72CC-F435-F4B7-31B1A1EB1AB3}
144144
EndGlobalSection
145145
EndGlobal

‎src/DataBox/DataBox/help/Update-AzDataBoxJob.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ $DebugPreference = "Continue"
8080
# }
8181
# }
8282
83-
Update-AzDataBoxJob -Name "powershell10" -ResourceGroupName "resourceGroupName" -KeyEncryptionKey $keyEncryptionDetails -ContactDetail $contactDetail -ShippingAddress $ShippingDetails -EnableSystemAssignedIdentity:$true -UserAssignedIdentity "/subscriptions/SubscriptionId/resourceGroups/resourceGroupName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identityName"
83+
Update-AzDataBoxJob -Name "powershell10" -ResourceGroupName "resourceGroupName" -KeyEncryptionKey $keyEncryptionDetails -ContactDetail $contactDetail -ShippingAddress $ShippingDetails -EnableSystemAssignedIdentity $true -UserAssignedIdentity "/subscriptions/SubscriptionId/resourceGroups/resourceGroupName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identityName"
8484
8585
$keyEncryptionDetails
8686
```
@@ -99,13 +99,13 @@ Update databox job encryption from microsoft managed to customer managed with us
9999

100100
### Example 2: Update databox job encryption from microsoft managed to customer managed with system identities in 2 updates
101101
```powershell
102-
$databoxUpdate = Update-AzDataBoxJob -Name "pwshTestSAssigned" -ResourceGroupName "resourceGroupName" -ContactDetail $contactDetail -ShippingAddress $ShippingDetails -IdentityType "SystemAssigned"
102+
$databoxUpdate = Update-AzDataBoxJob -Name "pwshTestSAssigned" -ResourceGroupName "resourceGroupName" -ContactDetail $contactDetail -ShippingAddress $ShippingDetails -EnableSystemAssignedIdentity $true
103103
104104
$databoxUpdate.Identity
105105
106106
$keyEncryptionDetails = New-AzDataBoxKeyEncryptionKeyObject -KekType "CustomerManaged" -IdentityProperty @{Type = "SystemAssigned"} -KekUrl "keyIdentifier" -KekVaultResourceId "/subscriptions/SubscriptionId/resourceGroups/resourceGroupName/providers/Microsoft.KeyVault/vaults/keyVaultName"
107107
108-
$databoxUpdateWithCMK = Update-AzDataBoxJob -Name "pwshTestSAssigned" -ResourceGroupName "resourceGroupName" -ContactDetail $contactDetail -ShippingAddress $ShippingDetails -KeyEncryptionKey $keyEncryptionDetails
108+
$databoxUpdateWithCMK = Update-AzDataBoxJob -Name "pwshTestSAssigned" -ResourceGroupName "resourceGroupName" -ContactDetail $contactDetail -ShippingAddress $ShippingDetails -KeyEncryptionKey $keyEncryptionDetails
109109
110110
$databoxUpdateWithCMK.Identity
111111
@@ -134,7 +134,7 @@ For any failure re-run with $DebugPreference = "Continue" as mentioned in exampl
134134
$contactDetail = New-AzDataBoxContactDetailsObject -ContactName "random" -EmailList @("emailId") -Phone "1234567891"
135135
$ShippingDetails = New-AzDataBoxShippingAddressObject -StreetAddress1 "101 TOWNSEND ST" -StateOrProvince "CA" -Country "US" -City "San Francisco" -PostalCode "94107" -AddressType "Commercial"
136136
137-
Update-AzDataBoxJob -Name "pwshTestSAssigned" -ResourceGroupName "resourceGroupName" -KeyEncryptionKey $keyEncryptionDetails -ContactDetail $contactDetail -ShippingAddress $ShippingDetails -EnableSystemAssignedIdentity:$true -UserAssignedIdentity "/subscriptions/SubscriptionId/resourceGroups/resourceGroupName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identityName"
137+
Update-AzDataBoxJob -Name "pwshTestSAssigned" -ResourceGroupName "resourceGroupName" -KeyEncryptionKey $keyEncryptionDetails -ContactDetail $contactDetail -ShippingAddress $ShippingDetails -EnableSystemAssignedIdentity $true -UserAssignedIdentity "/subscriptions/SubscriptionId/resourceGroups/resourceGroupName/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identityName"
138138
```
139139

140140
Update databox job from system assigned to user assigned with customer managed key encryption.

0 commit comments

Comments
 (0)