Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use dict to handle generations #1200

Merged
merged 5 commits into from
Mar 23, 2022
Merged

use dict to handle generations #1200

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
335d6c6
use dict to handle generations
iscai-msft Mar 18, 2022
002d46e
try to fix 3.6
iscai-msft Mar 18, 2022
98fb0ce
switch to using copy of map
iscai-msft Mar 18, 2022
0ad2970
Merge branch 'autorestv3' of https://github.com/Azure/autorest.python…
iscai-msft Mar 22, 2022
d9d72ae
remove tasks function
iscai-msft Mar 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 64 additions & 61 deletions tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
# Licensed under the MIT License. See License.txt in the project root for
# license information.
# --------------------------------------------------------------------------
import copy
import itertools
from multiprocessing import Pool
import os
from typing import Any, Dict, Optional
from typing import Any, Dict, Optional, Union
from enum import Enum, auto
from colorama import init, Fore
from invoke import task, run
Expand All @@ -20,6 +21,11 @@ class _SwaggerGroup(str, Enum):
AZURE_ARM = "azure-arm"
DPG = "dpg"

class _Generator(Enum):
LEGACY = "legacy"
VERSION_TOLERANT = "version_tolerant"
LOW_LEVEL_CLIENT = "low_level_client"

_VANILLA_SWAGGER_MAPPINGS = {
'AdditionalProperties': 'additionalProperties.json',
'Anything': 'any-type.json',
Expand Down Expand Up @@ -71,7 +77,51 @@ class _SwaggerGroup(str, Enum):
'DPGServiceDrivenInitial': 'dpg-initial.json',
'DPGServiceDrivenUpdateOne': 'dpg-update1.json',
'DPGCustomizationInitial': 'dpg-customization.json',
'DPGCustomizationCustomized': 'dpg-customization.json'
'DPGCustomizationCustomized': 'dpg-customization.json',
}

_GENERATOR_SPECIFIC_TESTS = {
_Generator.LEGACY: {
_SwaggerGroup.VANILLA: {
"BodyComplexPythonThreeOnly": "body-complex.json",
'BodyArrayWithNamespaceFolders': 'body-array.json',
'BodyByteWithPackageName': 'body-byte.json',
'BodyArrayWithPythonThreeOperationFiles': 'body-array.json'
},
_SwaggerGroup.AZURE_ARM: {
'HeadWithAzureKeyCredentialPolicy': 'head.json',
}
},
_Generator.VERSION_TOLERANT: {
_SwaggerGroup.DPG: {
'DPGTestModels': 'dpg-customization.json',
}
},
}

_PACKAGE_NAME_TO_OVERRIDE_FLAGS: Dict[str, Dict[str, Union[bool, str]]] = {
'DPGTestModels': {
"models-mode": "msrest",
},
'BodyComplexPythonThreeOnly': {
"python3-only": True,
"namespace": "bodycomplexpython3only",
"package-name": "bodycomplexpython3only",
},
'BodyArrayWithNamespaceFolders': {
"namespace": "vanilla.body.array"
},
"BodyByteWithPackageName": {
"package-name": "package-name",
"override-client-name": "class_name"
},
"HeadWithAzureKeyCredentialPolicy": {
"credential-default-policy-type": "AzureKeyCredentialPolicy",
"credential-key-header-name": "Authorization"
},
"BodyArrayWithPythonThreeOperationFiles": {
"add-python3-operation-files": True
},
}

