update

Author: njuCZ

src/containerapp/azext_containerapp/_help.py

@@ -715,7 +715,7 @@
   - name: Configure the app to listen to the forward headers X-FORWARDED-HOST and X-FORWARDED-PROTO.
     text: |
         az containerapp auth update -g myResourceGroup --name my-containerapp --proxy-convention Standard
-  - name: Configure the blob storage token store using system assigned managed identity to authenticate.
+  - name: Configure the blob storage token store using default system assigned managed identity to authenticate.
     text: |
         az containerapp auth update -g myResourceGroup --name my-containerapp --token-store true --blob-container-uri https://storageAccount1.blob.core.windows.net/container1
   - name: Configure the blob storage token store using user assigned managed identity to authenticate.

src/containerapp/azext_containerapp/_params.py

@@ -279,7 +279,7 @@ def load_arguments(self, _):
     with self.argument_context('containerapp auth') as c:
         c.argument('blob_container_uri', help='The URI of the blob storage containing the tokens. Should not be used along with sas_url_secret and sas_url_secret_name.', is_preview=True)
         c.argument('blob_container_identity', options_list=['--blob-container-identity', '--bci'],
-                   help='Resource ID of a managed identity to authenticate with Azure blob storage, or Empty to use a system-assigned identity.', is_preview=True)
+                   help='Default Empty to use system-assigned identity, or using Resource ID of a managed identity to authenticate with Azure blob storage.', is_preview=True)
 
     with self.argument_context('containerapp env workload-profile set') as c:
         c.argument('workload_profile_type', help="The type of workload profile to add or update. Run `az containerapp env workload-profile list-supported -l <region>` to check the options for your region.")

src/containerapp/azext_containerapp/containerapp_auth_decorator.py

@@ -73,14 +73,7 @@ def set_up_token_store(self):
         safe_set(self.existing_auth, "login", "tokenStore", "enabled", value=True)
         safe_set(self.existing_auth, "login", "tokenStore", "azureBlobStorage", value={})
 
-        param_provided = 0
-        if self.get_argument_sas_url_secret() is not None:
-            param_provided += 1
-        if self.get_argument_sas_url_secret_name() is not None:
-            param_provided += 1
-        if self.get_argument_blob_container_uri() is not None:
-            param_provided += 1
-
+        param_provided = sum(1 for param in [self.get_argument_sas_url_secret(), self.get_argument_sas_url_secret_name(), self.get_argument_blob_container_uri()] if param is not None)
         if param_provided != 1:
             raise ArgumentUsageError(
                 'Usage Error: only blob storage token store is supported. --sas-url-secret, --sas-url-secret-name and --blob-container-uri should provide exactly one when token store is enabled')
@@ -90,14 +83,11 @@ def set_up_token_store(self):
                     value=self.get_argument_blob_container_uri())
 
             identity = self.get_argument_blob_container_identity()
-            if identity is None:
-                identity = ""
-            identity = identity.lower()
-            if identity != "":
+            if identity is not None:
+                identity = identity.lower()
                 subscription_id = get_subscription_id(self.cmd.cli_ctx)
                 identity = _ensure_identity_resource_id(subscription_id, self.get_argument_resource_group_name(), identity)
-                safe_set(self.existing_auth, "login", "tokenStore", "azureBlobStorage", "managedIdentityResourceId",
-                    value=identity)
+                safe_set(self.existing_auth, "login", "tokenStore", "azureBlobStorage", "managedIdentityResourceId", value=identity)
             return
 
         sas_url_setting_name = BLOB_STORAGE_TOKEN_STORE_SECRET_SETTING_NAME