Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
29 changes: 0 additions & 29 deletions eng/pipelines/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,18 +110,6 @@ jobs:
testRunTitle: "$(OSName) Python $(PythonVersion) - legacy azure"
searchFolder: "$(TestFolder)/azure/legacy"

- script: |
cd $(TestFolder)/azure/low-level
tox -e ci
displayName: 'Execute low-level "azure" Tests - Python $(PythonVersion)'
condition: succeededOrFailed()
- task: PublishTestResults@2
condition: succeededOrFailed()
displayName: 'Publish low-level "azure" Test Results'
inputs:
testRunTitle: "$(OSName) Python $(PythonVersion) - low-level azure"
searchFolder: "$(TestFolder)/azure/low-level"

- script: |
cd $(TestFolder)/azure/version-tolerant
tox -e ci
Expand Down Expand Up @@ -157,18 +145,6 @@ jobs:
testRunTitle: "$(OSName) Python $(PythonVersion) - legacy vanilla"
searchFolder: "$(TestFolder)/vanilla/legacy"

- script: |
cd $(TestFolder)/vanilla/low-level
tox -e ci
displayName: 'Execute low level "vanilla" Tests - Python $(PythonVersion)'
condition: succeededOrFailed()
- task: PublishTestResults@2
displayName: 'Publish low level "vanilla" Test Results'
condition: succeededOrFailed()
inputs:
testRunTitle: "$(OSName) Python $(PythonVersion) - low level vanilla"
searchFolder: "$(TestFolder)/vanilla/low-level"

- script: |
cd $(TestFolder)/vanilla/version-tolerant
tox -e ci
Expand All @@ -193,11 +169,6 @@ jobs:
displayName: 'Mypy version-tolerant "vanilla" Tests - Python $(PythonVersion)'
condition: and(succeededOrFailed(), eq(variables['PythonVersion'], '3.10'))

- script: |
cd $(TestFolder)/dpg/low-level
tox -e ci
displayName: 'Execute low level update "dpg" Tests - Python $(PythonVersion)'
condition: succeededOrFailed()
- script: |
cd $(TestFolder)/dpg/version-tolerant
tox -e ci
Expand Down
15 changes: 0 additions & 15 deletions eng/pipelines/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,6 @@ steps:
tox -e ci
displayName: 'Execute legacy "azure" Tests - Python $(PythonVersion)'

- script: |
cd $(TestFolder)/azure/low-level
tox -e ci
displayName: 'Execute low level "azure" Tests - Python $(PythonVersion)'

- script: |
cd $(TestFolder)/azure/version-tolerant
tox -e ci
Expand All @@ -64,21 +59,11 @@ steps:
tox -e ci
displayName: 'Execute legacy "vanilla" Tests - Python $(PythonVersion)'

- script: |
cd $(TestFolder)/vanilla/low-level
tox -e ci
displayName: 'Execute low level "vanilla" Tests - Python $(PythonVersion)'

- script: |
cd $(TestFolder)/vanilla/version-tolerant
tox -e ci
displayName: 'Execute version tolerant "vanilla" Tests - Python $(PythonVersion)'

- script: |
cd $(TestFolder)/dpg/low-level
tox -e ci
displayName: 'Execute low level "dpg" Tests - Python $(PythonVersion)'

