CAE support

autorest/codegen/__init__.py

@@ -19,7 +19,7 @@
 
 def _get_credential_default_policy_type_has_async_version(credential_default_policy_type: str) -> bool:
     mapping = {
-        "BearerTokenCredentialPolicy": True,
+        "ARMChallengeAuthenticationPolicy": True,
         "AzureKeyCredentialPolicy": False
     }
     return mapping[credential_default_policy_type]
@@ -142,15 +142,15 @@ def _get_credential_param(self, azure_arm, credential, credential_default_policy
         credential_scopes = self._get_credential_scopes(credential)
         credential_key_header_name = self._autorestapi.get_value('credential-key-header-name')
 
-        if credential_default_policy_type == "BearerTokenCredentialPolicy":
+        if credential_default_policy_type == "ARMChallengeAuthenticationPolicy":
             if not credential_scopes:
                 if azure_arm:
                     credential_scopes = ["https://management.azure.com/.default"]
                 elif credential:
                     # If add-credential is specified, we still want to add a credential_scopes variable.
                     # Will make it an empty list so we can differentiate between this case and None
                     _LOGGER.warning(
-                        "You have default credential policy BearerTokenCredentialPolicy"
+                        "You have default credential policy ARMChallengeAuthenticationPolicy"
                         "but not the --credential-scopes flag set while generating non-management plane code. "
                         "This is not recommend because it forces the customer to pass credential scopes "
                         "through kwargs if they want to authenticate."
@@ -159,8 +159,8 @@ def _get_credential_param(self, azure_arm, credential, credential_default_policy
             if credential_key_header_name:
                 raise ValueError(
                     "You have passed in a credential key header name with default credential policy type "
-                    "BearerTokenCredentialPolicy. This is not allowed, since credential key header name is tied with "
-                    "AzureKeyCredentialPolicy. Instead, with this policy it is recommend you pass in "
+                    "ARMChallengeAuthenticationPolicy. This is not allowed, since credential key header name is tied "
+                    "with AzureKeyCredentialPolicy. Instead, with this policy it is recommend you pass in "
                     "--credential-scopes."
                 )
         else:
@@ -169,7 +169,7 @@ def _get_credential_param(self, azure_arm, credential, credential_default_policy
                 raise ValueError(
                     "You have passed in credential scopes with default credential policy type "
                     "AzureKeyCredentialPolicy. This is not allowed, since credential scopes is tied with "
-                    "BearerTokenCredentialPolicy. Instead, with this policy you must pass in "
+                    "ARMChallengeAuthenticationPolicy. Instead, with this policy you must pass in "
                     "--credential-key-header-name."
                 )
             if not credential_key_header_name:
@@ -182,19 +182,19 @@ def _get_credential_param(self, azure_arm, credential, credential_default_policy
     def _handle_default_authentication_policy(self, azure_arm, credential):
 
         passed_in_credential_default_policy_type = (
-            self._autorestapi.get_value("credential-default-policy-type") or "BearerTokenCredentialPolicy"
+            self._autorestapi.get_value("credential-default-policy-type") or "ARMChallengeAuthenticationPolicy"
         )
 
-        # right now, we only allow BearerTokenCredentialPolicy and AzureKeyCredentialPolicy
-        allowed_policies = ["BearerTokenCredentialPolicy", "AzureKeyCredentialPolicy"]
+        # right now, we only allow ARMChallengeAuthenticationPolicy and AzureKeyCredentialPolicy
+        allowed_policies = ["ARMChallengeAuthenticationPolicy", "AzureKeyCredentialPolicy"]
         try:
             credential_default_policy_type = [
                 cp for cp in allowed_policies if cp.lower() == passed_in_credential_default_policy_type.lower()
             ][0]
         except IndexError:
             raise ValueError(
                 "The credential you pass in with --credential-default-policy-type must be either "
-                "BearerTokenCredentialPolicy or AzureKeyCredentialPolicy"
+                "ARMChallengeAuthenticationPolicy or AzureKeyCredentialPolicy"
             )
 
         credential_scopes, credential_key_header_name = self._get_credential_param(

autorest/codegen/models/code_model.py

@@ -125,7 +125,7 @@ def add_credential_global_parameter(self) -> None:
         :rtype: None
         """
         credential_schema: Union[AzureKeyCredentialSchema, TokenCredentialSchema]
-        if self.options["credential_default_policy_type"] == "BearerTokenCredentialPolicy":
+        if self.options["credential_default_policy_type"] == "ARMChallengeAuthenticationPolicy":
             credential_schema = TokenCredentialSchema(async_mode=False)
         else:
             credential_schema = AzureKeyCredentialSchema()

autorest/codegen/serializers/general_serializer.py

@@ -18,7 +18,10 @@ def config_imports(code_model, global_parameters: ParameterList, async_mode: boo
     for gp in global_parameters:
         file_import.merge(gp.imports())
     if code_model.options["azure_arm"]:
-        file_import.add_from_import("azure.mgmt.core.policies", "ARMHttpLoggingPolicy", ImportType.AZURECORE)
+        async_policy = "ARMHttpLoggingPolicy, AsyncARMChallengeAuthenticationPolicy"
+        policy = "ARMHttpLoggingPolicy, ARMChallengeAuthenticationPolicy"
+        file_import.add_from_import("azure.mgmt.core.policies", async_policy if async_mode else policy,
+                                    ImportType.AZURECORE)
     return file_import
 
 
@@ -53,7 +56,7 @@ def _service_client_imports() -> FileImport:
 
         if (
             self.code_model.options['credential'] and
-            self.code_model.options['credential_default_policy_type'] == "BearerTokenCredentialPolicy"
+            self.code_model.options['credential_default_policy_type'] == "ARMChallengeAuthenticationPolicy"
         ):
             self._correct_credential_parameter()
 
@@ -75,7 +78,7 @@ def serialize_config_file(self) -> str:
 
         if (
             self.code_model.options['credential'] and
-            self.code_model.options['credential_default_policy_type'] == "BearerTokenCredentialPolicy"
+            self.code_model.options['credential_default_policy_type'] == "ARMChallengeAuthenticationPolicy"
         ):
             self._correct_credential_parameter()
 

autorest/codegen/serializers/metadata_serializer.py

@@ -143,7 +143,7 @@ def _is_paging(operation):
         async_global_parameters = self.code_model.global_parameters
         if (
             self.code_model.options['credential'] and
-            self.code_model.options['credential_default_policy_type'] == "BearerTokenCredentialPolicy"
+            self.code_model.options['credential_default_policy_type'] == "ARMChallengeAuthenticationPolicy"
         ):
             # this ensures that the TokenCredentialSchema showing up in the list of code model's global parameters
             # is sync. This way we only have to make a copy for an async_credential

autorest/codegen/templates/config.py.jinja2

@@ -80,6 +80,6 @@ class {{ code_model.class_name }}Configuration(Configuration):
         {% endif %}
         if self.credential and not self.authentication_policy:
         {% set credential_default_policy_type = ("Async" if (async_mode and code_model.options['credential_default_policy_type_has_async_version']) else "") + code_model.options['credential_default_policy_type'] %}
-        {% set credential_param_type = ("'" + code_model.options['credential_key_header_name'] + "', ") if code_model.options['credential_key_header_name'] else ("*self.credential_scopes, " if "BearerTokenCredentialPolicy" in credential_default_policy_type else "") %}
-            self.authentication_policy = policies.{{ credential_default_policy_type }}(self.credential, {{ credential_param_type if credential_param_type }}**kwargs)
+        {% set credential_param_type = ("'" + code_model.options['credential_key_header_name'] + "', ") if code_model.options['credential_key_header_name'] else ("*self.credential_scopes, " if "ARMChallengeAuthenticationPolicy" in credential_default_policy_type else "") %}
+            self.authentication_policy = {{ credential_default_policy_type }}(self.credential, {{ credential_param_type if credential_param_type }}**kwargs)
         {% endif %}

autorest/multiapi/templates/multiapi_config.py.jinja2

@@ -92,6 +92,6 @@ class {{ code_model.service_client.name }}Configuration(Configuration):
         {% endif %}
         if self.credential and not self.authentication_policy:
             {% set credential_default_policy_type = ("Async" if (async_mode and code_model.config.credential_default_policy_type_has_async_version) else "") + code_model.config.credential_default_policy_type %}
-            {% set credential_param_type = ("'" + code_model.config.credential_key_header_name + "', ") if code_model.config.credential_key_header_name else ("*self.credential_scopes, " if "BearerTokenCredentialPolicy" in credential_default_policy_type else "") %}
-            self.authentication_policy = policies.{{ credential_default_policy_type }}(self.credential, {{ credential_param_type if credential_param_type }}**kwargs)
+            {% set credential_param_type = ("'" + code_model.config.credential_key_header_name + "', ") if code_model.config.credential_key_header_name else ("*self.credential_scopes, " if "ARMChallengeAuthenticationPolicy" in credential_default_policy_type else "") %}
+            self.authentication_policy = {{ credential_default_policy_type }}(self.credential, {{ credential_param_type if credential_param_type }}**kwargs)
         {% endif %}