_AZURE_SWAGGER_MAPPINGS = {
Expand Down Expand Up @@ -130,7 +180,8 @@ def _build_flags(
) -> Dict[str, Any]:
autorest_dir = os.path.dirname(__file__)
testserver_dir = "node_modules/@microsoft.azure/autorest.testserver/swagger"

override_flags = override_flags or {}
override_flags.update(_PACKAGE_NAME_TO_OVERRIDE_FLAGS.get(package_name, {}))
if swagger_group == _SwaggerGroup.VANILLA:
generation_section = "vanilla"
elif swagger_group == _SwaggerGroup.DPG:
Expand Down Expand Up @@ -239,20 +290,24 @@ def _regenerate(
_run_autorest(cmds, debug=debug)

def _prepare_mapping_and_regenerate(c, mapping, swagger_group, swagger_name=None, debug=False, **kwargs):
if kwargs.get("low_level_client", False):
generator = _Generator.LOW_LEVEL_CLIENT
elif kwargs.get("version_tolerant", False):
generator = _Generator.VERSION_TOLERANT
else:
generator = _Generator.LEGACY
mapping_copy = copy.copy(mapping)
mapping_copy.update(_GENERATOR_SPECIFIC_TESTS.get(generator, {}).get(swagger_group, {}))
if swagger_name:
prepared_mapping = {k: v for k, v in mapping.items() if swagger_name.lower() in k.lower()}
prepared_mapping = {k: v for k, v in mapping_copy.items() if swagger_name.lower() in k.lower()}
else:
prepared_mapping = mapping
prepared_mapping = mapping_copy
_regenerate(prepared_mapping, debug, swagger_group=swagger_group, **kwargs)

@task
def regenerate_vanilla_legacy(c, swagger_name=None, debug=False, **kwargs):
_prepare_mapping_and_regenerate(c, _VANILLA_SWAGGER_MAPPINGS, _SwaggerGroup.VANILLA, swagger_name, debug, **kwargs)
if not swagger_name:
regenerate_namespace_folders_test(c, debug)
regenerate_package_name_setup_py(c, debug)
regenerate_with_python3_operation_files(c, debug)
regenerate_python3_only(c, debug)
regenerate_package_mode(c, swagger_group=_SwaggerGroup.VANILLA)

@task
Expand Down Expand Up @@ -290,8 +345,6 @@ def regenerate_dpg_version_tolerant(c, swagger_name=None, debug=False, **kwargs)
version_tolerant=True,
**kwargs
)
if not swagger_name:
regenerate_version_tolerant_with_models(c, debug)

@task
def regenerate_vanilla_version_tolerant(c, swagger_name=None, debug=False, **kwargs):
Expand Down Expand Up @@ -325,8 +378,6 @@ def regenerate_azure_version_tolerant(c, swagger_name=None, debug=False, **kwarg
@task
def regenerate_azure_arm_legacy(c, swagger_name=None, debug=False, **kwargs):
_prepare_mapping_and_regenerate(c, _AZURE_ARM_SWAGGER_MAPPINGS, _SwaggerGroup.AZURE_ARM, swagger_name, debug, **kwargs)
if not swagger_name:
regenerate_credential_default_policy(c, debug)

@task
def regenerate_azure_arm_low_level_client(c, swagger_name=None, debug=False, **kwargs):
Expand All @@ -336,32 +387,6 @@ def regenerate_azure_arm_low_level_client(c, swagger_name=None, debug=False, **k
def regenerate_azure_arm_version_tolerant(c, swagger_name=None, debug=False, **kwargs):
return _prepare_mapping_and_regenerate(c, _AZURE_ARM_SWAGGER_MAPPINGS, _SwaggerGroup.AZURE_ARM, swagger_name, debug, version_tolerant=True, **kwargs)

@task
def regenerate_namespace_folders_test(c, debug=False):
# regenerate a swagger (randomly chose BodyArray) to have a namespace length > 1
# to test pkgutil logic
mapping = {'BodyArrayWithNamespaceFolders': 'body-array.json'}
override_flags = {"namespace": "vanilla.body.array"}
_regenerate(mapping, debug, swagger_group=_SwaggerGroup.VANILLA, override_flags=override_flags)

@task
def regenerate_credential_default_policy(c, debug=False):
mapping = {'HeadWithAzureKeyCredentialPolicy': 'head.json'}
override_flags = {
"credential-default-policy-type": "AzureKeyCredentialPolicy",
"credential-key-header-name": "Authorization"
}
_regenerate(mapping, debug, swagger_group=_SwaggerGroup.AZURE_ARM, override_flags=override_flags)

@task
def regenerate_package_name_setup_py(c, debug=False):
mapping = {'BodyByteWithPackageName': 'body-byte.json'}
override_flags = {
"package-name": "package-name",
"override-client-name": "class_name"
}
_regenerate(mapping, debug, swagger_group=_SwaggerGroup.VANILLA, override_flags=override_flags)

@task
def regenerate_legacy(c, swagger_name=None, debug=False):
# regenerate expected code for tests
Expand Down Expand Up @@ -551,25 +576,3 @@ def regenerate_samples(c, debug=False):
cmd += " ".join(flag_strings)
cmds.append(cmd)
_run_autorest(cmds, debug)

@task
def regenerate_with_python3_operation_files(c, debug=False):
mapping = {'BodyArrayWithPythonThreeOperationFiles': 'body-array.json'}
override_flags = {"add-python3-operation-files": True}
_regenerate(mapping, debug, swagger_group=_SwaggerGroup.VANILLA, override_flags=override_flags)

@task
def regenerate_python3_only(c, debug=False):
mapping = {'BodyComplexPythonThreeOnly': 'body-complex.json'}
override_flags = {
"python3-only": True,
"namespace": "bodycomplexpython3only",
"package-name": "bodycomplexpython3only",
}
_regenerate(mapping, debug, swagger_group=_SwaggerGroup.VANILLA, override_flags=override_flags)

@task
def regenerate_version_tolerant_with_models(c, debug=False):
mapping = {'DPGTestModels': 'dpg-customization.json'}
override_flags = {"models-mode": "msrest"}
_regenerate(mapping, debug, swagger_group=_SwaggerGroup.DPG, override_flags=override_flags, version_tolerant=True)