- script: |
cd $(TestFolder)/dpg/version-tolerant
tox -e ci
Expand Down
4 changes: 2 additions & 2 deletions eng/scripts/run_mypy.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ def _single_dir_mypy(mod):
"-t",
"--test-folder",
dest="test_folder",
help="The test folder we're in. Can be 'azure', 'llc', 'multiapi', or 'vanilla'",
help="The test folder we're in. Can be 'azure', 'multiapi', or 'vanilla'",
required=True,
)
parser.add_argument(
"-g",
"--generator",
dest="generator",
help="The generator we're using. Can be 'legacy', 'version-tolerant', or 'low-level'.",
help="The generator we're using. Can be 'legacy', 'version-tolerant'.",
required=True,
)
parser.add_argument(
Expand Down
2 changes: 1 addition & 1 deletion eng/scripts/run_pylint.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def _single_dir_pylint(mod):
"-g",
"--generator",
dest="generator",
help="The generator we're using. Can be 'legacy', 'version-tolerant', or 'low-level'.",
help="The generator we're using. Can be 'legacy', 'version-tolerant'.",
required=True,
)
parser.add_argument(
Expand Down
74 changes: 8 additions & 66 deletions tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ class _SwaggerGroup(str, Enum):
class _Generator(Enum):
LEGACY = "legacy"
VERSION_TOLERANT = "version_tolerant"
LOW_LEVEL_CLIENT = "low_level_client"

class Config(NamedTuple):
generator: _Generator
Expand Down Expand Up @@ -196,14 +195,9 @@ def _get_config(
else:
generation_section = "azure"

low_level_client = kwargs.pop("low_level_client", False)
version_tolerant = kwargs.pop("version_tolerant", False)

if low_level_client:
package_name += "LowLevel"
generation_section += "/low-level"
generator = _Generator.LOW_LEVEL_CLIENT
elif version_tolerant:
if version_tolerant:
package_name += "VersionTolerant"
generation_section += "/version-tolerant"
generator = _Generator.VERSION_TOLERANT
Expand All @@ -223,21 +217,17 @@ def _build_flags(
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, {}))
low_level_client = kwargs.get("low_level_client", False)
version_tolerant = kwargs.get("version_tolerant", False)
client_side_validation = package_name in _PACKAGES_WITH_CLIENT_SIDE_VALIDATION and not (low_level_client or version_tolerant)
client_side_validation = package_name in _PACKAGES_WITH_CLIENT_SIDE_VALIDATION and not version_tolerant
namespace = kwargs.pop("namespace", _OVERWRITE_DEFAULT_NAMESPACE.get(package_name, package_name.lower()))

generator, output_folder = _get_config(swagger_group, package_name, **kwargs)

if generator == _Generator.LOW_LEVEL_CLIENT:
override_flags["low-level-client"] = True
namespace += "lowlevel"
elif generator == _Generator.VERSION_TOLERANT:
namespace += "versiontolerant"
else:
if generator == _Generator.LEGACY:
override_flags["payload-flattening-threshold"] = 1
override_flags["version-tolerant"] = False
else:
namespace += "versiontolerant"

flags = {
"use": AUTOREST_DIR,
Expand Down Expand Up @@ -328,9 +318,7 @@ def _regenerate(
_run_autorest(post_process_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):
if kwargs.get("version_tolerant", False):
generator = _Generator.VERSION_TOLERANT
else:
generator = _Generator.LEGACY
Expand All @@ -348,30 +336,6 @@ def regenerate_vanilla_legacy(c, swagger_name=None, debug=False, **kwargs):
if not swagger_name:
regenerate_package_mode(c, swagger_group=_SwaggerGroup.VANILLA)

@task
def regenerate_dpg_low_level_client(c, swagger_name=None, debug=False, **kwargs):
return _prepare_mapping_and_regenerate(
c,
_DPG_SWAGGER_MAPPINGS,
_SwaggerGroup.DPG,
swagger_name,
debug,
low_level_client=True,
**kwargs
)

@task
def regenerate_vanilla_low_level_client(c, swagger_name=None, debug=False, **kwargs):
return _prepare_mapping_and_regenerate(
c,
_VANILLA_SWAGGER_MAPPINGS,
_SwaggerGroup.VANILLA,
swagger_name,
debug,
low_level_client=True,
**kwargs
)

@task
def regenerate_dpg_version_tolerant(c, swagger_name=None, debug=False, **kwargs):
_prepare_mapping_and_regenerate(
Expand Down Expand Up @@ -403,10 +367,6 @@ def regenerate_azure_legacy(c, swagger_name=None, debug=False, **kwargs):
regenerate_custom_poller_pager_legacy(c, debug)
regenerate_package_mode(c, swagger_group=_SwaggerGroup.AZURE)

@task
def regenerate_azure_low_level_client(c, swagger_name=None, debug=False, **kwargs):
return _prepare_mapping_and_regenerate(c, _AZURE_SWAGGER_MAPPINGS, _SwaggerGroup.AZURE, swagger_name, debug, low_level_client=True, **kwargs)

@task
def regenerate_azure_version_tolerant(c, swagger_name=None, debug=False, **kwargs):
_prepare_mapping_and_regenerate(c, _AZURE_SWAGGER_MAPPINGS, _SwaggerGroup.AZURE, swagger_name, debug, version_tolerant=True, **kwargs)
Expand All @@ -417,10 +377,6 @@ def regenerate_azure_version_tolerant(c, swagger_name=None, debug=False, **kwarg
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)

@task
def regenerate_azure_arm_low_level_client(c, swagger_name=None, debug=False, **kwargs):
return _prepare_mapping_and_regenerate(c, _AZURE_ARM_SWAGGER_MAPPINGS, _SwaggerGroup.AZURE_ARM, swagger_name, debug, low_level_client=True, **kwargs)

@task
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)
Expand All @@ -441,7 +397,6 @@ def regenerate(
swagger_name=None,
debug=False,
version_tolerant=False,
low_level_client=False,
legacy=False,
vanilla=False,
azure=False,
Expand All @@ -452,10 +407,9 @@ def regenerate(
raise ValueError("Can not specify legacy flag and dpg flag at the same time.")
generators = [
"version_tolerant" if version_tolerant else "",
"low_level_client" if low_level_client else "",
"legacy" if legacy else "",
]
generators = [g for g in generators if g] or ["legacy", "low_level_client", "version_tolerant"]
generators = [g for g in generators if g] or ["legacy", "version_tolerant"]
folders = [
"vanilla" if vanilla else "",
"azure" if azure else "",
Expand All @@ -466,7 +420,6 @@ def regenerate(
if not folder_flags:
mapping = {
"legacy": regenerate_legacy,
"low_level_client": regenerate_low_level_client,
"version_tolerant": regenerate_version_tolerant,
}
funcs = [mapping[g] for g in generators if g in mapping.keys()]
Expand All @@ -479,24 +432,13 @@ def regenerate(
("version_tolerant", "azure"): regenerate_azure_version_tolerant,
("version_tolerant", "azure_arm"): regenerate_azure_arm_version_tolerant,
("version_tolerant", "dpg"): regenerate_dpg_version_tolerant,
("low_level_client", "vanilla"): regenerate_vanilla_low_level_client,
("low_level_client", "azure"): regenerate_azure_low_level_client,
("low_level_client", "azure_arm"): regenerate_azure_arm_low_level_client,
("low_level_client", "dpg"): regenerate_dpg_low_level_client,
}
funcs = [
v for k, v in mapping.items() if k in itertools.product(generators, folder_flags)
]
for func in funcs:
func(c, swagger_name, debug)

@task
def regenerate_low_level_client(c, swagger_name=None, debug=False):
regenerate_dpg_low_level_client(c, swagger_name, debug)
regenerate_vanilla_low_level_client(c, swagger_name, debug)
regenerate_azure_low_level_client(c, swagger_name, debug)
regenerate_azure_arm_low_level_client(c, swagger_name, debug)

@task
def regenerate_version_tolerant(c, swagger_name=None, debug=False):
regenerate_dpg_version_tolerant(c, swagger_name, debug)
Expand All @@ -511,7 +453,7 @@ def test(c):
cmd = 'tox -e ci'

autorest_types = ["azure", "vanilla"]
gen_types = ["legacy", "low-level", "version-tolerant"]
gen_types = ["legacy", "version-tolerant"]
for autorest_type, gen_type in itertools.product(autorest_types, gen_types):
os.chdir(f"{base_dir}/test/{autorest_type}/{gen_type}")
c.run(cmd)
Expand Down
Empty file.
25 changes: 0 additions & 25 deletions test/azure/low-level/AcceptanceTests/asynctests/__init__.py

This file was deleted.

42 changes: 0 additions & 42 deletions test/azure/low-level/AcceptanceTests/asynctests/conftest.py

This file was deleted.

Loading