From 90273582ea749f78791b5e1fc34ce3b4afc75fed Mon Sep 17 00:00:00 2001 From: Yan Xu Date: Tue, 24 Dec 2024 13:39:10 +0800 Subject: [PATCH 1/2] update AzureFileAccountKey from String to SecureString --- src/App/App.Autorest/README.md | 3 +++ .../docs/New-AzContainerAppConnectedEnvStorage.md | 12 ++++++------ .../docs/New-AzContainerAppManagedEnvStorage.md | 12 ++++++------ .../docs/Update-AzContainerAppConnectedEnvStorage.md | 12 ++++++------ .../docs/Update-AzContainerAppManagedEnvStorage.md | 12 ++++++------ .../test/AzContainerAppConnectedEnvStorage.Tests.ps1 | 6 +++--- 6 files changed, 30 insertions(+), 27 deletions(-) diff --git a/src/App/App.Autorest/README.md b/src/App/App.Autorest/README.md index f5cad6265ad9..5a839fa01ec1 100644 --- a/src/App/App.Autorest/README.md +++ b/src/App/App.Autorest/README.md @@ -69,6 +69,9 @@ flatten-userassignedidentity: false disable-transform-identity-type: true directive: + - from: swagger-document + where: $.definitions.AzureFileProperties.properties.accountKey + transform: $["format"] = "password" - from: swagger-document where: $.definitions.Certificate.properties.properties.properties.password transform: >- diff --git a/src/App/App.Autorest/docs/New-AzContainerAppConnectedEnvStorage.md b/src/App/App.Autorest/docs/New-AzContainerAppConnectedEnvStorage.md index 1836c769d257..9eb91e5a8286 100644 --- a/src/App/App.Autorest/docs/New-AzContainerAppConnectedEnvStorage.md +++ b/src/App/App.Autorest/docs/New-AzContainerAppConnectedEnvStorage.md @@ -8,7 +8,7 @@ schema: 2.0.0 # New-AzContainerAppConnectedEnvStorage ## SYNOPSIS -Create storage for a connectedEnvironment. +create storage for a connectedEnvironment. ## SYNTAX @@ -16,21 +16,21 @@ Create storage for a connectedEnvironment. ``` New-AzContainerAppConnectedEnvStorage -ConnectedEnvironmentName -Name -ResourceGroupName [-SubscriptionId ] [-AzureFileAccessMode ] - [-AzureFileAccountKey ] [-AzureFileAccountName ] [-AzureFileShareName ] + [-AzureFileAccountKey ] [-AzureFileAccountName ] [-AzureFileShareName ] [-DefaultProfile ] [-Confirm] [-WhatIf] [] ``` ### CreateViaIdentityConnectedEnvironmentExpanded ``` New-AzContainerAppConnectedEnvStorage -ConnectedEnvironmentInputObject -Name - [-AzureFileAccessMode ] [-AzureFileAccountKey ] [-AzureFileAccountName ] + [-AzureFileAccessMode ] [-AzureFileAccountKey ] [-AzureFileAccountName ] [-AzureFileShareName ] [-DefaultProfile ] [-Confirm] [-WhatIf] [] ``` ### CreateViaIdentityExpanded ``` New-AzContainerAppConnectedEnvStorage -InputObject [-AzureFileAccessMode ] - [-AzureFileAccountKey ] [-AzureFileAccountName ] [-AzureFileShareName ] + [-AzureFileAccountKey ] [-AzureFileAccountName ] [-AzureFileShareName ] [-DefaultProfile ] [-Confirm] [-WhatIf] [] ``` @@ -49,7 +49,7 @@ New-AzContainerAppConnectedEnvStorage -ConnectedEnvironmentName -Name < ``` ## DESCRIPTION -Create storage for a connectedEnvironment. +create storage for a connectedEnvironment. ## EXAMPLES @@ -90,7 +90,7 @@ Accept wildcard characters: False Storage account key for azure file. ```yaml -Type: System.String +Type: System.Security.SecureString Parameter Sets: CreateExpanded, CreateViaIdentityConnectedEnvironmentExpanded, CreateViaIdentityExpanded Aliases: diff --git a/src/App/App.Autorest/docs/New-AzContainerAppManagedEnvStorage.md b/src/App/App.Autorest/docs/New-AzContainerAppManagedEnvStorage.md index dd6db3edc211..579595d60225 100644 --- a/src/App/App.Autorest/docs/New-AzContainerAppManagedEnvStorage.md +++ b/src/App/App.Autorest/docs/New-AzContainerAppManagedEnvStorage.md @@ -8,14 +8,14 @@ schema: 2.0.0 # New-AzContainerAppManagedEnvStorage ## SYNOPSIS -Create storage for a managedEnvironment. +create storage for a managedEnvironment. ## SYNTAX ### CreateExpanded (Default) ``` New-AzContainerAppManagedEnvStorage -EnvName -Name -ResourceGroupName - [-SubscriptionId ] [-AzureFileAccessMode ] [-AzureFileAccountKey ] + [-SubscriptionId ] [-AzureFileAccessMode ] [-AzureFileAccountKey ] [-AzureFileAccountName ] [-AzureFileShareName ] [-DefaultProfile ] [-Confirm] [-WhatIf] [] ``` @@ -23,14 +23,14 @@ New-AzContainerAppManagedEnvStorage -EnvName -Name -ResourceGr ### CreateViaIdentityExpanded ``` New-AzContainerAppManagedEnvStorage -InputObject [-AzureFileAccessMode ] - [-AzureFileAccountKey ] [-AzureFileAccountName ] [-AzureFileShareName ] + [-AzureFileAccountKey ] [-AzureFileAccountName ] [-AzureFileShareName ] [-DefaultProfile ] [-Confirm] [-WhatIf] [] ``` ### CreateViaIdentityManagedEnvironmentExpanded ``` New-AzContainerAppManagedEnvStorage -ManagedEnvironmentInputObject -Name - [-AzureFileAccessMode ] [-AzureFileAccountKey ] [-AzureFileAccountName ] + [-AzureFileAccessMode ] [-AzureFileAccountKey ] [-AzureFileAccountName ] [-AzureFileShareName ] [-DefaultProfile ] [-Confirm] [-WhatIf] [] ``` @@ -49,7 +49,7 @@ New-AzContainerAppManagedEnvStorage -EnvName -Name -ResourceGr ``` ## DESCRIPTION -Create storage for a managedEnvironment. +create storage for a managedEnvironment. ## EXAMPLES @@ -90,7 +90,7 @@ Accept wildcard characters: False Storage account key for azure file. ```yaml -Type: System.String +Type: System.Security.SecureString Parameter Sets: CreateExpanded, CreateViaIdentityExpanded, CreateViaIdentityManagedEnvironmentExpanded Aliases: diff --git a/src/App/App.Autorest/docs/Update-AzContainerAppConnectedEnvStorage.md b/src/App/App.Autorest/docs/Update-AzContainerAppConnectedEnvStorage.md index e4f41d7190f1..31a7cb6bcca2 100644 --- a/src/App/App.Autorest/docs/Update-AzContainerAppConnectedEnvStorage.md +++ b/src/App/App.Autorest/docs/Update-AzContainerAppConnectedEnvStorage.md @@ -8,7 +8,7 @@ schema: 2.0.0 # Update-AzContainerAppConnectedEnvStorage ## SYNOPSIS -Update storage for a connectedEnvironment. +update storage for a connectedEnvironment. ## SYNTAX @@ -16,26 +16,26 @@ Update storage for a connectedEnvironment. ``` Update-AzContainerAppConnectedEnvStorage -ConnectedEnvironmentName -Name -ResourceGroupName [-SubscriptionId ] [-AzureFileAccessMode ] - [-AzureFileAccountKey ] [-AzureFileAccountName ] [-AzureFileShareName ] + [-AzureFileAccountKey ] [-AzureFileAccountName ] [-AzureFileShareName ] [-DefaultProfile ] [-Confirm] [-WhatIf] [] ``` ### UpdateViaIdentityConnectedEnvironmentExpanded ``` Update-AzContainerAppConnectedEnvStorage -ConnectedEnvironmentInputObject -Name - [-AzureFileAccessMode ] [-AzureFileAccountKey ] [-AzureFileAccountName ] + [-AzureFileAccessMode ] [-AzureFileAccountKey ] [-AzureFileAccountName ] [-AzureFileShareName ] [-DefaultProfile ] [-Confirm] [-WhatIf] [] ``` ### UpdateViaIdentityExpanded ``` Update-AzContainerAppConnectedEnvStorage -InputObject [-AzureFileAccessMode ] - [-AzureFileAccountKey ] [-AzureFileAccountName ] [-AzureFileShareName ] + [-AzureFileAccountKey ] [-AzureFileAccountName ] [-AzureFileShareName ] [-DefaultProfile ] [-Confirm] [-WhatIf] [] ``` ## DESCRIPTION -Update storage for a connectedEnvironment. +update storage for a connectedEnvironment. ## EXAMPLES @@ -107,7 +107,7 @@ Accept wildcard characters: False Storage account key for azure file. ```yaml -Type: System.String +Type: System.Security.SecureString Parameter Sets: (All) Aliases: diff --git a/src/App/App.Autorest/docs/Update-AzContainerAppManagedEnvStorage.md b/src/App/App.Autorest/docs/Update-AzContainerAppManagedEnvStorage.md index bdfc2149975a..79fb7b13b6d8 100644 --- a/src/App/App.Autorest/docs/Update-AzContainerAppManagedEnvStorage.md +++ b/src/App/App.Autorest/docs/Update-AzContainerAppManagedEnvStorage.md @@ -8,14 +8,14 @@ schema: 2.0.0 # Update-AzContainerAppManagedEnvStorage ## SYNOPSIS -Update storage for a managedEnvironment. +update storage for a managedEnvironment. ## SYNTAX ### UpdateExpanded (Default) ``` Update-AzContainerAppManagedEnvStorage -EnvName -Name -ResourceGroupName - [-SubscriptionId ] [-AzureFileAccessMode ] [-AzureFileAccountKey ] + [-SubscriptionId ] [-AzureFileAccessMode ] [-AzureFileAccountKey ] [-AzureFileAccountName ] [-AzureFileShareName ] [-DefaultProfile ] [-Confirm] [-WhatIf] [] ``` @@ -23,19 +23,19 @@ Update-AzContainerAppManagedEnvStorage -EnvName -Name -Resourc ### UpdateViaIdentityExpanded ``` Update-AzContainerAppManagedEnvStorage -InputObject [-AzureFileAccessMode ] - [-AzureFileAccountKey ] [-AzureFileAccountName ] [-AzureFileShareName ] + [-AzureFileAccountKey ] [-AzureFileAccountName ] [-AzureFileShareName ] [-DefaultProfile ] [-Confirm] [-WhatIf] [] ``` ### UpdateViaIdentityManagedEnvironmentExpanded ``` Update-AzContainerAppManagedEnvStorage -ManagedEnvironmentInputObject -Name - [-AzureFileAccessMode ] [-AzureFileAccountKey ] [-AzureFileAccountName ] + [-AzureFileAccessMode ] [-AzureFileAccountKey ] [-AzureFileAccountName ] [-AzureFileShareName ] [-DefaultProfile ] [-Confirm] [-WhatIf] [] ``` ## DESCRIPTION -Update storage for a managedEnvironment. +update storage for a managedEnvironment. ## EXAMPLES @@ -107,7 +107,7 @@ Accept wildcard characters: False Storage account key for azure file. ```yaml -Type: System.String +Type: System.Security.SecureString Parameter Sets: (All) Aliases: diff --git a/src/App/App.Autorest/test/AzContainerAppConnectedEnvStorage.Tests.ps1 b/src/App/App.Autorest/test/AzContainerAppConnectedEnvStorage.Tests.ps1 index 9aa6056d1adc..e2a226da1536 100644 --- a/src/App/App.Autorest/test/AzContainerAppConnectedEnvStorage.Tests.ps1 +++ b/src/App/App.Autorest/test/AzContainerAppConnectedEnvStorage.Tests.ps1 @@ -21,7 +21,7 @@ Describe 'AzContainerAppConnectedEnvStorage' { It 'CreateExpanded' { { # $storageAccountKey = (Get-AzStorageAccountKey -ResourceGroupName $env.resourceGroupConnected -AccountName $env.storageAccount2).Value[0] - $storageAccountKey = "1234" + $storageAccountKey = "1234" | ConvertTo-SecureString -AsPlainText $config = New-AzContainerAppConnectedEnvStorage -ConnectedEnvironmentName $env.connectedEnv1 -ResourceGroupName $env.resourceGroupConnected -Name $env.connectedEnvStorage -AzureFileAccessMode 'ReadWrite' -AzureFileAccountKey $storageAccountKey -AzureFileAccountName azpstestsa -AzureFileShareName azps-rw-sharename $config.AzureFileShareName | Should -Be "azps-rw-sharename" @@ -45,7 +45,7 @@ Describe 'AzContainerAppConnectedEnvStorage' { It 'UpdateExpanded' { { # $storageAccountKey = (Get-AzStorageAccountKey -ResourceGroupName $env.resourceGroupConnected -AccountName $env.storageAccount2).Value[0] - $storageAccountKey = "1234" + $storageAccountKey = "1234" | ConvertTo-SecureString -AsPlainText $config = Update-AzContainerAppConnectedEnvStorage -ConnectedEnvironmentName $env.connectedEnv1 -ResourceGroupName $env.resourceGroupConnected -Name $env.connectedEnvStorage -AzureFileAccessMode 'ReadWrite' -AzureFileAccountKey $storageAccountKey -AzureFileAccountName azpstestsa -AzureFileShareName azps-rw-sharename $config.AzureFileShareName | Should -Be "azps-rw-sharename" @@ -56,7 +56,7 @@ Describe 'AzContainerAppConnectedEnvStorage' { It 'UpdateViaIdentityExpanded' { { # $storageAccountKey = (Get-AzStorageAccountKey -ResourceGroupName $env.resourceGroupConnected -AccountName $env.storageAccount2).Value[0] - $storageAccountKey = "1234" + $storageAccountKey = "1234" | ConvertTo-SecureString -AsPlainText $config = Get-AzContainerAppConnectedEnvStorage -ConnectedEnvironmentName $env.connectedEnv1 -ResourceGroupName $env.resourceGroupConnected -Name $env.connectedEnvStorage $config = Update-AzContainerAppConnectedEnvStorage -InputObject $config -AzureFileAccessMode 'ReadWrite' -AzureFileAccountKey $storageAccountKey -AzureFileAccountName azpstestsa -AzureFileShareName azps-rw-sharename From 79280848d2c44953434a1b7d9f38f17e4f444eaf Mon Sep 17 00:00:00 2001 From: Yan Xu Date: Tue, 24 Dec 2024 17:47:28 +0800 Subject: [PATCH 2/2] update test --- .../test/AzContainerAppManagedEnvStorage.Tests.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/App/App.Autorest/test/AzContainerAppManagedEnvStorage.Tests.ps1 b/src/App/App.Autorest/test/AzContainerAppManagedEnvStorage.Tests.ps1 index 09957c4f7abb..2acf5a385066 100644 --- a/src/App/App.Autorest/test/AzContainerAppManagedEnvStorage.Tests.ps1 +++ b/src/App/App.Autorest/test/AzContainerAppManagedEnvStorage.Tests.ps1 @@ -21,7 +21,7 @@ Describe 'AzContainerAppManagedEnvStorage' { It 'CreateExpanded' { { # $storageAccountKey = (Get-AzStorageAccountKey -ResourceGroupName $env.resourceGroupManaged -AccountName $env.storageAccount1).Value[0] - $storageAccountKey = "1234" + $storageAccountKey = "1234" | ConvertTo-SecureString -AsPlainText $config = New-AzContainerAppManagedEnvStorage -EnvName $env.managedEnv1 -ResourceGroupName $env.resourceGroupManaged -Name $env.managedEnvStorage -AzureFileAccessMode 'ReadWrite' -AzureFileAccountKey $storageAccountKey -AzureFileAccountName $env.storageAccount1 -AzureFileShareName azps-rw-sharename $config.AzureFileShareName | Should -Be "azps-rw-sharename" @@ -45,7 +45,7 @@ Describe 'AzContainerAppManagedEnvStorage' { It 'UpdateExpanded' { { # $storageAccountKey = (Get-AzStorageAccountKey -ResourceGroupName $env.resourceGroupManaged -AccountName $env.storageAccount1).Value[0] - $storageAccountKey = "1234" + $storageAccountKey = "1234" | ConvertTo-SecureString -AsPlainText $config = Update-AzContainerAppManagedEnvStorage -EnvName $env.managedEnv1 -ResourceGroupName $env.resourceGroupManaged -Name $env.managedEnvStorage -AzureFileAccessMode 'ReadWrite' -AzureFileAccountKey $storageAccountKey -AzureFileAccountName $env.storageAccount1 -AzureFileShareName azps-rw-sharename $config.AzureFileShareName | Should -Be "azps-rw-sharename" @@ -55,7 +55,7 @@ Describe 'AzContainerAppManagedEnvStorage' { It 'UpdateViaIdentityExpanded' { { # $storageAccountKey = (Get-AzStorageAccountKey -ResourceGroupName $env.resourceGroupManaged -AccountName $env.storageAccount1).Value[0] - $storageAccountKey = "1234" + $storageAccountKey = "1234" | ConvertTo-SecureString -AsPlainText $config = Get-AzContainerAppManagedEnvStorage -EnvName $env.managedEnv1 -ResourceGroupName $env.resourceGroupManaged -Name $env.managedEnvStorage $config = Update-AzContainerAppManagedEnvStorage -InputObject $config -AzureFileAccessMode 'ReadWrite' -AzureFileAccountKey $storageAccountKey -AzureFileAccountName $env.storageAccount1 -AzureFileShareName azps-rw-sharename