From 40566e3176cb6fbc9332fe8ea03d5a069d5ddf1f Mon Sep 17 00:00:00 2001 From: Bin Ma Date: Tue, 14 Jan 2020 16:21:45 +0800 Subject: [PATCH 1/2] Add example for container sas-definition --- .../cli/command_modules/keyvault/_help.py | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/keyvault/_help.py b/src/azure-cli/azure/cli/command_modules/keyvault/_help.py index a1c9d205cef..fbed875bcce 100644 --- a/src/azure-cli/azure/cli/command_modules/keyvault/_help.py +++ b/src/azure-cli/azure/cli/command_modules/keyvault/_help.py @@ -5,6 +5,7 @@ # -------------------------------------------------------------------------------------------- from knack.help_files import helps # pylint: disable=unused-import + # pylint: disable=line-too-long, too-many-lines helps['keyvault'] = """ @@ -208,22 +209,23 @@ examples: - name: Add a sas-definition for an account sas-token text: |4 + $sastoken = az storage account generate-sas --expiry 2020-01-01 --permissions rw --resource-types sco --services bfqt --https-only --account-name storageacct - $sastoken = az storage account generate-sas --expiry 2020-01-01 --permissions rw \\ - --resource-types sco --services bfqt --https-only --account-name storageacct \\ - --account-key 00000000 - - az keyvault storage sas-definition create --vault-name vault --account-name storageacct \\ - -n rwallserviceaccess --validity-period P2D --sas-type account --template-uri $sastoken + az keyvault storage sas-definition create --vault-name vault --account-name storageacct -n rwallserviceaccess --validity-period P2D --sas-type account --template-uri $sastoken - name: Add a sas-definition for a blob sas-token text: >4 - - $sastoken = az storage blob generate-sas --account-name storageacct --account-key 00000000 \\ -c container1 -n blob1 --https-only --permissions rw + $sastoken = az storage blob generate-sas --account-name storageacct -c container1 -n blob1 --https-only --permissions rw $url = az storage blob url --account-name storageacct -c container1 -n blob1 + az keyvault storage sas-definition create --vault-name vault --account-name storageacct -n rwblobaccess --validity-period P2D --sas-type service --template-uri $url?$sastoken + - name: Add a sas-definition for a container sas-token + text: >4 + $sastoken = az storage container generate-sas --account-name storageacct -n container1 --https-only --permissions rw + + $url = "https://{storage-account-name}.blob.core.windows.net/{container-name}" # The prefix of your blob url - az keyvault storage sas-definition create --vault-name vault --account-name storageacct \\ -n rwblobaccess --validity-period P2D --sas-type service --template-uri $url?$sastoken + az keyvault storage sas-definition create --vault-name vault --account-name storageacct -n rwcontaineraccess --validity-period P2D --sas-type service --template-uri $url?$sastoken """ helps['keyvault update'] = """ From 71a6f7e5e1a277d365331c8e24bf12969f11bcdb Mon Sep 17 00:00:00 2001 From: Bin Ma Date: Tue, 14 Jan 2020 16:41:19 +0800 Subject: [PATCH 2/2] Add `--account-key` param --- src/azure-cli/azure/cli/command_modules/keyvault/_help.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/keyvault/_help.py b/src/azure-cli/azure/cli/command_modules/keyvault/_help.py index fbed875bcce..a905b59c54e 100644 --- a/src/azure-cli/azure/cli/command_modules/keyvault/_help.py +++ b/src/azure-cli/azure/cli/command_modules/keyvault/_help.py @@ -5,7 +5,6 @@ # -------------------------------------------------------------------------------------------- from knack.help_files import helps # pylint: disable=unused-import - # pylint: disable=line-too-long, too-many-lines helps['keyvault'] = """ @@ -209,19 +208,19 @@ examples: - name: Add a sas-definition for an account sas-token text: |4 - $sastoken = az storage account generate-sas --expiry 2020-01-01 --permissions rw --resource-types sco --services bfqt --https-only --account-name storageacct + $sastoken = az storage account generate-sas --expiry 2020-01-01 --permissions rw --resource-types sco --services bfqt --https-only --account-name storageacct --account-key 00000000 az keyvault storage sas-definition create --vault-name vault --account-name storageacct -n rwallserviceaccess --validity-period P2D --sas-type account --template-uri $sastoken - name: Add a sas-definition for a blob sas-token text: >4 - $sastoken = az storage blob generate-sas --account-name storageacct -c container1 -n blob1 --https-only --permissions rw + $sastoken = az storage blob generate-sas --account-name storageacct --account-key 00000000 -c container1 -n blob1 --https-only --permissions rw $url = az storage blob url --account-name storageacct -c container1 -n blob1 az keyvault storage sas-definition create --vault-name vault --account-name storageacct -n rwblobaccess --validity-period P2D --sas-type service --template-uri $url?$sastoken - name: Add a sas-definition for a container sas-token text: >4 - $sastoken = az storage container generate-sas --account-name storageacct -n container1 --https-only --permissions rw + $sastoken = az storage container generate-sas --account-name storageacct --account-key 00000000 -n container1 --https-only --permissions rw $url = "https://{storage-account-name}.blob.core.windows.net/{container-name}" # The prefix of your blob url