From b1ca1b7e45178702e604bd18bb879be9ba84c9e8 Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Fri, 28 Jan 2022 11:16:59 +0800 Subject: [PATCH 001/133] fix auto-ask-check bug --- scripts/release_issue_status/main.py | 22 +++++++------------ .../release_issue_status.yml | 6 +++++ .../release_issue_status/reply_generator.py | 3 ++- scripts/release_issue_status/requirement.txt | 3 +-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/scripts/release_issue_status/main.py b/scripts/release_issue_status/main.py index eff130e04ba5..f892a08eae46 100644 --- a/scripts/release_issue_status/main.py +++ b/scripts/release_issue_status/main.py @@ -7,9 +7,8 @@ import logging from github import Github -from azure.storage.blob import BlobClient +from reply_generator import AUTO_ASK_FOR_CHECK, begin_reply_generate -import reply_generator as rg from utils import update_issue_body, get_readme_and_output_folder, \ get_python_pipelines, get_pipeline_url, auto_close_issue @@ -144,7 +143,7 @@ def _latest_comment_time(comments, delay_from_create_date): return delay_from_create_date if not q else int((time.time() - q[-1][0]) / 3600 / 24) -def auto_reply(item, request_repo, rest_repo, sdk_repo, duplicated_issue, python_piplines, assigner_repoes): +def auto_reply(item, request_repo, rest_repo, duplicated_issue, python_piplines, assigner_repoes): logging.info("new issue number: {}".format(item.issue_object.number)) assigner_repo = assigner_repoes[item.assignee] if 'auto-link' not in item.labels: @@ -171,8 +170,7 @@ def auto_reply(item, request_repo, rest_repo, sdk_repo, duplicated_issue, python raise try: pipeline_url = get_pipeline_url(python_piplines, output_folder) - rg.begin_reply_generate(item=item, rest_repo=rest_repo, readme_link=readme_link, - pipeline_url=pipeline_url) + begin_reply_generate(item=item, rest_repo=rest_repo, readme_link=readme_link, pipeline_url=pipeline_url) if 'Configured' in item.labels: item.issue_object.remove_from_labels('Configured') except Exception as e: @@ -253,10 +251,11 @@ def main(): item.issue_object.add_to_assignees(_PYTHON_SDK_ASSIGNEES[assign_count]) item.assignee = item.issue_object.assignee.login item.issue_object.add_to_labels('assigned') - try: - auto_reply(item, request_repo, rest_repo, sdk_repo, duplicated_issue, python_piplines, assigner_repoes) - except Exception as e: - continue + if AUTO_ASK_FOR_CHECK not in item.labels: + try: + auto_reply(item, request_repo, rest_repo, duplicated_issue, python_piplines, assigner_repoes) + except Exception as e: + continue elif not item.author_latest_comment in _PYTHON_SDK_ADMINISTRATORS: item.bot_advice = 'new comment.
' if item.comment_num > 1 and item.language == 'Python': @@ -295,11 +294,6 @@ def main(): print_check('git commit -m \"update excel\"') print_check('git push -f origin HEAD') -# upload to storage account(it is created in advance) -# blob = BlobClient.from_connection_string(conn_str=os.getenv('CONN_STR'), container_name=os.getenv('FILE'), -# blob_name=_FILE_OUT) -# with open(_FILE_OUT, 'rb') as data: -# blob.upload_blob(data, overwrite=True) if __name__ == '__main__': main() diff --git a/scripts/release_issue_status/release_issue_status.yml b/scripts/release_issue_status/release_issue_status.yml index d79e7dd19b2d..2e384ec47b36 100644 --- a/scripts/release_issue_status/release_issue_status.yml +++ b/scripts/release_issue_status/release_issue_status.yml @@ -7,6 +7,12 @@ trigger: exclude: - '*' +# avoid being triggered as part of CI check +pr: + branches: + exclude: + - '*' + schedules: - cron: "0,30 1-9 * * *" displayName: Daily release diff --git a/scripts/release_issue_status/reply_generator.py b/scripts/release_issue_status/reply_generator.py index 3659f19bd33d..5a3ebc6b206c 100644 --- a/scripts/release_issue_status/reply_generator.py +++ b/scripts/release_issue_status/reply_generator.py @@ -6,6 +6,7 @@ logging.basicConfig(level=logging.INFO, format='[auto-reply log] - %(funcName)s[line:%(lineno)d] - %(levelname)s: %(message)s') +AUTO_ASK_FOR_CHECK = 'auto-ask-check' def readme_comparison(rest_repo, link_dict, labels): # to see whether need change readme @@ -68,6 +69,6 @@ def begin_reply_generate(item, rest_repo, readme_link, pipeline_url): logging.info(f'{issue_object_rg.number} run pipeline successfully') else: logging.info(f'{issue_object_rg.number} run pipeline fail') - issue_object_rg.add_to_labels('auto-ask-check') + issue_object_rg.add_to_labels(AUTO_ASK_FOR_CHECK) else: logging.info('issue {} need config readme'.format(issue_object_rg.number)) diff --git a/scripts/release_issue_status/requirement.txt b/scripts/release_issue_status/requirement.txt index 512d9702666a..95f800db46db 100644 --- a/scripts/release_issue_status/requirement.txt +++ b/scripts/release_issue_status/requirement.txt @@ -2,6 +2,5 @@ PyGithub datetime requests bs4 -azure.storage.blob==12.8.1 -azure-devops +azure-devops msrest From 5ae58ab80ac68b7f25e74ad99abe0b4e5894fc2a Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Wed, 16 Feb 2022 17:07:08 +0800 Subject: [PATCH 002/133] update comment --- scripts/auto_release/main.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 34e56022cd2e..eb2f1a746e27 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -410,6 +410,11 @@ def check_file(self): def sdk_code_path(self) -> str: return str(Path(f'sdk/{self.sdk_folder}/azure-mgmt-{self.package_name}')) + @property + def whether_single_path(self) -> bool: + path = sum([os.path.isdir(listx) for listx in os.listdir(str(Path(f'sdk/{self.sdk_folder}'))]) + return True if path==1 else False + @return_origin_path def install_package_locally(self): os.chdir(self.sdk_code_path()) @@ -454,6 +459,8 @@ def create_pr_proc(self): pr_head = "{}:{}".format(os.getenv('USR_NAME'), self.new_branch) pr_base = 'main' pr_body = "{} \n{} \n{}".format(self.issue_link, self.test_result, self.pipeline_link) + if not self.whether_single_path: + pr_body += f'\nBuildTargetingString: {self.package_name}\nSkip.CreateApiReview: true' res_create = api.pulls.create(pr_title, pr_head, pr_base, pr_body) # Add issue link on PR From 79a3594aad784b3da87b13f474d4679c18e53bda Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Wed, 16 Feb 2022 17:26:21 +0800 Subject: [PATCH 003/133] update comment --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index eb2f1a746e27..b8e4ef288b1f 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -412,7 +412,7 @@ def sdk_code_path(self) -> str: @property def whether_single_path(self) -> bool: - path = sum([os.path.isdir(listx) for listx in os.listdir(str(Path(f'sdk/{self.sdk_folder}'))]) + path = sum([os.path.isdir(listx) for listx in os.listdir(str(Path(f'sdk/{self.sdk_folder}')))]) return True if path==1 else False @return_origin_path From 7071377db0a8fcbdc037acc47beaed7ab13c0572 Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Thu, 17 Feb 2022 10:03:42 +0800 Subject: [PATCH 004/133] fix bug --- scripts/auto_release/main.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index b8e4ef288b1f..4e4aa35ca259 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -412,8 +412,9 @@ def sdk_code_path(self) -> str: @property def whether_single_path(self) -> bool: - path = sum([os.path.isdir(listx) for listx in os.listdir(str(Path(f'sdk/{self.sdk_folder}')))]) - return True if path==1 else False + path = str(Path(f'sdk/{self.sdk_folder}')) + num = sum([os.path.isdir(f'{path}/{listx}') for listx in os.listdir(path)]) + return True if num == 1 else False @return_origin_path def install_package_locally(self): @@ -460,7 +461,7 @@ def create_pr_proc(self): pr_base = 'main' pr_body = "{} \n{} \n{}".format(self.issue_link, self.test_result, self.pipeline_link) if not self.whether_single_path: - pr_body += f'\nBuildTargetingString: {self.package_name}\nSkip.CreateApiReview: true' + pr_body += f'\nBuildTargetingString\n azure-mgmt-{self.package_name}\nSkip.CreateApiReview\ntrue' res_create = api.pulls.create(pr_title, pr_head, pr_base, pr_body) # Add issue link on PR From 8f6fe79664db8c2957009fcc3058c85d68c3ccfd Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Thu, 17 Feb 2022 10:26:05 +0800 Subject: [PATCH 005/133] Update main.py --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 4e4aa35ca259..97620c4f9b64 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -414,7 +414,7 @@ def sdk_code_path(self) -> str: def whether_single_path(self) -> bool: path = str(Path(f'sdk/{self.sdk_folder}')) num = sum([os.path.isdir(f'{path}/{listx}') for listx in os.listdir(path)]) - return True if num == 1 else False + return num == 1 @return_origin_path def install_package_locally(self): From 8d23d87d7dea6d635316ac75fddc1f37aaeef644 Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Thu, 17 Feb 2022 10:44:21 +0800 Subject: [PATCH 006/133] Update main.py --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 97620c4f9b64..ef846cc0534a 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -413,7 +413,7 @@ def sdk_code_path(self) -> str: @property def whether_single_path(self) -> bool: path = str(Path(f'sdk/{self.sdk_folder}')) - num = sum([os.path.isdir(f'{path}/{listx}') for listx in os.listdir(path)]) + num = sum([os.path.isdir(str(Path(f'{path}/{listx}'))) for listx in os.listdir(path)]) return num == 1 @return_origin_path From 44faa80efb2b2b16c65e93f55df1432feb4cb8f1 Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Thu, 17 Feb 2022 10:46:51 +0800 Subject: [PATCH 007/133] Update main.py --- scripts/auto_release/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index ef846cc0534a..b6a791bda638 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -411,7 +411,7 @@ def sdk_code_path(self) -> str: return str(Path(f'sdk/{self.sdk_folder}/azure-mgmt-{self.package_name}')) @property - def whether_single_path(self) -> bool: + def is_single_path(self) -> bool: path = str(Path(f'sdk/{self.sdk_folder}')) num = sum([os.path.isdir(str(Path(f'{path}/{listx}'))) for listx in os.listdir(path)]) return num == 1 @@ -460,7 +460,7 @@ def create_pr_proc(self): pr_head = "{}:{}".format(os.getenv('USR_NAME'), self.new_branch) pr_base = 'main' pr_body = "{} \n{} \n{}".format(self.issue_link, self.test_result, self.pipeline_link) - if not self.whether_single_path: + if not self.is_single_path: pr_body += f'\nBuildTargetingString\n azure-mgmt-{self.package_name}\nSkip.CreateApiReview\ntrue' res_create = api.pulls.create(pr_title, pr_head, pr_base, pr_body) From 84768ebf73ec5cb679abd0a91a97651cb6ee2daf Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Fri, 18 Feb 2022 11:01:16 +0800 Subject: [PATCH 008/133] fix changelog format for new service --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index b6a791bda638..1b129be68cce 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -367,7 +367,7 @@ def edit_changelog_for_new_service(self): def edit_changelog_for_new_service_proc(content: List[str]): for i in range(0, len(content)): if '##' in content[i]: - content[i] = f'## {self.next_version}({current_time()})' + content[i] = f'## {self.next_version}({current_time()})\n\n' break modify_file(str(Path(self.sdk_code_path()) / 'CHANGELOG.md'), edit_changelog_for_new_service_proc) From 29f9a86b805ca6f507a0fde8fd6f70ea36d4c19d Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Fri, 18 Feb 2022 15:39:12 +0800 Subject: [PATCH 009/133] fix check_pprint_name bug --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 1b129be68cce..ea59218a1b1c 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -266,7 +266,7 @@ def edit_file_for_pprint_name(content: List[str]): for file in os.listdir(self.sdk_code_path()): if os.path.isfile(file): - modify_file(file, edit_file_for_pprint_name) + modify_file(str(Path(self.sdk_code_path()) / file), edit_file_for_pprint_name) log(f' replace \"MyService\" with \"{pprint_name}\" successfully ') def get_all_files_under_package_folder(self) -> List[str]: From 5b11c1267cd1e2f0480f0b8b67b3e021c9e4b042 Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Fri, 18 Feb 2022 17:14:49 +0800 Subject: [PATCH 010/133] Update main.py --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index ea59218a1b1c..f3b229318e8c 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -367,7 +367,7 @@ def edit_changelog_for_new_service(self): def edit_changelog_for_new_service_proc(content: List[str]): for i in range(0, len(content)): if '##' in content[i]: - content[i] = f'## {self.next_version}({current_time()})\n\n' + content[i] = f'## {self.next_version}({current_time()})\n' break modify_file(str(Path(self.sdk_code_path()) / 'CHANGELOG.md'), edit_changelog_for_new_service_proc) From 6b13133eb4920748e9d34d317117b5bec2d4aad9 Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Fri, 18 Feb 2022 17:35:29 +0800 Subject: [PATCH 011/133] fix check_pprint_name bug --- scripts/auto_release/main.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index ea59218a1b1c..5f56b69f5677 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -265,8 +265,9 @@ def edit_file_for_pprint_name(content: List[str]): content[i] = content[i].replace('MyService', pprint_name) for file in os.listdir(self.sdk_code_path()): - if os.path.isfile(file): - modify_file(str(Path(self.sdk_code_path()) / file), edit_file_for_pprint_name) + file_path = str(Path(self.sdk_code_path()) / file) + if os.path.isfile(file_path): + modify_file(file_path, edit_file_for_pprint_name) log(f' replace \"MyService\" with \"{pprint_name}\" successfully ') def get_all_files_under_package_folder(self) -> List[str]: From c53585bd9a43bb28d99907fe0c9a52692c7d4a9e Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Mon, 21 Feb 2022 10:02:18 +0800 Subject: [PATCH 012/133] Update main.py --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 89f44635cbf6..be3277b51dba 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -368,7 +368,7 @@ def edit_changelog_for_new_service(self): def edit_changelog_for_new_service_proc(content: List[str]): for i in range(0, len(content)): if '##' in content[i]: - content[i] = f'## {self.next_version}({current_time()})\n' + content[i] = f'## {self.next_version} ({current_time()})\n' break modify_file(str(Path(self.sdk_code_path()) / 'CHANGELOG.md'), edit_changelog_for_new_service_proc) From 90ab52db6e0b0bb00dc8b5ee0b3ae5e62b8b496e Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Fri, 4 Mar 2022 10:34:22 +0800 Subject: [PATCH 013/133] Update main.py --- scripts/auto_release/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index be3277b51dba..adeaa514a600 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -549,7 +549,8 @@ def create_pr(self): # commit all code print_exec('git add sdk/') print_exec('git commit -m \"code and test\"') - print_check('git push origin HEAD -f') + print_exec('git remote add azure https://github.com/Azure/azure-sdk-for-python.git') + print_check('git push azure HEAD -f') # create PR self.create_pr_proc() From c12493377629bfa23b137ce47bc4cbd3929c0742 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Wed, 9 Mar 2022 15:15:54 +0800 Subject: [PATCH 014/133] test --- scripts/auto_release/main.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index adeaa514a600..ae1ab4c4685a 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -44,6 +44,10 @@ def print_exec_output(cmd: str) -> List[str]: def print_check(cmd): log(cmd) subprocess.check_call(cmd, shell=True) + +def print_check_with_path(cmd, path): + log(cmd) + subprocess.check_call(cmd, shell=True, cwd=path) def preview_version_plus(preview_label: str, last_version: str) -> str: @@ -257,6 +261,11 @@ def edit_sdk_setup(content: List[str]): modify_file(str(Path(self.sdk_code_path()) / 'setup.py'), edit_sdk_setup) + # Use the template to update readme and setup by packaging_tools + def check_sdk_readme_and_setup(self): + path = self.sdk_folder + print_check_with_path(f'python -m packaging_tools --build-conf azure-mgmt-{self.package_name}',path) + def check_pprint_name(self): pprint_name = self.package_name.capitalize() @@ -403,6 +412,8 @@ def check_ci_file(self): def check_file(self): self.check_pprint_name() + # self.check_sdk_readme_and_setup() + print(f'**{self.sdk_folder=}') self.check_sdk_setup() self.check_version() self.check_changelog_file() From e6f89a28194227fc445630a5219d68e92b6b865c Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Wed, 9 Mar 2022 15:33:30 +0800 Subject: [PATCH 015/133] test --- scripts/auto_release/main.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index ae1ab4c4685a..f3bbf7354eba 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -263,8 +263,9 @@ def edit_sdk_setup(content: List[str]): # Use the template to update readme and setup by packaging_tools def check_sdk_readme_and_setup(self): - path = self.sdk_folder + path = str(Path(f'sdk/{self.sdk_folder}')) print_check_with_path(f'python -m packaging_tools --build-conf azure-mgmt-{self.package_name}',path) + log(f' packaging_tools --build-conf successfully ') def check_pprint_name(self): pprint_name = self.package_name.capitalize() @@ -412,9 +413,8 @@ def check_ci_file(self): def check_file(self): self.check_pprint_name() - # self.check_sdk_readme_and_setup() - print(f'**{self.sdk_folder=}') - self.check_sdk_setup() + self.check_sdk_readme_and_setup() + # self.check_sdk_setup() self.check_version() self.check_changelog_file() self.check_ci_file() From 76faf366ed883ff42f43201e443e42d529b97329 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Wed, 9 Mar 2022 15:38:38 +0800 Subject: [PATCH 016/133] change to azclibot --- scripts/auto_release/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index f3bbf7354eba..6c19b2ad524b 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -560,8 +560,8 @@ def create_pr(self): # commit all code print_exec('git add sdk/') print_exec('git commit -m \"code and test\"') - print_exec('git remote add azure https://github.com/Azure/azure-sdk-for-python.git') - print_check('git push azure HEAD -f') + print_exec('git remote add azclibot https://github.com/azclibot/azure-sdk-for-python.git') + print_check('git push azclibot HEAD -f') # create PR self.create_pr_proc() From ffb8635ac54beb77a939a8d6425d40449fa264a5 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Wed, 9 Mar 2022 16:03:04 +0800 Subject: [PATCH 017/133] change to azure --- scripts/auto_release/main.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 6c19b2ad524b..e7b3c1f1fd25 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -560,8 +560,9 @@ def create_pr(self): # commit all code print_exec('git add sdk/') print_exec('git commit -m \"code and test\"') - print_exec('git remote add azclibot https://github.com/azclibot/azure-sdk-for-python.git') - print_check('git push azclibot HEAD -f') + print_exec('git remote add azure https://github.com/azure/azure-sdk-for-python.git') + res1 = print_exec_output('git push azure HEAD -f') + print(f'{res1=}') # create PR self.create_pr_proc() From 40a0f7469c08c85052d1b7970a8b776b5b39a20f Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Wed, 9 Mar 2022 16:28:05 +0800 Subject: [PATCH 018/133] fix push --- scripts/auto_release/main.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index e7b3c1f1fd25..907319d6dd27 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -560,9 +560,7 @@ def create_pr(self): # commit all code print_exec('git add sdk/') print_exec('git commit -m \"code and test\"') - print_exec('git remote add azure https://github.com/azure/azure-sdk-for-python.git') - res1 = print_exec_output('git push azure HEAD -f') - print(f'{res1=}') + print_exec('git push origin HEAD -f') # create PR self.create_pr_proc() From 2f6b17443de2adc53d98e0663c596920e57c9cde Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Wed, 9 Mar 2022 16:55:04 +0800 Subject: [PATCH 019/133] test --- scripts/auto_release/main.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 907319d6dd27..f57c7fc22d08 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -85,8 +85,10 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): - usr = 'Azure' - branch = 'main' + # usr = 'Azure' + usr = 'azclibot' + # branch = 'main' + branch = 't2-advisor-2022-03-09-54263' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') From d5ce82678a6873af4ecb7add4e8d357aa80cddf2 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Wed, 9 Mar 2022 17:16:59 +0800 Subject: [PATCH 020/133] update --- scripts/auto_release/main.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index f57c7fc22d08..840d003da8f6 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -85,10 +85,8 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): - # usr = 'Azure' - usr = 'azclibot' - # branch = 'main' - branch = 't2-advisor-2022-03-09-54263' + usr = 'Azure' + branch = 'main' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') @@ -416,7 +414,6 @@ def check_ci_file(self): def check_file(self): self.check_pprint_name() self.check_sdk_readme_and_setup() - # self.check_sdk_setup() self.check_version() self.check_changelog_file() self.check_ci_file() @@ -562,7 +559,7 @@ def create_pr(self): # commit all code print_exec('git add sdk/') print_exec('git commit -m \"code and test\"') - print_exec('git push origin HEAD -f') + print_check('git push origin HEAD -f') # create PR self.create_pr_proc() From 79a553e181ba5df0ff1df165259a6804c5dbb7f3 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Wed, 9 Mar 2022 17:35:48 +0800 Subject: [PATCH 021/133] update --- scripts/auto_release/main.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 840d003da8f6..3d56acdb7b67 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -44,10 +44,6 @@ def print_exec_output(cmd: str) -> List[str]: def print_check(cmd): log(cmd) subprocess.check_call(cmd, shell=True) - -def print_check_with_path(cmd, path): - log(cmd) - subprocess.check_call(cmd, shell=True, cwd=path) def preview_version_plus(preview_label: str, last_version: str) -> str: @@ -262,9 +258,10 @@ def edit_sdk_setup(content: List[str]): modify_file(str(Path(self.sdk_code_path()) / 'setup.py'), edit_sdk_setup) # Use the template to update readme and setup by packaging_tools + @return_origin_path def check_sdk_readme_and_setup(self): - path = str(Path(f'sdk/{self.sdk_folder}')) - print_check_with_path(f'python -m packaging_tools --build-conf azure-mgmt-{self.package_name}',path) + os.chdir(Path(f'sdk/{self.sdk_folder}')) + print_check(f'python -m packaging_tools --build-conf azure-mgmt-{self.package_name}') log(f' packaging_tools --build-conf successfully ') def check_pprint_name(self): @@ -414,6 +411,8 @@ def check_ci_file(self): def check_file(self): self.check_pprint_name() self.check_sdk_readme_and_setup() + self.check_sdk_readme() + self.check_sdk_setup() self.check_version() self.check_changelog_file() self.check_ci_file() From ec747f10069fc9a93a933dc1873cc3d21b626a3e Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Wed, 9 Mar 2022 17:36:48 +0800 Subject: [PATCH 022/133] test --- scripts/auto_release/main.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 3d56acdb7b67..301eb40de681 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -81,8 +81,10 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): - usr = 'Azure' - branch = 'main' + # usr = 'Azure' + # branch = 'main' + usr = 'azclibot' + branch = 't2-advisor-2022-03-09-54263' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') From 6f51fc8d963e90275e951bbc9deac79d04aa25d7 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Wed, 9 Mar 2022 17:48:34 +0800 Subject: [PATCH 023/133] test --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 301eb40de681..b58cec549b3e 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -241,7 +241,7 @@ def prepare_branch(self): # self.prepare_branch_with_base_branch() def check_sdk_readme(self): - sdk_readme = str(Path(f'sdk/{self.sdk_folder}/{self.package_name}/README.md')) + sdk_readme = str(Path(f'sdk/{self.sdk_folder}/azure-mgmt-{self.package_name}/README.md')) def edit_sdk_readme(content: List[str]): for i in range(0, len(content)): From 7107723a4d1ada144363da3cb3e0e03cecbb426a Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Wed, 9 Mar 2022 17:57:28 +0800 Subject: [PATCH 024/133] reduction --- scripts/auto_release/main.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index b58cec549b3e..347e9c4bc671 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -81,10 +81,8 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): - # usr = 'Azure' - # branch = 'main' - usr = 'azclibot' - branch = 't2-advisor-2022-03-09-54263' + usr = 'Azure' + branch = 'main' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') From 6885266bf40f30462904c8720dcdfb60e4dfb06d Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Fri, 11 Mar 2022 10:35:37 +0800 Subject: [PATCH 025/133] update main --- scripts/auto_release/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 347e9c4bc671..86667e0648aa 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -259,7 +259,7 @@ def edit_sdk_setup(content: List[str]): # Use the template to update readme and setup by packaging_tools @return_origin_path - def check_sdk_readme_and_setup(self): + def check_file_with_packaging_tool(self): os.chdir(Path(f'sdk/{self.sdk_folder}')) print_check(f'python -m packaging_tools --build-conf azure-mgmt-{self.package_name}') log(f' packaging_tools --build-conf successfully ') @@ -409,8 +409,8 @@ def check_ci_file(self): self.check_ci_file_proc('azure-mgmt-core>=1.3.0,<2.0.0') def check_file(self): + self.check_file_with_packaging_tool() self.check_pprint_name() - self.check_sdk_readme_and_setup() self.check_sdk_readme() self.check_sdk_setup() self.check_version() From 6c9bbbd6d39b9511ff5cece8fc7b7a78eb09f6bf Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Fri, 11 Mar 2022 13:26:47 +0800 Subject: [PATCH 026/133] delete f --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 86667e0648aa..1eba85942dde 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -262,7 +262,7 @@ def edit_sdk_setup(content: List[str]): def check_file_with_packaging_tool(self): os.chdir(Path(f'sdk/{self.sdk_folder}')) print_check(f'python -m packaging_tools --build-conf azure-mgmt-{self.package_name}') - log(f' packaging_tools --build-conf successfully ') + log(' packaging_tools --build-conf successfully ') def check_pprint_name(self): pprint_name = self.package_name.capitalize() From c2cb7e410d7bcda61ddc240e5a26a6ab0c0316c2 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Mon, 28 Mar 2022 10:13:52 +0800 Subject: [PATCH 027/133] Update main.py --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 1eba85942dde..ed36d5c9cd93 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -262,7 +262,7 @@ def edit_sdk_setup(content: List[str]): def check_file_with_packaging_tool(self): os.chdir(Path(f'sdk/{self.sdk_folder}')) print_check(f'python -m packaging_tools --build-conf azure-mgmt-{self.package_name}') - log(' packaging_tools --build-conf successfully ') + log('packaging_tools --build-conf successfully ') def check_pprint_name(self): pprint_name = self.package_name.capitalize() From 5164abe59c5c24f5dc00370d24bc09827218fcaf Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Mon, 28 Mar 2022 10:40:56 +0800 Subject: [PATCH 028/133] test --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index ed36d5c9cd93..633f884f6e26 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -82,7 +82,7 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): usr = 'Azure' - branch = 'main' + branch = 'test_autorest_03_18' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') From cdb30c42eb9c87048c722ef398bd27fd5550e654 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Mon, 28 Mar 2022 11:22:00 +0800 Subject: [PATCH 029/133] test --- scripts/auto_release/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 633f884f6e26..9655fd7e980d 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -173,10 +173,10 @@ def generate_code(self): # prepare input data input_data = { - 'headSha': self.get_latest_commit_in_swagger_repo(), + 'headSha': '90985ff9930614361e97034b3f149ea73efec6cb', 'repoHttpsUrl': "https://github.com/Azure/azure-rest-api-specs", - 'specFolder': self.spec_repo, - 'relatedReadmeMdFiles': [str(self.readme_local_folder())] + 'specFolder': 'https://github.com/Azure/azure-rest-api-specs/blob/main/specification/hdinsight/resource-manager/readme.md', + 'relatedReadmeMdFiles': ['specification/hdinsight/resource-manager/readme.md'] } self.autorest_result = str(Path(os.getenv('TEMP_FOLDER')) / 'temp.json') From e173adc9f1f872a55b9819e623b80c4d427883a4 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Mon, 28 Mar 2022 14:19:34 +0800 Subject: [PATCH 030/133] test --- scripts/auto_release/main.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 9655fd7e980d..40c98b38579b 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -173,10 +173,23 @@ def generate_code(self): # prepare input data input_data = { - 'headSha': '90985ff9930614361e97034b3f149ea73efec6cb', - 'repoHttpsUrl': "https://github.com/Azure/azure-rest-api-specs", - 'specFolder': 'https://github.com/Azure/azure-rest-api-specs/blob/main/specification/hdinsight/resource-manager/readme.md', - 'relatedReadmeMdFiles': ['specification/hdinsight/resource-manager/readme.md'] + "dryRun": False, + "specFolder": "../azure-rest-api-specs", + "headSha": "9ac082c33a7d0d8fa6768bd64e53394ada9baaf9", + "headRef": "master", + "repoHttpsUrl": "https://github.com/Azure/azure-rest-api-specs", + "trigger": "continuousIntegration", + "changedFiles": [ + "specification/hdinsight/resource-manager/readme.python.md" + ], "relatedReadmeMdFiles": [ + "specification/hdinsight/resource-manager/readme.md" + ], + "installInstructionInput": { + "isPublic": False, + "downloadUrlPrefix": "https://portal.azure-devex-tools.com/api/sdk-dl-pub?p=Azure/13991/azure-sdk-for-python-track2/", + "downloadCommandTemplate": "curl -L \"{URL}\" -o {FILENAME}", + "trigger": "continuousIntegration" + } } self.autorest_result = str(Path(os.getenv('TEMP_FOLDER')) / 'temp.json') From 04baa8aaa7a2e3d869e1d17fcff636f605ce0da8 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Mon, 28 Mar 2022 15:02:25 +0800 Subject: [PATCH 031/133] Update PythonSdkLiveTest.yml for Azure Pipelines --- scripts/auto_release/PythonSdkLiveTest.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index c5b16b57b579..65e726c948c0 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -46,6 +46,8 @@ jobs: if [ "$(SPEC_README)" ]; then mkdir azure-rest-api-specs git clone https://github.com/Azure/azure-rest-api-specs.git $(pwd)/azure-rest-api-specs + git fetch origin test-hdinsight-03-17 + git checkout test-hdinsight-03-17 # install autorest sudo npm install -g n From 2a9f585748806276422a01c4ea29fbab21d706e6 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Mon, 28 Mar 2022 15:41:07 +0800 Subject: [PATCH 032/133] Update PythonSdkLiveTest.yml for Azure Pipelines --- scripts/auto_release/PythonSdkLiveTest.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index 65e726c948c0..a9b389822f09 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -46,8 +46,10 @@ jobs: if [ "$(SPEC_README)" ]; then mkdir azure-rest-api-specs git clone https://github.com/Azure/azure-rest-api-specs.git $(pwd)/azure-rest-api-specs + cd azure-rest-api-specs git fetch origin test-hdinsight-03-17 git checkout test-hdinsight-03-17 + cd .. # install autorest sudo npm install -g n From 8b71e0484c96d25d4fc0cf411e19f75f7ab4c23f Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Sat, 7 May 2022 17:44:23 +0800 Subject: [PATCH 033/133] remove surplus code --- scripts/auto_release/main.py | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index ed36d5c9cd93..52537517baaf 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -149,6 +149,7 @@ def __init__(self): self.pr_number = 0 self.container_name = '' self.private_package_link = [] # List[str] + self.tag_is_stable = False @return_origin_path def get_latest_commit_in_swagger_repo(self) -> str: @@ -183,9 +184,13 @@ def generate_code(self): with open(self.autorest_result, 'w') as file: json.dump(input_data, file) - # generate code + # generate code(be careful about the order) print_exec('python scripts/dev_setup.py -p azure-core') print_check(f'python -m packaging_tools.auto_codegen {self.autorest_result} {self.autorest_result}') + + self.tag_is_stable = self.get_autorest_result()["packages"][0]["tagIsStable"] + log(f"tag_is_stable is {self.tag_is_stable}") + print_check(f'python -m packaging_tools.auto_package {self.autorest_result} {self.autorest_result}') def get_package_name_with_autorest_result(self): @@ -282,33 +287,8 @@ def get_all_files_under_package_folder(self) -> List[str]: all_files(self.sdk_code_path(), files) return files - def judge_tag(self) -> bool: - files = self.get_all_files_under_package_folder() - default_api_version = '' # for multi-api - api_version = '' # for single-api - for file in files: - if '.py' not in file or '.pyc' in file: - continue - try: - with open(file, 'r') as file_in: - list_in = file_in.readlines() - except: - _LOG.info(f'can not open {file}') - continue - - for line in list_in: - if line.find('DEFAULT_API_VERSION = ') > -1: - default_api_version += line.split('=')[-1].strip('\n') # collect all default api version - if default_api_version == '' and line.find('api_version = ') > -1: - api_version += line.split('=')[-1].strip('\n') # collect all single api version - if default_api_version != '': - log(f'find default api version:{default_api_version}') - return 'preview' in default_api_version - log(f'find single api version:{api_version}') - return 'preview' in api_version - def calculate_next_version_proc(self, last_version: str): - preview_tag = self.judge_tag() + preview_tag = not self.tag_is_stable changelog = self.get_changelog() if changelog == '': return '0.0.0' From 68a527350a5e4f92994561cca78cc296d06de8e0 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Wed, 18 May 2022 11:00:33 +0800 Subject: [PATCH 034/133] Update PythonSdkLiveTest.yml for Azure Pipelines --- scripts/auto_release/PythonSdkLiveTest.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index a9b389822f09..522daee096af 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -47,8 +47,9 @@ jobs: mkdir azure-rest-api-specs git clone https://github.com/Azure/azure-rest-api-specs.git $(pwd)/azure-rest-api-specs cd azure-rest-api-specs - git fetch origin test-hdinsight-03-17 - git checkout test-hdinsight-03-17 + git remote add test https://github.com/openapi-env-test/azure-rest-api-specs.git + git fetch test bigcat/test-cosmos2 + git checkout bigcat/test-cosmos2 cd .. # install autorest From a517b293a484e81d3ee15b96648388d6b688beda Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Wed, 18 May 2022 11:02:33 +0800 Subject: [PATCH 035/133] Update main.py --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 40c98b38579b..223d25a22910 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -82,7 +82,7 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): usr = 'Azure' - branch = 'test_autorest_03_18' + branch = 'code-report-update-comparision-category' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') From 3841e3265f22fb6ca882bdd31d59bc8c70a89a31 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Wed, 18 May 2022 11:06:33 +0800 Subject: [PATCH 036/133] Update main.py --- scripts/auto_release/main.py | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 223d25a22910..65741b5e814a 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -173,22 +173,10 @@ def generate_code(self): # prepare input data input_data = { - "dryRun": False, - "specFolder": "../azure-rest-api-specs", - "headSha": "9ac082c33a7d0d8fa6768bd64e53394ada9baaf9", - "headRef": "master", - "repoHttpsUrl": "https://github.com/Azure/azure-rest-api-specs", - "trigger": "continuousIntegration", - "changedFiles": [ - "specification/hdinsight/resource-manager/readme.python.md" - ], "relatedReadmeMdFiles": [ - "specification/hdinsight/resource-manager/readme.md" - ], - "installInstructionInput": { - "isPublic": False, - "downloadUrlPrefix": "https://portal.azure-devex-tools.com/api/sdk-dl-pub?p=Azure/13991/azure-sdk-for-python-track2/", - "downloadCommandTemplate": "curl -L \"{URL}\" -o {FILENAME}", - "trigger": "continuousIntegration" + 'headSha': self.get_latest_commit_in_swagger_repo(), + 'repoHttpsUrl': "https://github.com/Azure/azure-rest-api-specs", + 'specFolder': self.spec_repo, + 'relatedReadmeMdFiles': [str(self.readme_local_folder())] } } From 2fdba355b77cae817455ce4d1d0f85f21fca91b9 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Wed, 18 May 2022 11:12:14 +0800 Subject: [PATCH 037/133] Update main.py --- scripts/auto_release/main.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 65741b5e814a..9ffa8aa98ddc 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -177,7 +177,6 @@ def generate_code(self): 'repoHttpsUrl': "https://github.com/Azure/azure-rest-api-specs", 'specFolder': self.spec_repo, 'relatedReadmeMdFiles': [str(self.readme_local_folder())] - } } self.autorest_result = str(Path(os.getenv('TEMP_FOLDER')) / 'temp.json') From 3ad0f6437e8a02433827f70e030e3f9615ddad44 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Wed, 18 May 2022 14:41:46 +0800 Subject: [PATCH 038/133] Update main.py --- scripts/auto_release/main.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 9ffa8aa98ddc..127e6b9c7d10 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -173,10 +173,23 @@ def generate_code(self): # prepare input data input_data = { - 'headSha': self.get_latest_commit_in_swagger_repo(), - 'repoHttpsUrl': "https://github.com/Azure/azure-rest-api-specs", - 'specFolder': self.spec_repo, - 'relatedReadmeMdFiles': [str(self.readme_local_folder())] + "dryRun": False, + "specFolder": "../azure-rest-api-specs", + "headSha": "c6ed0986c1ee45df5c8f2bc56f2a9e802b01d2b0", + "headRef": "master", + "repoHttpsUrl": "https://github.com/Azure/azure-rest-api-specs", + "trigger": "continuousIntegration", + "changedFiles": [ + "specification/cosmos-db/resource-manager/readme.python.md" + ], "relatedReadmeMdFiles": [ + "specification/cosmos-db/resource-manager/readme.md" + ], + "installInstructionInput": { + "isPublic": False, + "downloadUrlPrefix": "https://portal.azure-devex-tools.com/api/sdk-dl-pub?p=Azure/13991/azure-sdk-for-python-track2/", + "downloadCommandTemplate": "curl -L \"{URL}\" -o {FILENAME}", + "trigger": "continuousIntegration" + } } self.autorest_result = str(Path(os.getenv('TEMP_FOLDER')) / 'temp.json') From a32eac743349b76c3ef1eb39b30abcd27c51c2c4 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Wed, 18 May 2022 17:33:05 +0800 Subject: [PATCH 039/133] Update main.py --- scripts/auto_release/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 127e6b9c7d10..88a159f2a23c 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -173,7 +173,7 @@ def generate_code(self): # prepare input data input_data = { - "dryRun": False, + "dryRun": false, "specFolder": "../azure-rest-api-specs", "headSha": "c6ed0986c1ee45df5c8f2bc56f2a9e802b01d2b0", "headRef": "master", @@ -185,7 +185,7 @@ def generate_code(self): "specification/cosmos-db/resource-manager/readme.md" ], "installInstructionInput": { - "isPublic": False, + "isPublic": false, "downloadUrlPrefix": "https://portal.azure-devex-tools.com/api/sdk-dl-pub?p=Azure/13991/azure-sdk-for-python-track2/", "downloadCommandTemplate": "curl -L \"{URL}\" -o {FILENAME}", "trigger": "continuousIntegration" From 7148c2a78a845fa4a15b0f3bf4b5ec76cc9556de Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Wed, 18 May 2022 17:41:44 +0800 Subject: [PATCH 040/133] Update main.py --- scripts/auto_release/main.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 88a159f2a23c..14a605b8b3fb 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -173,8 +173,9 @@ def generate_code(self): # prepare input data input_data = { - "dryRun": false, + "dryRun": False, "specFolder": "../azure-rest-api-specs", + "packageName": "azure-mgmt-cosmosdb", "headSha": "c6ed0986c1ee45df5c8f2bc56f2a9e802b01d2b0", "headRef": "master", "repoHttpsUrl": "https://github.com/Azure/azure-rest-api-specs", @@ -185,7 +186,7 @@ def generate_code(self): "specification/cosmos-db/resource-manager/readme.md" ], "installInstructionInput": { - "isPublic": false, + "isPublic": False, "downloadUrlPrefix": "https://portal.azure-devex-tools.com/api/sdk-dl-pub?p=Azure/13991/azure-sdk-for-python-track2/", "downloadCommandTemplate": "curl -L \"{URL}\" -o {FILENAME}", "trigger": "continuousIntegration" From 6d1fbbb363c0e441576ff5feeece4c1c1d470533 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Thu, 19 May 2022 13:36:28 +0800 Subject: [PATCH 041/133] Update main.py --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 14a605b8b3fb..353f976a4a4f 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -82,7 +82,7 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): usr = 'Azure' - branch = 'code-report-update-comparision-category' + branch = 'code-report-update-comparision-category-test1' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') From e0083153f028dea4ad60c7940c6d3843b8fe8329 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Thu, 19 May 2022 14:53:35 +0800 Subject: [PATCH 042/133] Update main.py --- scripts/auto_release/main.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 353f976a4a4f..b4a6cbecc60a 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -175,7 +175,6 @@ def generate_code(self): input_data = { "dryRun": False, "specFolder": "../azure-rest-api-specs", - "packageName": "azure-mgmt-cosmosdb", "headSha": "c6ed0986c1ee45df5c8f2bc56f2a9e802b01d2b0", "headRef": "master", "repoHttpsUrl": "https://github.com/Azure/azure-rest-api-specs", @@ -200,6 +199,9 @@ def generate_code(self): # generate code print_exec('python scripts/dev_setup.py -p azure-core') print_check(f'python -m packaging_tools.auto_codegen {self.autorest_result} {self.autorest_result}') + with open(self.autorest_result, 'r') as fr: + print("#### self.autorest_result", fr.read()) + print_check(f'python -m packaging_tools.auto_package {self.autorest_result} {self.autorest_result}') def get_package_name_with_autorest_result(self): From 63bd619e9e0952e3261acfe354272219465ca091 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Thu, 19 May 2022 16:25:28 +0800 Subject: [PATCH 043/133] Update main.py --- scripts/auto_release/main.py | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index b4a6cbecc60a..79494788b970 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -173,23 +173,10 @@ def generate_code(self): # prepare input data input_data = { - "dryRun": False, - "specFolder": "../azure-rest-api-specs", - "headSha": "c6ed0986c1ee45df5c8f2bc56f2a9e802b01d2b0", - "headRef": "master", - "repoHttpsUrl": "https://github.com/Azure/azure-rest-api-specs", - "trigger": "continuousIntegration", - "changedFiles": [ - "specification/cosmos-db/resource-manager/readme.python.md" - ], "relatedReadmeMdFiles": [ - "specification/cosmos-db/resource-manager/readme.md" - ], - "installInstructionInput": { - "isPublic": False, - "downloadUrlPrefix": "https://portal.azure-devex-tools.com/api/sdk-dl-pub?p=Azure/13991/azure-sdk-for-python-track2/", - "downloadCommandTemplate": "curl -L \"{URL}\" -o {FILENAME}", - "trigger": "continuousIntegration" - } + 'headSha': self.get_latest_commit_in_swagger_repo(), + 'repoHttpsUrl': "https://github.com/Azure/azure-rest-api-specs", + 'specFolder': self.spec_repo, + 'relatedReadmeMdFiles': [str(self.readme_local_folder())] } self.autorest_result = str(Path(os.getenv('TEMP_FOLDER')) / 'temp.json') From 31a7e2df580060e07d06bc693ac738bded9c65de Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Thu, 19 May 2022 16:43:45 +0800 Subject: [PATCH 044/133] Update main.py --- scripts/auto_release/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 79494788b970..d61aa12328f3 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -193,6 +193,7 @@ def generate_code(self): def get_package_name_with_autorest_result(self): generate_result = self.get_autorest_result() + print(f"generate_result: {generate_result}") self.package_name = generate_result["packages"][0]["packageName"].split('-')[-1] def prepare_branch_with_readme(self): From dd0c4d8233c4be7b1108db19365f037c49353951 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Thu, 19 May 2022 16:52:16 +0800 Subject: [PATCH 045/133] Update PythonSdkLiveTest.yml for Azure Pipelines --- scripts/auto_release/PythonSdkLiveTest.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index 522daee096af..c5b16b57b579 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -46,11 +46,6 @@ jobs: if [ "$(SPEC_README)" ]; then mkdir azure-rest-api-specs git clone https://github.com/Azure/azure-rest-api-specs.git $(pwd)/azure-rest-api-specs - cd azure-rest-api-specs - git remote add test https://github.com/openapi-env-test/azure-rest-api-specs.git - git fetch test bigcat/test-cosmos2 - git checkout bigcat/test-cosmos2 - cd .. # install autorest sudo npm install -g n From 225a28eac5f8a39b0a957142d8ee7c4af8cfec3a Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Fri, 20 May 2022 10:36:08 +0800 Subject: [PATCH 046/133] Update PythonSdkLiveTest.yml for Azure Pipelines --- scripts/auto_release/PythonSdkLiveTest.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index c5b16b57b579..516ffac1e2a7 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -46,6 +46,12 @@ jobs: if [ "$(SPEC_README)" ]; then mkdir azure-rest-api-specs git clone https://github.com/Azure/azure-rest-api-specs.git $(pwd)/azure-rest-api-specs + cd azure-rest-api-specs + git fetch origin bigcat/confluent-test-branch + git checkout bigcat/confluent-test-branch + cd .. + + # install autorest sudo npm install -g n From 79c8572dced30ee3abca73108dbf3791f96d7508 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Fri, 20 May 2022 10:56:09 +0800 Subject: [PATCH 047/133] Update PythonSdkLiveTest.yml for Azure Pipelines --- scripts/auto_release/PythonSdkLiveTest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index 516ffac1e2a7..ee87e81bd321 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -47,8 +47,8 @@ jobs: mkdir azure-rest-api-specs git clone https://github.com/Azure/azure-rest-api-specs.git $(pwd)/azure-rest-api-specs cd azure-rest-api-specs - git fetch origin bigcat/confluent-test-branch - git checkout bigcat/confluent-test-branch + git fetch origin bigcat/confluent-test-branch-1 + git checkout bigcat/confluent-test-branch-1 cd .. From a41959d24189ab0cd718252a9e6974d62efd1448 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Mon, 23 May 2022 14:30:47 +0800 Subject: [PATCH 048/133] fix bug --- scripts/auto_release/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index f8a0cd4a2fb5..423780c44261 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -188,7 +188,8 @@ def generate_code(self): print_exec('python scripts/dev_setup.py -p azure-core') print_check(f'python -m packaging_tools.auto_codegen {self.autorest_result} {self.autorest_result}') - self.tag_is_stable = self.get_autorest_result()["packages"][0]["tagIsStable"] + generate_result = self.get_autorest_result() + self.tag_is_stable = generate_result["packages"][0]["tagIsStable"] log(f"tag_is_stable is {self.tag_is_stable}") print_check(f'python -m packaging_tools.auto_package {self.autorest_result} {self.autorest_result}') From aed57d80696e820afac0dd884f4a78692799863e Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Mon, 23 May 2022 14:45:37 +0800 Subject: [PATCH 049/133] update --- scripts/auto_release/PythonSdkLiveTest.yml | 5 ----- scripts/auto_release/main.py | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index ee87e81bd321..5942e0f969eb 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -46,11 +46,6 @@ jobs: if [ "$(SPEC_README)" ]; then mkdir azure-rest-api-specs git clone https://github.com/Azure/azure-rest-api-specs.git $(pwd)/azure-rest-api-specs - cd azure-rest-api-specs - git fetch origin bigcat/confluent-test-branch-1 - git checkout bigcat/confluent-test-branch-1 - cd .. - # install autorest diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 423780c44261..b59ac8d66052 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -82,7 +82,7 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): usr = 'Azure' - branch = 'code-report-update-comparision-category-test1' + branch = 'main' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') @@ -187,7 +187,7 @@ def generate_code(self): # generate code(be careful about the order) print_exec('python scripts/dev_setup.py -p azure-core') print_check(f'python -m packaging_tools.auto_codegen {self.autorest_result} {self.autorest_result}') - + generate_result = self.get_autorest_result() self.tag_is_stable = generate_result["packages"][0]["tagIsStable"] log(f"tag_is_stable is {self.tag_is_stable}") From f5bb4c5f507bf35438bff4554bf8ca54145f4e90 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Mon, 23 May 2022 14:54:02 +0800 Subject: [PATCH 050/133] test --- scripts/auto_release/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index b59ac8d66052..99e275273f0e 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -315,6 +315,7 @@ def calculate_next_version_proc(self, last_version: str): def get_autorest_result(self) -> Dict[Any, Any]: with open(self.autorest_result, 'r') as file_in: content = json.load(file_in) + print(f'**** content: {content}') return content def get_changelog(self) -> str: From 38d34ba46dc313927662bb107f12d3a7c1db6b47 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Mon, 23 May 2022 16:34:31 +0800 Subject: [PATCH 051/133] update code --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 99e275273f0e..522bb375f63f 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -189,7 +189,7 @@ def generate_code(self): print_check(f'python -m packaging_tools.auto_codegen {self.autorest_result} {self.autorest_result}') generate_result = self.get_autorest_result() - self.tag_is_stable = generate_result["packages"][0]["tagIsStable"] + self.tag_is_stable = list(generate_result.values())[0]['tagIsStable'] log(f"tag_is_stable is {self.tag_is_stable}") print_check(f'python -m packaging_tools.auto_package {self.autorest_result} {self.autorest_result}') From 047f03c0f33765b847643d4993b4e741fc2ea851 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Mon, 6 Jun 2022 10:09:58 +0800 Subject: [PATCH 052/133] update bot --- scripts/auto_release/PythonSdkLiveTest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index 5942e0f969eb..b316809e93ce 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -40,7 +40,7 @@ jobs: # clone(REPO: https://github.com/Azure/azure-sdk-for-python.git, USR_NAME: Azure, USR_TOKEN: xxxxxxxxxxxxx) mkdir azure-sdk-for-python - git clone ${REPO:0:8}$(USR_NAME):$(USR_TOKEN)@${REPO:8} $(pwd)/azure-sdk-for-python + git clone ${REPO:0:8}$(USR_NAME):$(azuresdk-github-pat)@${REPO:8} $(pwd)/azure-sdk-for-python # prepare env if need to generate SDK code if [ "$(SPEC_README)" ]; then From 33da0454cccb313a3600f2d1e50a1af37e235c7c Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Mon, 6 Jun 2022 10:25:46 +0800 Subject: [PATCH 053/133] update main bot --- scripts/auto_release/main.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 522bb375f63f..2119b5be5abf 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -132,7 +132,6 @@ class CodegenTestPR: def __init__(self): self.issue_link = os.getenv('ISSUE_LINK') - self.usr_token = os.getenv('USR_TOKEN') self.pipeline_link = os.getenv('PIPELINE_LINK') self.bot_token = os.getenv('AZURESDK_BOT_TOKEN') self.spec_readme = os.getenv('SPEC_README', '') @@ -448,7 +447,7 @@ def run_test(self): self.run_test_proc() def create_pr_proc(self): - api = GhApi(owner='Azure', repo='azure-sdk-for-python', token=self.usr_token) + api = GhApi(owner='Azure', repo='azure-sdk-for-python', token=self.bot_token) pr_title = "[AutoRelease] {}(Do not merge)".format(self.new_branch) pr_head = "{}:{}".format(os.getenv('USR_NAME'), self.new_branch) pr_base = 'main' From a71853144d54fd34b446a362490a5fccb3c1b227 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Mon, 6 Jun 2022 10:38:59 +0800 Subject: [PATCH 054/133] Update PythonSdkLiveTest.yml for Azure Pipelines --- scripts/auto_release/PythonSdkLiveTest.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index b316809e93ce..7d9b2f3f9b78 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -78,7 +78,6 @@ jobs: export AZURE_CLIENT_SECRET=$(ENV_CLIENT_SECRET) export AZURE_SUBSCRIPTION_ID=$(ENV_SUBSCRIPTION_ID) export ISSUE_LINK=$(ISSUE_LINK) - export USR_TOKEN=$(USR_TOKEN) export BASE_BRANCH=$(BASE_BRANCH) export SCRIPT_PATH=$script_path export AZURESDK_BOT_TOKEN=$(azuresdk-github-pat) From 4bbcce9d5eff24353fc1c268c5df286245093add Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Mon, 6 Jun 2022 11:05:24 +0800 Subject: [PATCH 055/133] Update main.py --- scripts/auto_release/main.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 2119b5be5abf..f7c34442a009 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -195,7 +195,6 @@ def generate_code(self): def get_package_name_with_autorest_result(self): generate_result = self.get_autorest_result() - print(f"generate_result: {generate_result}") self.package_name = generate_result["packages"][0]["packageName"].split('-')[-1] def prepare_branch_with_readme(self): From bfd4d3e23f25473f74eb2f4df626bbf1bf444862 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Mon, 6 Jun 2022 11:06:25 +0800 Subject: [PATCH 056/133] Update main.py --- scripts/auto_release/main.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index f7c34442a009..b9c25fb6a903 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -313,7 +313,6 @@ def calculate_next_version_proc(self, last_version: str): def get_autorest_result(self) -> Dict[Any, Any]: with open(self.autorest_result, 'r') as file_in: content = json.load(file_in) - print(f'**** content: {content}') return content def get_changelog(self) -> str: From 82d4b0fd503f8a435b26fe7feebc13a88e9f46cb Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 7 Jun 2022 11:12:49 +0800 Subject: [PATCH 057/133] change branch for test --- scripts/auto_release/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index b9c25fb6a903..6ad8793dcbfe 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -81,8 +81,8 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): - usr = 'Azure' - branch = 'main' + usr = 'azure-sdk' + branch = 't2-communication-2022-06-06-53443' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') From d4269a71f898259fd7bef033ef3c9cb5b38c544e Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 7 Jun 2022 11:29:01 +0800 Subject: [PATCH 058/133] for test --- scripts/auto_release/main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 6ad8793dcbfe..e47e6c81d642 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -267,6 +267,8 @@ def edit_sdk_setup(content: List[str]): def check_file_with_packaging_tool(self): os.chdir(Path(f'sdk/{self.sdk_folder}')) print_check(f'python -m packaging_tools --build-conf azure-mgmt-{self.package_name}') + with open('MANIFEST.in', 'r', encoding='utf-8') as f: + print(f'**** {f.read()}') log('packaging_tools --build-conf successfully ') def check_pprint_name(self): From 544efb839fe9574c64b2a13a065967a03fc09dfd Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 7 Jun 2022 11:40:20 +0800 Subject: [PATCH 059/133] for test --- scripts/auto_release/main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index e47e6c81d642..5d85663df2b7 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -267,6 +267,8 @@ def edit_sdk_setup(content: List[str]): def check_file_with_packaging_tool(self): os.chdir(Path(f'sdk/{self.sdk_folder}')) print_check(f'python -m packaging_tools --build-conf azure-mgmt-{self.package_name}') + print("**** path: ", Path(f'sdk/{self.sdk_folder}')) + print("**** path now:", os.getcwd()) with open('MANIFEST.in', 'r', encoding='utf-8') as f: print(f'**** {f.read()}') log('packaging_tools --build-conf successfully ') From 7d46cd824d40798d685dd9e102f423ea90391105 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 7 Jun 2022 11:48:40 +0800 Subject: [PATCH 060/133] for test --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 5d85663df2b7..c922054db71b 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -269,7 +269,7 @@ def check_file_with_packaging_tool(self): print_check(f'python -m packaging_tools --build-conf azure-mgmt-{self.package_name}') print("**** path: ", Path(f'sdk/{self.sdk_folder}')) print("**** path now:", os.getcwd()) - with open('MANIFEST.in', 'r', encoding='utf-8') as f: + with open(Path(f'azure-mgmt-{self.package_name}/MANIFEST.in'), 'r', encoding='utf-8') as f: print(f'**** {f.read()}') log('packaging_tools --build-conf successfully ') From 62b39292c360ac7b6a2f4777f2aa2ac202fd2582 Mon Sep 17 00:00:00 2001 From: msyyc <70930885+msyyc@users.noreply.github.com> Date: Wed, 8 Jun 2022 15:08:52 +0800 Subject: [PATCH 061/133] add PyYAML --- tools/azure-sdk-tools/setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/azure-sdk-tools/setup.py b/tools/azure-sdk-tools/setup.py index 53c644ce32ba..e22499c6995b 100644 --- a/tools/azure-sdk-tools/setup.py +++ b/tools/azure-sdk-tools/setup.py @@ -24,6 +24,7 @@ "azure-mgmt-storage", "azure-mgmt-keyvault", "python-dotenv", + "PyYAML==6.0" ] setup( From 146c007a7b335bf58f086d6a0c83413646512621 Mon Sep 17 00:00:00 2001 From: msyyc <70930885+msyyc@users.noreply.github.com> Date: Thu, 9 Jun 2022 17:54:37 +0800 Subject: [PATCH 062/133] code --- .../packaging_tools/auto_codegen.py | 7 +- .../packaging_tools/generate_utils.py | 75 ++++++++++++++++++- 2 files changed, 79 insertions(+), 3 deletions(-) diff --git a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py index dc19dca8128b..7e693c277fe3 100644 --- a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py +++ b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py @@ -6,7 +6,7 @@ from .swaggertosdk.SwaggerToSdkCore import CONFIG_FILE, CONFIG_FILE_DPG from .generate_sdk import generate -from .generate_utils import get_package_names, init_new_service, update_servicemetadata, judge_tag_preview +from .generate_utils import get_package_names, init_new_service, update_servicemetadata, judge_tag_preview, generate_dpg _LOGGER = logging.getLogger(__name__) @@ -23,7 +23,10 @@ def main(generate_input, generate_output): relative_path_readme = str(Path(spec_folder, input_readme)) _LOGGER.info(f"[CODEGEN]({input_readme})codegen begin") config_file = CONFIG_FILE if 'resource-manager' in input_readme else CONFIG_FILE_DPG - config = generate(config_file, sdk_folder, [], relative_path_readme, spec_folder, force_generation=True) + if 'resource-manager' in input_readme: + config = generate(CONFIG_FILE, sdk_folder, [], relative_path_readme, spec_folder, force_generation=True) + else: + generate_dpg(input_readme, data.get('autorestConfig', '')) package_names = get_package_names(sdk_folder) _LOGGER.info(f"[CODEGEN]({input_readme})codegen end. [(packages:{str(package_names)})]") diff --git a/tools/azure-sdk-tools/packaging_tools/generate_utils.py b/tools/azure-sdk-tools/packaging_tools/generate_utils.py index 574d7b23eb6d..f414be22851f 100644 --- a/tools/azure-sdk-tools/packaging_tools/generate_utils.py +++ b/tools/azure-sdk-tools/packaging_tools/generate_utils.py @@ -6,7 +6,9 @@ from azure_devtools.ci_tools.git_tools import get_add_diff_file_list from pathlib import Path from subprocess import check_call -from typing import List +from typing import List, Union +from glob import glob +import yaml from .swaggertosdk.autorest_tools import build_autorest_options @@ -126,3 +128,74 @@ def judge_tag_preview(path: str) -> bool: _LOGGER.info(f'find single api version:{api_version}') return 'preview' in api_version + + +def extract_yaml_content(autorest_config: str) -> str: + num = [] + content = autorest_config.split('\r\n') + for i in range(len(content)): + if "```" in content[i]: + num.append(i) + if len(num) != 2: + raise Exception(f"autorestConfig content is not valid: {autorest_config}") + return '\n'.join(content[num[0] + 1: num[1]]) + + +def add_yaml_title(content: str, annotation: str = "", tag: str = "") -> str: + return f"{annotation}\n\n" + f"``` yaml {tag}\n" + content + "```\n" + + +def generate_dpg_config(autorest_config: str) -> str: + # remove useless lines + autorest_config = extract_yaml_content(autorest_config) + _LOGGER.info(f"autoresConfig after remove useles lines:\n{autorest_config}") + + # make dir if not exist + origin_config = yaml.safe_load(autorest_config) + _LOGGER.info(f"autoresConfig: {origin_config}") + swagger_folder = str(Path(origin_config["output-folder"], "swagger")) + if not os.path.exists(swagger_folder): + os.makedirs(swagger_folder) + + # generate autorest configuration + package_name = Path(origin_config["output-folder"]).parts[-1] + readme_content = { + "package-name": package_name, + "license-header": "MICROSOFT_MIT_NO_VERSION", + "clear-output-folder": True, + "no-namespace-folders": True, + "version-tolerant": True, + "package-version": "1.0.0b1", + "require": ["../../../../azure-rest-api-specs/" + line for line in origin_config["require"]], + "output-folder": "../" + package_name.replace('-', '/'), + "namespace": package_name.replace('-', '.') + } + + # output autorest configuration + swagger_readme = str(Path(swagger_folder, "README.md")) + with open(swagger_readme, "w") as file: + file.write(add_yaml_title(yaml.safe_dump(readme_content))) + return swagger_readme + + +def lookup_swagger_readme(rest_readme_path: str) -> str: + all_swagger_readme = glob(str(Path('sdk/*/*/swagger/README.md'))) + for readme in all_swagger_readme: + with open(readme, 'r') as file: + content = file.read() + if rest_readme_path in content: + return readme + return "" + + +def generate_dpg(rest_readme_path: str, autorest_config: str): + if autorest_config: + swagger_readme = generate_dpg_config(autorest_config) + else: + swagger_readme = lookup_swagger_readme(rest_readme_path) + if not swagger_readme: + return + + # extract global config + + # generate code From 8edbe377abe12d8ccdc3d1e8f851681e1e9e6b71 Mon Sep 17 00:00:00 2001 From: msyyc <70930885+msyyc@users.noreply.github.com> Date: Thu, 9 Jun 2022 18:06:28 +0800 Subject: [PATCH 063/133] README.md format --- tools/azure-sdk-tools/packaging_tools/generate_utils.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/azure-sdk-tools/packaging_tools/generate_utils.py b/tools/azure-sdk-tools/packaging_tools/generate_utils.py index f414be22851f..9c5ed347d46b 100644 --- a/tools/azure-sdk-tools/packaging_tools/generate_utils.py +++ b/tools/azure-sdk-tools/packaging_tools/generate_utils.py @@ -142,7 +142,9 @@ def extract_yaml_content(autorest_config: str) -> str: def add_yaml_title(content: str, annotation: str = "", tag: str = "") -> str: - return f"{annotation}\n\n" + f"``` yaml {tag}\n" + content + "```\n" + if annotation: + annotation = f"{annotation}\n\n" + return f"# autorest configuration for Python\n\n{annotation}" + f"``` yaml {tag}\n" + content + "```\n" def generate_dpg_config(autorest_config: str) -> str: @@ -166,7 +168,7 @@ def generate_dpg_config(autorest_config: str) -> str: "no-namespace-folders": True, "version-tolerant": True, "package-version": "1.0.0b1", - "require": ["../../../../azure-rest-api-specs/" + line for line in origin_config["require"]], + "require": ["../../../../../azure-rest-api-specs/" + line for line in origin_config["require"]], "output-folder": "../" + package_name.replace('-', '/'), "namespace": package_name.replace('-', '.') } From ced64c782278a5154722fc8122fb9f801bf38a5c Mon Sep 17 00:00:00 2001 From: msyyc <70930885+msyyc@users.noreply.github.com> Date: Fri, 10 Jun 2022 11:41:16 +0800 Subject: [PATCH 064/133] multi client --- .../packaging_tools/auto_codegen.py | 4 +- .../packaging_tools/generate_utils.py | 111 ++++++++++++++---- 2 files changed, 90 insertions(+), 25 deletions(-) diff --git a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py index 7e693c277fe3..9f2196cd6c58 100644 --- a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py +++ b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py @@ -6,7 +6,7 @@ from .swaggertosdk.SwaggerToSdkCore import CONFIG_FILE, CONFIG_FILE_DPG from .generate_sdk import generate -from .generate_utils import get_package_names, init_new_service, update_servicemetadata, judge_tag_preview, generate_dpg +from .generate_utils import get_package_names, init_new_service, update_servicemetadata, judge_tag_preview, gen_dpg _LOGGER = logging.getLogger(__name__) @@ -26,7 +26,7 @@ def main(generate_input, generate_output): if 'resource-manager' in input_readme: config = generate(CONFIG_FILE, sdk_folder, [], relative_path_readme, spec_folder, force_generation=True) else: - generate_dpg(input_readme, data.get('autorestConfig', '')) + gen_dpg(input_readme, data.get('autorestConfig', '')) package_names = get_package_names(sdk_folder) _LOGGER.info(f"[CODEGEN]({input_readme})codegen end. [(packages:{str(package_names)})]") diff --git a/tools/azure-sdk-tools/packaging_tools/generate_utils.py b/tools/azure-sdk-tools/packaging_tools/generate_utils.py index 9c5ed347d46b..2658920aba67 100644 --- a/tools/azure-sdk-tools/packaging_tools/generate_utils.py +++ b/tools/azure-sdk-tools/packaging_tools/generate_utils.py @@ -6,7 +6,7 @@ from azure_devtools.ci_tools.git_tools import get_add_diff_file_list from pathlib import Path from subprocess import check_call -from typing import List, Union +from typing import List, Dict, Any from glob import glob import yaml @@ -141,42 +141,107 @@ def extract_yaml_content(autorest_config: str) -> str: return '\n'.join(content[num[0] + 1: num[1]]) -def add_yaml_title(content: str, annotation: str = "", tag: str = "") -> str: - if annotation: - annotation = f"{annotation}\n\n" - return f"# autorest configuration for Python\n\n{annotation}" + f"``` yaml {tag}\n" + content + "```\n" +def add_config_title(content: str) -> str: + return f"# autorest configuration for Python\n\n{content}" -def generate_dpg_config(autorest_config: str) -> str: +def yaml_block(content: str, annotation: str = "", tag: str = "") -> str: + annotation = f"{annotation}\n\n" if annotation else annotation + return f"{annotation}" + f"``` yaml {tag}\n" + content + "```\n" + + + + + +def gen_package_name(origin_config: Dict[str, Any]) -> str: + return Path(origin_config["output-folder"]).parts[-1] + + +def gen_basic_config(origin_config: Dict[str, Any]) -> Dict[str, Any]: + return { + "package-name": gen_package_name(origin_config), + "license-header": "MICROSOFT_MIT_NO_VERSION", + "clear-output-folder": True, + "no-namespace-folders": True, + "version-tolerant": True, + "package-version": origin_config.get("package-version", "1.0.0b1"), + "require": ["../../../../../azure-rest-api-specs/" + line for line in origin_config["require"]], + } + + +def gen_general_output_folder(package_name: str) -> str: + return "../" + package_name.replace('-', '/') + + +def gen_general_namespace(package_name: str) -> str: + return package_name.replace('-', '.') + + +def gen_dpg_config_single_client(origin_config: Dict[str, Any]) -> str: + package_name = Path(origin_config["output-folder"]).parts[-1] + readme_config = gen_basic_config(origin_config) + readme_config.update({ + "output-folder": gen_general_output_folder(package_name), + "namespace": gen_general_namespace(package_name), + }) + readme_content = yaml_block(yaml.safe_dump(readme_config), "### Settings") + return add_config_title(readme_content) + + +def gen_tag_config(origin_config: Dict[str, Any]) -> Dict[str, Any]: + tag_config = {} + package_name = gen_package_name(origin_config) + for tag in origin_config["batch"]: + tag_name = tag["tag"] + extra_part = tag_name.split("-")[-1] + tag_config[tag_name] = { + "namespace": gen_general_namespace(package_name) + f".{extra_part}", + "output-folder": gen_general_output_folder(package_name) + f"/{extra_part}" + } + + return tag_config + + +def gen_dpg_config_multi_client(origin_config: Dict[str, Any]) -> str: + # generate config + basic_config = gen_basic_config(origin_config) + batch_config = {"batch": origin_config["batch"]} + tag_config = gen_tag_config(origin_config) + + # convert to string + readme_content = yaml_block(yaml.dump(basic_config), "### Settings") + readme_content += yaml_block(yaml.dump(batch_config), "\n### Python multi-client") + for tag, value in tag_config.items(): + readme_content += yaml_block( + yaml.dump(value), + f"\n### Tag: {tag}", + f"$(tag) == '{tag}'", + ) + + return add_config_title(readme_content) + +def gen_dpg_config(autorest_config: str) -> str: # remove useless lines autorest_config = extract_yaml_content(autorest_config) - _LOGGER.info(f"autoresConfig after remove useles lines:\n{autorest_config}") + _LOGGER.info(f"autorestConfig after remove useless lines:\n{autorest_config}") # make dir if not exist origin_config = yaml.safe_load(autorest_config) - _LOGGER.info(f"autoresConfig: {origin_config}") + _LOGGER.info(f"autorestConfig: {origin_config}") swagger_folder = str(Path(origin_config["output-folder"], "swagger")) if not os.path.exists(swagger_folder): os.makedirs(swagger_folder) # generate autorest configuration - package_name = Path(origin_config["output-folder"]).parts[-1] - readme_content = { - "package-name": package_name, - "license-header": "MICROSOFT_MIT_NO_VERSION", - "clear-output-folder": True, - "no-namespace-folders": True, - "version-tolerant": True, - "package-version": "1.0.0b1", - "require": ["../../../../../azure-rest-api-specs/" + line for line in origin_config["require"]], - "output-folder": "../" + package_name.replace('-', '/'), - "namespace": package_name.replace('-', '.') - } + if "batch:" in autorest_config: + readme_content = gen_dpg_config_multi_client(origin_config) + else: + readme_content = gen_dpg_config_single_client(origin_config) # output autorest configuration swagger_readme = str(Path(swagger_folder, "README.md")) with open(swagger_readme, "w") as file: - file.write(add_yaml_title(yaml.safe_dump(readme_content))) + file.write(readme_content) return swagger_readme @@ -190,9 +255,9 @@ def lookup_swagger_readme(rest_readme_path: str) -> str: return "" -def generate_dpg(rest_readme_path: str, autorest_config: str): +def gen_dpg(rest_readme_path: str, autorest_config: str): if autorest_config: - swagger_readme = generate_dpg_config(autorest_config) + swagger_readme = gen_dpg_config(autorest_config) else: swagger_readme = lookup_swagger_readme(rest_readme_path) if not swagger_readme: From 0a29f58ac1515265150756cce3633600962ae85a Mon Sep 17 00:00:00 2001 From: msyyc <70930885+msyyc@users.noreply.github.com> Date: Fri, 10 Jun 2022 13:42:49 +0800 Subject: [PATCH 065/133] code --- tools/azure-sdk-tools/packaging_tools/generate_utils.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/azure-sdk-tools/packaging_tools/generate_utils.py b/tools/azure-sdk-tools/packaging_tools/generate_utils.py index 2658920aba67..1342d96f04e8 100644 --- a/tools/azure-sdk-tools/packaging_tools/generate_utils.py +++ b/tools/azure-sdk-tools/packaging_tools/generate_utils.py @@ -150,9 +150,6 @@ def yaml_block(content: str, annotation: str = "", tag: str = "") -> str: return f"{annotation}" + f"``` yaml {tag}\n" + content + "```\n" - - - def gen_package_name(origin_config: Dict[str, Any]) -> str: return Path(origin_config["output-folder"]).parts[-1] @@ -217,9 +214,10 @@ def gen_dpg_config_multi_client(origin_config: Dict[str, Any]) -> str: f"\n### Tag: {tag}", f"$(tag) == '{tag}'", ) - + return add_config_title(readme_content) + def gen_dpg_config(autorest_config: str) -> str: # remove useless lines autorest_config = extract_yaml_content(autorest_config) From 378c1c032417edb29082c8c0bc8f2042f63a0bb1 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Fri, 10 Jun 2022 13:58:51 +0800 Subject: [PATCH 066/133] add python_tag --- scripts/auto_release/PythonSdkLiveTest.yml | 1 + scripts/auto_release/main.py | 3 +++ tools/azure-sdk-tools/packaging_tools/auto_codegen.py | 4 +++- tools/azure-sdk-tools/packaging_tools/generate_sdk.py | 3 ++- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index 7d9b2f3f9b78..d3dd80fc8127 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -83,6 +83,7 @@ jobs: export AZURESDK_BOT_TOKEN=$(azuresdk-github-pat) export STORAGE_CONN_STR=$(storage-conn-str) export STORAGE_ENDPOINT=$(storage-endpoint) + export PYTHON_TAG=@(PYTHON_TAG) # run cd azure-sdk-for-python diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index c922054db71b..e6f55095dbe0 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -178,6 +178,9 @@ def generate_code(self): 'specFolder': self.spec_repo, 'relatedReadmeMdFiles': [str(self.readme_local_folder())] } + # if Python tag exists + if os.getenv('PYTHON_TAG'): + input_data['python_tag'] = os.getenv('PYTHON_TAG') self.autorest_result = str(Path(os.getenv('TEMP_FOLDER')) / 'temp.json') with open(self.autorest_result, 'w') as file: diff --git a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py index dc19dca8128b..d8d616f8cae4 100644 --- a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py +++ b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py @@ -19,11 +19,13 @@ def main(generate_input, generate_output): sdk_folder = "." result = {} package_total = set() + python_tag = data.get('python_tag') if data.get('python_tag') else None for input_readme in data["relatedReadmeMdFiles"]: relative_path_readme = str(Path(spec_folder, input_readme)) _LOGGER.info(f"[CODEGEN]({input_readme})codegen begin") config_file = CONFIG_FILE if 'resource-manager' in input_readme else CONFIG_FILE_DPG - config = generate(config_file, sdk_folder, [], relative_path_readme, spec_folder, force_generation=True) + config = generate(config_file, sdk_folder, [], relative_path_readme, spec_folder, force_generation=True, + python_tag=python_tag) package_names = get_package_names(sdk_folder) _LOGGER.info(f"[CODEGEN]({input_readme})codegen end. [(packages:{str(package_names)})]") diff --git a/tools/azure-sdk-tools/packaging_tools/generate_sdk.py b/tools/azure-sdk-tools/packaging_tools/generate_sdk.py index b403e8fa0ec4..73ba76c13850 100644 --- a/tools/azure-sdk-tools/packaging_tools/generate_sdk.py +++ b/tools/azure-sdk-tools/packaging_tools/generate_sdk.py @@ -19,7 +19,8 @@ def generate( - config_path, sdk_folder, project_pattern, readme, restapi_git_folder, autorest_bin=None, force_generation=False + config_path, sdk_folder, project_pattern, readme, restapi_git_folder, autorest_bin=None, force_generation=False, + python_tag=None ): sdk_folder = Path(sdk_folder).expanduser() From 6eb0ed19f94b12d540ad23907074240f5ae3c8c6 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Fri, 10 Jun 2022 14:01:29 +0800 Subject: [PATCH 067/133] restore branch --- scripts/auto_release/main.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index e6f55095dbe0..af91183d99f0 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -81,8 +81,8 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): - usr = 'azure-sdk' - branch = 't2-communication-2022-06-06-53443' + usr = 'Azure' + branch = 'main' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') @@ -270,10 +270,6 @@ def edit_sdk_setup(content: List[str]): def check_file_with_packaging_tool(self): os.chdir(Path(f'sdk/{self.sdk_folder}')) print_check(f'python -m packaging_tools --build-conf azure-mgmt-{self.package_name}') - print("**** path: ", Path(f'sdk/{self.sdk_folder}')) - print("**** path now:", os.getcwd()) - with open(Path(f'azure-mgmt-{self.package_name}/MANIFEST.in'), 'r', encoding='utf-8') as f: - print(f'**** {f.read()}') log('packaging_tools --build-conf successfully ') def check_pprint_name(self): From 1bd12ca40bf04d5897cec0b79ac8fb1a32bc23a2 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Fri, 10 Jun 2022 14:04:17 +0800 Subject: [PATCH 068/133] Update PythonSdkLiveTest.yml --- scripts/auto_release/PythonSdkLiveTest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index d3dd80fc8127..ac1e415c1faf 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -83,7 +83,7 @@ jobs: export AZURESDK_BOT_TOKEN=$(azuresdk-github-pat) export STORAGE_CONN_STR=$(storage-conn-str) export STORAGE_ENDPOINT=$(storage-endpoint) - export PYTHON_TAG=@(PYTHON_TAG) + export PYTHON_TAG=$(PYTHON_TAG) # run cd azure-sdk-for-python From 409ac725fabcf718d4782c2951c2746db0ca2607 Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Fri, 10 Jun 2022 15:10:10 +0800 Subject: [PATCH 069/133] gen multi client --- .../packaging_tools/generate_utils.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/azure-sdk-tools/packaging_tools/generate_utils.py b/tools/azure-sdk-tools/packaging_tools/generate_utils.py index 1342d96f04e8..7f0dfc2b130d 100644 --- a/tools/azure-sdk-tools/packaging_tools/generate_utils.py +++ b/tools/azure-sdk-tools/packaging_tools/generate_utils.py @@ -199,10 +199,18 @@ def gen_tag_config(origin_config: Dict[str, Any]) -> Dict[str, Any]: return tag_config +def gen_batch_config(origin_config: Dict[str, Any]) -> Dict[str, Any]: + batch_config = [] + for item in origin_config["batch"]: + for _, value in item.items(): + batch_config.append({value: True}) + return {"batch": batch_config} + + def gen_dpg_config_multi_client(origin_config: Dict[str, Any]) -> str: # generate config basic_config = gen_basic_config(origin_config) - batch_config = {"batch": origin_config["batch"]} + batch_config = gen_batch_config(origin_config) tag_config = gen_tag_config(origin_config) # convert to string @@ -212,7 +220,7 @@ def gen_dpg_config_multi_client(origin_config: Dict[str, Any]) -> str: readme_content += yaml_block( yaml.dump(value), f"\n### Tag: {tag}", - f"$(tag) == '{tag}'", + f"$({tag})", ) return add_config_title(readme_content) From 35e1a19f7712cbddad181e8952bec0d541ba9374 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Fri, 10 Jun 2022 15:18:00 +0800 Subject: [PATCH 070/133] update global_conf --- tools/azure-sdk-tools/packaging_tools/generate_sdk.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/azure-sdk-tools/packaging_tools/generate_sdk.py b/tools/azure-sdk-tools/packaging_tools/generate_sdk.py index 73ba76c13850..92ef2f5bbf28 100644 --- a/tools/azure-sdk-tools/packaging_tools/generate_sdk.py +++ b/tools/azure-sdk-tools/packaging_tools/generate_sdk.py @@ -31,6 +31,8 @@ def generate( global_conf["autorest_options"] = solve_relative_path(global_conf.get("autorest_options", {}), sdk_folder) global_conf["envs"] = solve_relative_path(global_conf.get("envs", {}), sdk_folder) global_conf["advanced_options"] = solve_relative_path(global_conf.get("advanced_options", {}), sdk_folder) + if python_tag: + global_conf["autorest_options"]['tag'] = python_tag if restapi_git_folder: restapi_git_folder = Path(restapi_git_folder).expanduser() From 32bd55fc2fdde26858ec46815bb8d11d14ba5a9d Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Fri, 10 Jun 2022 15:34:38 +0800 Subject: [PATCH 071/133] Update auto_codegen.py --- tools/azure-sdk-tools/packaging_tools/auto_codegen.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py index d8d616f8cae4..dc19dca8128b 100644 --- a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py +++ b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py @@ -19,13 +19,11 @@ def main(generate_input, generate_output): sdk_folder = "." result = {} package_total = set() - python_tag = data.get('python_tag') if data.get('python_tag') else None for input_readme in data["relatedReadmeMdFiles"]: relative_path_readme = str(Path(spec_folder, input_readme)) _LOGGER.info(f"[CODEGEN]({input_readme})codegen begin") config_file = CONFIG_FILE if 'resource-manager' in input_readme else CONFIG_FILE_DPG - config = generate(config_file, sdk_folder, [], relative_path_readme, spec_folder, force_generation=True, - python_tag=python_tag) + config = generate(config_file, sdk_folder, [], relative_path_readme, spec_folder, force_generation=True) package_names = get_package_names(sdk_folder) _LOGGER.info(f"[CODEGEN]({input_readme})codegen end. [(packages:{str(package_names)})]") From 845a892f0bb19307886d268ec20eae1bd8036ae0 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Fri, 10 Jun 2022 15:35:12 +0800 Subject: [PATCH 072/133] Update generate_sdk.py --- tools/azure-sdk-tools/packaging_tools/generate_sdk.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/azure-sdk-tools/packaging_tools/generate_sdk.py b/tools/azure-sdk-tools/packaging_tools/generate_sdk.py index 92ef2f5bbf28..f526824c0f9d 100644 --- a/tools/azure-sdk-tools/packaging_tools/generate_sdk.py +++ b/tools/azure-sdk-tools/packaging_tools/generate_sdk.py @@ -20,7 +20,6 @@ def generate( config_path, sdk_folder, project_pattern, readme, restapi_git_folder, autorest_bin=None, force_generation=False, - python_tag=None ): sdk_folder = Path(sdk_folder).expanduser() @@ -31,8 +30,6 @@ def generate( global_conf["autorest_options"] = solve_relative_path(global_conf.get("autorest_options", {}), sdk_folder) global_conf["envs"] = solve_relative_path(global_conf.get("envs", {}), sdk_folder) global_conf["advanced_options"] = solve_relative_path(global_conf.get("advanced_options", {}), sdk_folder) - if python_tag: - global_conf["autorest_options"]['tag'] = python_tag if restapi_git_folder: restapi_git_folder = Path(restapi_git_folder).expanduser() From 64de6b88e680adad2f12e4200616469fba75e42f Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Fri, 10 Jun 2022 15:35:39 +0800 Subject: [PATCH 073/133] Update generate_sdk.py --- tools/azure-sdk-tools/packaging_tools/generate_sdk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/azure-sdk-tools/packaging_tools/generate_sdk.py b/tools/azure-sdk-tools/packaging_tools/generate_sdk.py index f526824c0f9d..3f7aea0f08c1 100644 --- a/tools/azure-sdk-tools/packaging_tools/generate_sdk.py +++ b/tools/azure-sdk-tools/packaging_tools/generate_sdk.py @@ -19,7 +19,7 @@ def generate( - config_path, sdk_folder, project_pattern, readme, restapi_git_folder, autorest_bin=None, force_generation=False, + config_path, sdk_folder, project_pattern, readme, restapi_git_folder, autorest_bin=None, force_generation=False, ): sdk_folder = Path(sdk_folder).expanduser() From 7e871b6629f11f0bc16e3d77576032f294995197 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Fri, 10 Jun 2022 15:36:01 +0800 Subject: [PATCH 074/133] Update generate_sdk.py --- tools/azure-sdk-tools/packaging_tools/generate_sdk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/azure-sdk-tools/packaging_tools/generate_sdk.py b/tools/azure-sdk-tools/packaging_tools/generate_sdk.py index 3f7aea0f08c1..b403e8fa0ec4 100644 --- a/tools/azure-sdk-tools/packaging_tools/generate_sdk.py +++ b/tools/azure-sdk-tools/packaging_tools/generate_sdk.py @@ -19,7 +19,7 @@ def generate( - config_path, sdk_folder, project_pattern, readme, restapi_git_folder, autorest_bin=None, force_generation=False, + config_path, sdk_folder, project_pattern, readme, restapi_git_folder, autorest_bin=None, force_generation=False ): sdk_folder = Path(sdk_folder).expanduser() From f20bea0578718b1f1f64187381346b7b3d14761c Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Fri, 10 Jun 2022 15:36:12 +0800 Subject: [PATCH 075/133] single client gen --- swagger_to_sdk_config_dpg.json | 6 ++---- tools/azure-sdk-tools/packaging_tools/auto_codegen.py | 3 +-- .../azure-sdk-tools/packaging_tools/generate_utils.py | 11 ++++++++++- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/swagger_to_sdk_config_dpg.json b/swagger_to_sdk_config_dpg.json index 4900e744c9e8..1d011e81afdc 100644 --- a/swagger_to_sdk_config_dpg.json +++ b/swagger_to_sdk_config_dpg.json @@ -1,10 +1,8 @@ { "meta": { "autorest_options": { - "version": "3.7.2", - "use": ["@autorest/python@5.16.0", "@autorest/modelerfour@4.19.3"], - "python": "", - "sdkrel:python-sdks-folder": "./sdk/.", + "version": "3.8.1", + "use": ["@autorest/python@5.17.0", "@autorest/modelerfour@4.23.5"], "version-tolerant": "" }, "advanced_options": { diff --git a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py index 9f2196cd6c58..d97a7891b518 100644 --- a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py +++ b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py @@ -4,7 +4,7 @@ from pathlib import Path from subprocess import check_call -from .swaggertosdk.SwaggerToSdkCore import CONFIG_FILE, CONFIG_FILE_DPG +from .swaggertosdk.SwaggerToSdkCore import CONFIG_FILE from .generate_sdk import generate from .generate_utils import get_package_names, init_new_service, update_servicemetadata, judge_tag_preview, gen_dpg @@ -22,7 +22,6 @@ def main(generate_input, generate_output): for input_readme in data["relatedReadmeMdFiles"]: relative_path_readme = str(Path(spec_folder, input_readme)) _LOGGER.info(f"[CODEGEN]({input_readme})codegen begin") - config_file = CONFIG_FILE if 'resource-manager' in input_readme else CONFIG_FILE_DPG if 'resource-manager' in input_readme: config = generate(CONFIG_FILE, sdk_folder, [], relative_path_readme, spec_folder, force_generation=True) else: diff --git a/tools/azure-sdk-tools/packaging_tools/generate_utils.py b/tools/azure-sdk-tools/packaging_tools/generate_utils.py index 7f0dfc2b130d..8c05bc5ab505 100644 --- a/tools/azure-sdk-tools/packaging_tools/generate_utils.py +++ b/tools/azure-sdk-tools/packaging_tools/generate_utils.py @@ -10,7 +10,9 @@ from glob import glob import yaml -from .swaggertosdk.autorest_tools import build_autorest_options +from .swaggertosdk.autorest_tools import build_autorest_options, generate_code +from .swaggertosdk.SwaggerToSdkCore import CONFIG_FILE_DPG, read_config + _LOGGER = logging.getLogger(__name__) _SDK_FOLDER_RE = re.compile(r"^(sdk/[\w-]+)/(azure[\w-]+)/", re.ASCII) @@ -226,6 +228,7 @@ def gen_dpg_config_multi_client(origin_config: Dict[str, Any]) -> str: return add_config_title(readme_content) +# generate swagger/README.md and return relative path based on SDK repo root path def gen_dpg_config(autorest_config: str) -> str: # remove useless lines autorest_config = extract_yaml_content(autorest_config) @@ -262,6 +265,7 @@ def lookup_swagger_readme(rest_readme_path: str) -> str: def gen_dpg(rest_readme_path: str, autorest_config: str): + # generate or find swagger/README.md if autorest_config: swagger_readme = gen_dpg_config(autorest_config) else: @@ -270,5 +274,10 @@ def gen_dpg(rest_readme_path: str, autorest_config: str): return # extract global config + global_config = read_config('.', CONFIG_FILE_DPG)["meta"] # generate code + current_path = os.getcwd() + os.chdir(Path(swagger_readme).parent) + generate_code(Path(swagger_readme).parts[-1], global_config, {}) + os.chdir(current_path) \ No newline at end of file From 091bf1f793947d72690edd4bf2d3a56e27e08d6e Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Fri, 10 Jun 2022 15:36:28 +0800 Subject: [PATCH 076/133] Update main.py --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index af91183d99f0..0029721727e3 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -82,7 +82,7 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): usr = 'Azure' - branch = 'main' + branch = 'test-condegen-update-0610' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') From 95fe92e3ccfc462c5c4f6fce2d15776e0baf7eb8 Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Fri, 10 Jun 2022 16:02:00 +0800 Subject: [PATCH 077/133] compatible with meta storage code --- .../packaging_tools/auto_codegen.py | 4 ++-- .../packaging_tools/generate_utils.py | 24 ++++++++++++------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py index d97a7891b518..b84696648979 100644 --- a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py +++ b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py @@ -25,7 +25,7 @@ def main(generate_input, generate_output): if 'resource-manager' in input_readme: config = generate(CONFIG_FILE, sdk_folder, [], relative_path_readme, spec_folder, force_generation=True) else: - gen_dpg(input_readme, data.get('autorestConfig', '')) + config = gen_dpg(input_readme, data.get('autorestConfig', '')) package_names = get_package_names(sdk_folder) _LOGGER.info(f"[CODEGEN]({input_readme})codegen end. [(packages:{str(package_names)})]") @@ -53,7 +53,7 @@ def main(generate_input, generate_output): try: update_servicemetadata(sdk_folder, data, config, folder_name, package_name, spec_folder, input_readme) except Exception as e: - _LOGGER.info(str(e)) + _LOGGER.info(f"fail to update meta: {str(e)}") # Setup package locally check_call( diff --git a/tools/azure-sdk-tools/packaging_tools/generate_utils.py b/tools/azure-sdk-tools/packaging_tools/generate_utils.py index 8c05bc5ab505..4d8798417834 100644 --- a/tools/azure-sdk-tools/packaging_tools/generate_utils.py +++ b/tools/azure-sdk-tools/packaging_tools/generate_utils.py @@ -18,7 +18,7 @@ _SDK_FOLDER_RE = re.compile(r"^(sdk/[\w-]+)/(azure[\w-]+)/", re.ASCII) DEFAULT_DEST_FOLDER = "./dist" - +_DPG_README = "README.md" def get_package_names(sdk_folder): files = get_add_diff_file_list(sdk_folder) @@ -45,9 +45,13 @@ def update_servicemetadata(sdk_folder, data, config, folder_name, package_name, readme_file = str(Path(spec_folder, input_readme)) global_conf = config["meta"] - local_conf = config["projects"][readme_file] + local_conf = config.get("projects", {}).get(readme_file, {}) - cmd = ["autorest", input_readme] + if "resource-manager" in input_readme: + cmd = ["autorest", input_readme] + else: + # autorest for DPG will be executed in package folder like: sdk/deviceupdate/azure-iot-deviceupdate/swagger + cmd = ["autorest", _DPG_README] cmd += build_autorest_options(global_conf, local_conf) # metadata @@ -248,14 +252,14 @@ def gen_dpg_config(autorest_config: str) -> str: readme_content = gen_dpg_config_single_client(origin_config) # output autorest configuration - swagger_readme = str(Path(swagger_folder, "README.md")) + swagger_readme = str(Path(swagger_folder, _DPG_README)) with open(swagger_readme, "w") as file: file.write(readme_content) return swagger_readme def lookup_swagger_readme(rest_readme_path: str) -> str: - all_swagger_readme = glob(str(Path('sdk/*/*/swagger/README.md'))) + all_swagger_readme = glob(str(Path(f'sdk/*/*/swagger/{_DPG_README}'))) for readme in all_swagger_readme: with open(readme, 'r') as file: content = file.read() @@ -264,7 +268,7 @@ def lookup_swagger_readme(rest_readme_path: str) -> str: return "" -def gen_dpg(rest_readme_path: str, autorest_config: str): +def gen_dpg(rest_readme_path: str, autorest_config: str) -> Dict[str, Any]: # generate or find swagger/README.md if autorest_config: swagger_readme = gen_dpg_config(autorest_config) @@ -274,10 +278,12 @@ def gen_dpg(rest_readme_path: str, autorest_config: str): return # extract global config - global_config = read_config('.', CONFIG_FILE_DPG)["meta"] + global_config = read_config('.', CONFIG_FILE_DPG) # generate code current_path = os.getcwd() os.chdir(Path(swagger_readme).parent) - generate_code(Path(swagger_readme).parts[-1], global_config, {}) - os.chdir(current_path) \ No newline at end of file + generate_code(_DPG_README, global_config["meta"], {}) + os.chdir(current_path) + + return global_config From b99079e06da472c220c0dbfd3a7014e38ac9d892 Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Fri, 10 Jun 2022 16:33:53 +0800 Subject: [PATCH 078/133] add log to lookup readme --- tools/azure-sdk-tools/packaging_tools/generate_utils.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/azure-sdk-tools/packaging_tools/generate_utils.py b/tools/azure-sdk-tools/packaging_tools/generate_utils.py index 4d8798417834..ced287a096ba 100644 --- a/tools/azure-sdk-tools/packaging_tools/generate_utils.py +++ b/tools/azure-sdk-tools/packaging_tools/generate_utils.py @@ -264,7 +264,9 @@ def lookup_swagger_readme(rest_readme_path: str) -> str: with open(readme, 'r') as file: content = file.read() if rest_readme_path in content: + _LOGGER.info(f"find swagger readme: {readme}") return readme + _LOGGER.info(f"do not find swagger readme which contains {rest_readme_path}") return "" From 3f0e9ed0b35f543ea9b8b26bc60496bedb74f45b Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Fri, 10 Jun 2022 17:10:31 +0800 Subject: [PATCH 079/133] dpg package does not need _meta.json in MAINFEST.in --- .../packaging_tools/generate_utils.py | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/tools/azure-sdk-tools/packaging_tools/generate_utils.py b/tools/azure-sdk-tools/packaging_tools/generate_utils.py index ced287a096ba..999aad2e7d87 100644 --- a/tools/azure-sdk-tools/packaging_tools/generate_utils.py +++ b/tools/azure-sdk-tools/packaging_tools/generate_utils.py @@ -78,23 +78,24 @@ def update_servicemetadata(sdk_folder, data, config, folder_name, package_name, _LOGGER.info(f"Saved metadata to {metadata_file_path}") # Check whether MANIFEST.in includes _meta.json - require_meta = "include _meta.json\n" - manifest_file = os.path.join(package_folder, "MANIFEST.in") - if not os.path.exists(manifest_file): - _LOGGER.info(f"MANIFEST.in doesn't exist: {manifest_file}") - return - - includes = [] - write_flag = False - with open(manifest_file, "r") as f: - includes = f.readlines() - if require_meta not in includes: - includes = [require_meta] + includes - write_flag = True - - if write_flag: - with open(manifest_file, "w") as f: - f.write("".join(includes)) + if "resource-manager" in input_readme: + require_meta = "include _meta.json\n" + manifest_file = os.path.join(package_folder, "MANIFEST.in") + if not os.path.exists(manifest_file): + _LOGGER.info(f"MANIFEST.in doesn't exist: {manifest_file}") + return + + includes = [] + write_flag = False + with open(manifest_file, "r") as f: + includes = f.readlines() + if require_meta not in includes: + includes = [require_meta] + includes + write_flag = True + + if write_flag: + with open(manifest_file, "w") as f: + f.write("".join(includes)) # find all the files of one folder, including files in subdirectory From 8af7ccb2e6973082e4dd4bb49de95699ac1086c5 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Mon, 13 Jun 2022 09:19:14 +0800 Subject: [PATCH 080/133] Update main.py --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 0029721727e3..af91183d99f0 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -82,7 +82,7 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): usr = 'Azure' - branch = 'test-condegen-update-0610' + branch = 'main' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') From 9dd3b1fbac17e3e3b42d50a95f3e21b2d4563a66 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Mon, 13 Jun 2022 11:38:34 +0800 Subject: [PATCH 081/133] Update PythonSdkLiveTest.yml for Azure Pipelines --- scripts/auto_release/PythonSdkLiveTest.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index ac1e415c1faf..f70e2c727afa 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -69,14 +69,14 @@ jobs: # import env variable export AZURE_TEST_RUN_LIVE=true - export TENANT_ID=$(ENV_TENANT_ID) - export CLIENT_ID=$(ENV_CLIENT_ID) - export CLIENT_SECRET=$(ENV_CLIENT_SECRET) - export SUBSCRIPTION_ID=$(ENV_SUBSCRIPTION_ID) - export AZURE_TENANT_ID=$(ENV_TENANT_ID) - export AZURE_CLIENT_ID=$(ENV_CLIENT_ID) - export AZURE_CLIENT_SECRET=$(ENV_CLIENT_SECRET) - export AZURE_SUBSCRIPTION_ID=$(ENV_SUBSCRIPTION_ID) + export TENANT_ID=$(ENV-TENANT-ID) + export CLIENT_ID=$(ENV-CLIENT-ID) + export CLIENT_SECRET=$(ENV-CLIENT-SECRET) + export SUBSCRIPTION_ID=$(ENV-SUBSCRIPTION-ID) + export AZURE_TENANT_ID=$(ENV-TENANT-ID) + export AZURE_CLIENT_ID=$(ENV-CLIENT-ID) + export AZURE_CLIENT_SECRET=$(ENV-CLIENT-SECRET) + export AZURE_SUBSCRIPTION_ID=$(ENV-SUBSCRIPTION-ID) export ISSUE_LINK=$(ISSUE_LINK) export BASE_BRANCH=$(BASE_BRANCH) export SCRIPT_PATH=$script_path From fb2a89dbd5c88580a8efad2eaccc6bda60447266 Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Mon, 13 Jun 2022 15:22:36 +0800 Subject: [PATCH 082/133] add language, apiviewartifacts --- tools/azure-sdk-tools/packaging_tools/auto_package.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/azure-sdk-tools/packaging_tools/auto_package.py b/tools/azure-sdk-tools/packaging_tools/auto_package.py index 15e2c9090453..df1750003af3 100644 --- a/tools/azure-sdk-tools/packaging_tools/auto_package.py +++ b/tools/azure-sdk-tools/packaging_tools/auto_package.py @@ -46,6 +46,11 @@ def main(generate_input, generate_output): # to distinguish with track1 if 'azure-mgmt-' in package_name: package["packageName"] = "track2_" + package["packageName"] + for artifact in package["artifacts"]: + if ".whl" in artifact: + package["apiViewArtifact"] = artifact + package["language"] = "Python" + break result["packages"].append(package) with open(generate_output, "w") as writer: From 1061cb35352c9794bfbf0d055ad1c6a8f0e3fc61 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 14 Jun 2022 11:27:02 +0800 Subject: [PATCH 083/133] uodate edit_sdk_setup --- scripts/auto_release/main.py | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index af91183d99f0..c7c03e84d767 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -9,8 +9,8 @@ from functools import wraps from typing import List, Any, Dict from packaging.version import Version -from ghapi.all import GhApi -from azure.storage.blob import BlobServiceClient, ContainerClient +# from ghapi.all import GhApi +# from azure.storage.blob import BlobServiceClient, ContainerClient from util import add_certificate _LOG = logging.getLogger() @@ -256,12 +256,28 @@ def edit_sdk_readme(content: List[str]): modify_file(sdk_readme, edit_sdk_readme) + @staticmethod + def get_need_mgmt_core(): + template_path = Path('../../tools/azure-sdk-tools/packaging_tools/templates/setup.py') + with open(template_path, 'r') as fr: + content = fr.readlines() + for line in content: + if 'msrest' in line: + target_msrest = line.strip().strip(',') + yield target_msrest + if 'azure-mgmt-core' in line: + target_mgmt_core = line.strip().strip(',') + yield target_mgmt_core + def check_sdk_setup(self): def edit_sdk_setup(content: List[str]): + target_msrest, target_mgmt_core = self.get_need_mgmt_core() + msrest_pattern = re.compile('msrest>=\d\.\d[1-2]\.\d[1-2]') + mgmt_core_pattern = re.compile('azure-mgmt-core>=\d\.\d\.\d,<\d\.\d\.\d') for i in range(0, len(content)): - content[i] = content[i].replace('msrestazure>=0.4.32,<2.0.0', 'azure-mgmt-core>=1.3.0,<2.0.0') - content[i] = content[i].replace('azure-mgmt-core>=1.2.0,<2.0.0', 'azure-mgmt-core>=1.3.0,<2.0.0') - content[i] = content[i].replace('msrest>=0.5.0', 'msrest>=0.6.21') + content[i] = content[i].replace('msrestazure>=0.4.32,<2.0.0', target_mgmt_core) + content[i] = re.sub(mgmt_core_pattern, target_mgmt_core, content[i]) + content[i] = re.sub(msrest_pattern, target_msrest, content[i]) modify_file(str(Path(self.sdk_code_path()) / 'setup.py'), edit_sdk_setup) @@ -561,5 +577,6 @@ def run(self): logging.basicConfig() main_logger.setLevel(logging.INFO) - instance = CodegenTestPR() - instance.run() + CodegenTestPR.get_need_mgmt_core() + # instance = CodegenTestPR() + # instance.run() From ce4bef811e1d98542a95ac279108a0a3fd59562f Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 14 Jun 2022 11:30:57 +0800 Subject: [PATCH 084/133] fix --- scripts/auto_release/main.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index c7c03e84d767..10f560c695a2 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -9,8 +9,8 @@ from functools import wraps from typing import List, Any, Dict from packaging.version import Version -# from ghapi.all import GhApi -# from azure.storage.blob import BlobServiceClient, ContainerClient +from ghapi.all import GhApi +from azure.storage.blob import BlobServiceClient, ContainerClient from util import add_certificate _LOG = logging.getLogger() @@ -577,6 +577,5 @@ def run(self): logging.basicConfig() main_logger.setLevel(logging.INFO) - CodegenTestPR.get_need_mgmt_core() - # instance = CodegenTestPR() - # instance.run() + instance = CodegenTestPR() + instance.run() From 916bd3a2fc7ae661b5ff5db45acf5c615564e120 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 14 Jun 2022 11:40:01 +0800 Subject: [PATCH 085/133] test --- scripts/auto_release/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 10f560c695a2..c2f572b8c361 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -330,6 +330,7 @@ def calculate_next_version_proc(self, last_version: str): return next_version def get_autorest_result(self) -> Dict[Any, Any]: + print("***", os.getcwd()) with open(self.autorest_result, 'r') as file_in: content = json.load(file_in) return content From 4278ee3c7e734b776f3ae6bcb4dec6272feaf750 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 14 Jun 2022 11:54:25 +0800 Subject: [PATCH 086/133] test --- scripts/auto_release/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index c2f572b8c361..4a63cf074828 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -258,7 +258,8 @@ def edit_sdk_readme(content: List[str]): @staticmethod def get_need_mgmt_core(): - template_path = Path('../../tools/azure-sdk-tools/packaging_tools/templates/setup.py') + print("***", os.getcwd()) + template_path = Path('tools/azure-sdk-tools/packaging_tools/templates/setup.py') with open(template_path, 'r') as fr: content = fr.readlines() for line in content: @@ -330,7 +331,6 @@ def calculate_next_version_proc(self, last_version: str): return next_version def get_autorest_result(self) -> Dict[Any, Any]: - print("***", os.getcwd()) with open(self.autorest_result, 'r') as file_in: content = json.load(file_in) return content From 5fc5ccf21beee02a4a1578d64a468c7932ed11bb Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 14 Jun 2022 13:47:52 +0800 Subject: [PATCH 087/133] fix bug --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 4a63cf074828..af9e6ce13316 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -272,7 +272,7 @@ def get_need_mgmt_core(): def check_sdk_setup(self): def edit_sdk_setup(content: List[str]): - target_msrest, target_mgmt_core = self.get_need_mgmt_core() + target_msrest, target_mgmt_core = list(self.get_need_mgmt_core()) msrest_pattern = re.compile('msrest>=\d\.\d[1-2]\.\d[1-2]') mgmt_core_pattern = re.compile('azure-mgmt-core>=\d\.\d\.\d,<\d\.\d\.\d') for i in range(0, len(content)): From c895704b08d6936c32a22b2e16b0697b3b461ce6 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 14 Jun 2022 13:58:42 +0800 Subject: [PATCH 088/133] debug --- scripts/auto_release/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index af9e6ce13316..29ddac669e06 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -272,6 +272,7 @@ def get_need_mgmt_core(): def check_sdk_setup(self): def edit_sdk_setup(content: List[str]): + print("**** get_need_mgmt_core: ", list(self.get_need_mgmt_core())) target_msrest, target_mgmt_core = list(self.get_need_mgmt_core()) msrest_pattern = re.compile('msrest>=\d\.\d[1-2]\.\d[1-2]') mgmt_core_pattern = re.compile('azure-mgmt-core>=\d\.\d\.\d,<\d\.\d\.\d') From 4c22e5cd09e746d7a912d54533370e8dee2cce3a Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 14 Jun 2022 14:08:51 +0800 Subject: [PATCH 089/133] fix bug --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 29ddac669e06..189f72fb9f5c 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -263,7 +263,7 @@ def get_need_mgmt_core(): with open(template_path, 'r') as fr: content = fr.readlines() for line in content: - if 'msrest' in line: + if 'msrest>' in line: target_msrest = line.strip().strip(',') yield target_msrest if 'azure-mgmt-core' in line: From cded964566bd762bc91a8f46ee3407780430d6c6 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 14 Jun 2022 14:18:21 +0800 Subject: [PATCH 090/133] fix bug --- scripts/auto_release/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 189f72fb9f5c..a9ddfc2ce19f 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -264,10 +264,10 @@ def get_need_mgmt_core(): content = fr.readlines() for line in content: if 'msrest>' in line: - target_msrest = line.strip().strip(',') + target_msrest = line.strip().strip(',').strip('\'') yield target_msrest if 'azure-mgmt-core' in line: - target_mgmt_core = line.strip().strip(',') + target_mgmt_core = line.strip().strip(',').strip('\'') yield target_mgmt_core def check_sdk_setup(self): From cc60f92450b8c1d509f0b3d03f9148aaf65b10b7 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Tue, 14 Jun 2022 14:38:12 +0800 Subject: [PATCH 091/133] Update main.py --- scripts/auto_release/main.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index a9ddfc2ce19f..2cfd11d8d97f 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -258,7 +258,6 @@ def edit_sdk_readme(content: List[str]): @staticmethod def get_need_mgmt_core(): - print("***", os.getcwd()) template_path = Path('tools/azure-sdk-tools/packaging_tools/templates/setup.py') with open(template_path, 'r') as fr: content = fr.readlines() @@ -272,7 +271,6 @@ def get_need_mgmt_core(): def check_sdk_setup(self): def edit_sdk_setup(content: List[str]): - print("**** get_need_mgmt_core: ", list(self.get_need_mgmt_core())) target_msrest, target_mgmt_core = list(self.get_need_mgmt_core()) msrest_pattern = re.compile('msrest>=\d\.\d[1-2]\.\d[1-2]') mgmt_core_pattern = re.compile('azure-mgmt-core>=\d\.\d\.\d,<\d\.\d\.\d') From 1f67dfea37a512c48d0faba36ae03d91fea6fe2c Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 14 Jun 2022 15:35:29 +0800 Subject: [PATCH 092/133] move to ci check --- scripts/auto_release/main.py | 45 +++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 2cfd11d8d97f..89f87322b8fb 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -256,28 +256,12 @@ def edit_sdk_readme(content: List[str]): modify_file(sdk_readme, edit_sdk_readme) - @staticmethod - def get_need_mgmt_core(): - template_path = Path('tools/azure-sdk-tools/packaging_tools/templates/setup.py') - with open(template_path, 'r') as fr: - content = fr.readlines() - for line in content: - if 'msrest>' in line: - target_msrest = line.strip().strip(',').strip('\'') - yield target_msrest - if 'azure-mgmt-core' in line: - target_mgmt_core = line.strip().strip(',').strip('\'') - yield target_mgmt_core - def check_sdk_setup(self): def edit_sdk_setup(content: List[str]): - target_msrest, target_mgmt_core = list(self.get_need_mgmt_core()) - msrest_pattern = re.compile('msrest>=\d\.\d[1-2]\.\d[1-2]') - mgmt_core_pattern = re.compile('azure-mgmt-core>=\d\.\d\.\d,<\d\.\d\.\d') for i in range(0, len(content)): - content[i] = content[i].replace('msrestazure>=0.4.32,<2.0.0', target_mgmt_core) - content[i] = re.sub(mgmt_core_pattern, target_mgmt_core, content[i]) - content[i] = re.sub(msrest_pattern, target_msrest, content[i]) + content[i] = content[i].replace('msrestazure>=0.4.32,<2.0.0', 'azure-mgmt-core>=1.3.0,<2.0.0') + content[i] = content[i].replace('azure-mgmt-core>=1.2.0,<2.0.0', 'azure-mgmt-core>=1.3.0,<2.0.0') + content[i] = content[i].replace('msrest>=0.5.0', 'msrest>=0.6.21') modify_file(str(Path(self.sdk_code_path()) / 'setup.py'), edit_sdk_setup) @@ -391,12 +375,29 @@ def check_changelog_file(self): else: self.edit_changelog() + @staticmethod + def get_need_dependency(): + template_path = Path('tools/azure-sdk-tools/packaging_tools/templates/setup.py') + with open(template_path, 'r') as fr: + content = fr.readlines() + for line in content: + if 'msrest>' in line: + target_msrest = line.strip().strip(',').strip('\'') + yield target_msrest + if 'azure-mgmt-core' in line: + target_mgmt_core = line.strip().strip(',').strip('\'') + yield target_mgmt_core + def check_ci_file_proc(self, dependency: str): def edit_ci_file(content: List[str]): new_line = f'#override azure-mgmt-{self.package_name} {dependency}' + dependency_name = dependency.split('>')[0] for i in range(len(content)): if new_line in content[i]: return + if f'azure-mgmt-{self.package_name} {dependency_name}' in content[i]: + content[i] = new_line + return prefix = '' if '\n' in content[-1] else '\n' content.append(prefix + new_line + '\n') @@ -404,8 +405,10 @@ def edit_ci_file(content: List[str]): print_exec('git add shared_requirements.txt') def check_ci_file(self): - self.check_ci_file_proc('msrest>=0.6.21') - self.check_ci_file_proc('azure-mgmt-core>=1.3.0,<2.0.0') + # eg: target_msrest = 'msrest>=0.6.21', target_mgmt_core = 'azure-mgmt-core>=1.3.0,<2.0.0' + target_msrest, target_mgmt_core = list(self.get_need_dependency()) + self.check_ci_file_proc(target_msrest) + self.check_ci_file_proc(target_mgmt_core) def check_file(self): self.check_file_with_packaging_tool() From 88323f7c6d16504f169ce65ceee1755961aaae70 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Wed, 15 Jun 2022 10:36:50 +0800 Subject: [PATCH 093/133] Update main.py --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 89f87322b8fb..0dbdb7d66451 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -396,7 +396,7 @@ def edit_ci_file(content: List[str]): if new_line in content[i]: return if f'azure-mgmt-{self.package_name} {dependency_name}' in content[i]: - content[i] = new_line + content[i] = new_line + '\n' return prefix = '' if '\n' in content[-1] else '\n' content.append(prefix + new_line + '\n') From 4d8045e0bcb88f4a316a9f43e0d193faba9fcb8c Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Wed, 22 Jun 2022 14:14:16 +0800 Subject: [PATCH 094/133] for test --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 7c4aff504b5a..7878beb77b91 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -82,7 +82,7 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): usr = 'Azure' - branch = 'main' + branch = 'jftest-generate-servicebus-ci' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') From b11ff6f34a898fb55c1c84cf456109665eee93f9 Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Wed, 22 Jun 2022 14:54:01 +0800 Subject: [PATCH 095/133] restore --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 7878beb77b91..7c4aff504b5a 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -82,7 +82,7 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): usr = 'Azure' - branch = 'jftest-generate-servicebus-ci' + branch = 'main' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') From 9449e44f8549ef3178e7e2568306757a5c9a14c2 Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Wed, 6 Jul 2022 14:04:22 +0800 Subject: [PATCH 096/133] update msg for failed version --- scripts/auto_release/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 7c4aff504b5a..b25f05c468ca 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -285,7 +285,8 @@ def calculate_next_version_proc(self, last_version: str): preview_tag = not self.tag_is_stable changelog = self.get_changelog() if changelog == '': - return '0.0.0' + msg = 'it should be stable' if self.tag_is_stable else 'it should be perview' + return f'0.0.0 ({msg})' preview_version = 'rc' in last_version or 'b' in last_version # | preview tag | stable tag # preview version(1.0.0rc1/1.0.0b1) | 1.0.0rc2(track1)/1.0.0b2(track2) | 1.0.0 From aff78b2d9443cb01c1610edd3b76ad28b79e095c Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Thu, 7 Jul 2022 13:43:33 +0800 Subject: [PATCH 097/133] for testing --- scripts/auto_release/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index b25f05c468ca..d1a7066b0a24 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -81,8 +81,8 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): - usr = 'Azure' - branch = 'main' + usr = 'openapi-env-test' + branch = 'python-track2-test' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') From 2fbda64399d616b2f555d24634fe8c4eef4dc0eb Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Thu, 7 Jul 2022 16:57:39 +0800 Subject: [PATCH 098/133] for testing --- scripts/auto_release/main.py | 2 +- swagger_to_sdk_config_autorest.json | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index d1a7066b0a24..ec3d4b80ffa5 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -562,7 +562,7 @@ def create_pr(self): def run(self): self.prepare_branch() self.check_file() - self.run_test() + # self.run_test() self.create_pr() diff --git a/swagger_to_sdk_config_autorest.json b/swagger_to_sdk_config_autorest.json index 90bbc26bdf05..1fd31529a5cf 100644 --- a/swagger_to_sdk_config_autorest.json +++ b/swagger_to_sdk_config_autorest.json @@ -1,11 +1,12 @@ { "meta": { "autorest_options": { - "version": "3.7.2", - "use": ["@autorest/python@5.16.0", "@autorest/modelerfour@4.19.3"], + "version": "3.8.1", + "use": ["@autorest/python@6.0.1", "@autorest/modelerfour@4.23.5"], "python": "", "sdkrel:python-sdks-folder": "./sdk/.", - "python3-only": "" + "version-tolerant": false, + "models-mode": "msrest" }, "advanced_options": { "create_sdk_pull_requests": true, From 74c9e0caa345d1d357716d2845374274fc8d9652 Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Fri, 8 Jul 2022 09:50:05 +0800 Subject: [PATCH 099/133] restore --- swagger_to_sdk_config_autorest.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/swagger_to_sdk_config_autorest.json b/swagger_to_sdk_config_autorest.json index 1fd31529a5cf..90bbc26bdf05 100644 --- a/swagger_to_sdk_config_autorest.json +++ b/swagger_to_sdk_config_autorest.json @@ -1,12 +1,11 @@ { "meta": { "autorest_options": { - "version": "3.8.1", - "use": ["@autorest/python@6.0.1", "@autorest/modelerfour@4.23.5"], + "version": "3.7.2", + "use": ["@autorest/python@5.16.0", "@autorest/modelerfour@4.19.3"], "python": "", "sdkrel:python-sdks-folder": "./sdk/.", - "version-tolerant": false, - "models-mode": "msrest" + "python3-only": "" }, "advanced_options": { "create_sdk_pull_requests": true, From 3ec222f92424dcea14f8871e00bf3eecc59d40df Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Fri, 8 Jul 2022 09:52:09 +0800 Subject: [PATCH 100/133] restore --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index ec3d4b80ffa5..d1a7066b0a24 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -562,7 +562,7 @@ def create_pr(self): def run(self): self.prepare_branch() self.check_file() - # self.run_test() + self.run_test() self.create_pr() From c11dac07e376e91dc1556d65619b1b9653a757b5 Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Fri, 8 Jul 2022 14:04:28 +0800 Subject: [PATCH 101/133] pin fastcore version --- scripts/auto_release/requirement.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/auto_release/requirement.txt b/scripts/auto_release/requirement.txt index d8a62d6a6a1f..698652f950c2 100644 --- a/scripts/auto_release/requirement.txt +++ b/scripts/auto_release/requirement.txt @@ -3,4 +3,5 @@ python-dotenv==0.15.0 ghapi==0.1.19 packaging==21.3 pytest==6.2.5 -azure-storage-blob==12.9.0 \ No newline at end of file +azure-storage-blob==12.9.0 +fastcore==1.3.25 \ No newline at end of file From f889bead6dec6ea8f566937615ab1c96bc0d3890 Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Fri, 15 Jul 2022 13:55:08 +0800 Subject: [PATCH 102/133] test --- scripts/auto_release/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index d1a7066b0a24..92356ea358a2 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -81,8 +81,8 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): - usr = 'openapi-env-test' - branch = 'python-track2-test' + usr = 'BigCat20196' + branch = 'bigcat/update_auto_codegen' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') From db2f4a3f183a5f4b46dc35a3f931a8298b8fd054 Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Fri, 22 Jul 2022 11:06:24 +0800 Subject: [PATCH 103/133] debug --- scripts/auto_release/main.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 92356ea358a2..66bddb5c7e32 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -81,8 +81,8 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): - usr = 'BigCat20196' - branch = 'bigcat/update_auto_codegen' + usr = 'Azure' + branch = 'main' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') @@ -191,6 +191,7 @@ def generate_code(self): print_check(f'python -m packaging_tools.auto_codegen {self.autorest_result} {self.autorest_result}') generate_result = self.get_autorest_result() + print(f"*** generate_result: {generate_result}") self.tag_is_stable = list(generate_result.values())[0]['tagIsStable'] log(f"tag_is_stable is {self.tag_is_stable}") From 5741f7886cec18e9a026afde92c865d52b3ab147 Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Fri, 22 Jul 2022 11:26:26 +0800 Subject: [PATCH 104/133] debug --- scripts/auto_release/main.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 66bddb5c7e32..b25f05c468ca 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -191,7 +191,6 @@ def generate_code(self): print_check(f'python -m packaging_tools.auto_codegen {self.autorest_result} {self.autorest_result}') generate_result = self.get_autorest_result() - print(f"*** generate_result: {generate_result}") self.tag_is_stable = list(generate_result.values())[0]['tagIsStable'] log(f"tag_is_stable is {self.tag_is_stable}") From c8877f643bbf55f499369edbd46237fe4af9cbd1 Mon Sep 17 00:00:00 2001 From: msyyc <70930885+msyyc@users.noreply.github.com> Date: Tue, 26 Jul 2022 11:06:44 +0800 Subject: [PATCH 105/133] optimize --- .../azure-sdk-tools/packaging_tools/generate_utils.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/tools/azure-sdk-tools/packaging_tools/generate_utils.py b/tools/azure-sdk-tools/packaging_tools/generate_utils.py index 065e569e4b69..c565d7f0520e 100644 --- a/tools/azure-sdk-tools/packaging_tools/generate_utils.py +++ b/tools/azure-sdk-tools/packaging_tools/generate_utils.py @@ -166,18 +166,13 @@ def gen_basic_config(origin_config: Dict[str, Any]) -> Dict[str, Any]: return { "package-name": gen_package_name(origin_config), "license-header": "MICROSOFT_MIT_NO_VERSION", - "clear-output-folder": True, - "no-namespace-folders": True, - "version-tolerant": True, "package-version": origin_config.get("package-version", "1.0.0b1"), "require": ["../../../../../azure-rest-api-specs/" + line for line in origin_config["require"]], + "package-mode": "dataplane", + "output-folder": "../", } -def gen_general_output_folder(package_name: str) -> str: - return "../" + package_name.replace('-', '/') - - def gen_general_namespace(package_name: str) -> str: return package_name.replace('-', '.') @@ -186,7 +181,6 @@ def gen_dpg_config_single_client(origin_config: Dict[str, Any]) -> str: package_name = Path(origin_config["output-folder"]).parts[-1] readme_config = gen_basic_config(origin_config) readme_config.update({ - "output-folder": gen_general_output_folder(package_name), "namespace": gen_general_namespace(package_name), }) readme_content = yaml_block(yaml.safe_dump(readme_config), "### Settings") @@ -201,7 +195,6 @@ def gen_tag_config(origin_config: Dict[str, Any]) -> Dict[str, Any]: extra_part = tag_name.split("-")[-1] tag_config[tag_name] = { "namespace": gen_general_namespace(package_name) + f".{extra_part}", - "output-folder": gen_general_output_folder(package_name) + f"/{extra_part}" } return tag_config From 15f033c0acf2854633d3affae2fd9ad90b4f54ff Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Tue, 26 Jul 2022 11:38:23 +0800 Subject: [PATCH 106/133] Update setup.py --- tools/azure-sdk-tools/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/azure-sdk-tools/setup.py b/tools/azure-sdk-tools/setup.py index a568c5f5cac5..db116f4616f0 100644 --- a/tools/azure-sdk-tools/setup.py +++ b/tools/azure-sdk-tools/setup.py @@ -25,7 +25,7 @@ "azure-mgmt-storage", "azure-mgmt-keyvault", "python-dotenv", - "PyYAML==6.0" + "PyYAML" ] setup( From 374e1f38cee8d7c5b3e0f5c0d59186f72bdfb8e6 Mon Sep 17 00:00:00 2001 From: Zhou Zheng Date: Tue, 26 Jul 2022 18:32:19 +0800 Subject: [PATCH 107/133] sdk generation pipeline support dpg Signed-off-by: Zhou Zheng --- scripts/sdk_generate.sh | 4 ++-- scripts/sdk_init.sh | 4 ++-- .../packaging_tools/auto_codegen.py | 2 +- .../packaging_tools/generate_utils.py | 17 +++++++++-------- .../packaging_tools/sdk_generator.py | 15 ++++++++++----- .../packaging_tools/sdk_package.py | 11 +++++++++++ 6 files changed, 35 insertions(+), 18 deletions(-) diff --git a/scripts/sdk_generate.sh b/scripts/sdk_generate.sh index 69201e03613b..591889aa16f5 100755 --- a/scripts/sdk_generate.sh +++ b/scripts/sdk_generate.sh @@ -9,8 +9,8 @@ PATH="$VIRTUAL_ENV/bin:$PATH" export PATH # node version degrade -sudo npm install -g n -sudo n 14.15.0 +npm install -g n +n 14.15.0 echo "$PATH" export PATH="/usr/local/n/versions/node/14.15.0/bin:$PATH" diff --git a/scripts/sdk_init.sh b/scripts/sdk_init.sh index 916a51068cff..890373cea858 100755 --- a/scripts/sdk_init.sh +++ b/scripts/sdk_init.sh @@ -1,8 +1,8 @@ #!/bin/bash # install python3.8 -sudo apt-get install python3.8 -sudo apt-get install python3.8-venv +apt-get install python3.8 +apt-get install python3.8-venv # init env TMPDIR="$(dirname $(dirname $(readlink -f "$0")))/venv" diff --git a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py index 14f87f40a813..2ce77831c70b 100644 --- a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py +++ b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py @@ -28,7 +28,7 @@ def main(generate_input, generate_output): config = generate(CONFIG_FILE, sdk_folder, [], relative_path_readme, spec_folder, force_generation=True, python_tag=python_tag) else: - config = gen_dpg(input_readme, data.get('autorestConfig', '')) + config = gen_dpg(input_readme, data.get('autorestConfig', ''), spec_folder) package_names = get_package_names(sdk_folder) _LOGGER.info(f"[CODEGEN]({input_readme})codegen end. [(packages:{str(package_names)})]") diff --git a/tools/azure-sdk-tools/packaging_tools/generate_utils.py b/tools/azure-sdk-tools/packaging_tools/generate_utils.py index c565d7f0520e..a5e740907c8a 100644 --- a/tools/azure-sdk-tools/packaging_tools/generate_utils.py +++ b/tools/azure-sdk-tools/packaging_tools/generate_utils.py @@ -162,12 +162,13 @@ def gen_package_name(origin_config: Dict[str, Any]) -> str: return Path(origin_config["output-folder"]).parts[-1] -def gen_basic_config(origin_config: Dict[str, Any]) -> Dict[str, Any]: +def gen_basic_config(origin_config: Dict[str, Any], spec_folder: str = "../../../../../azure-rest-api-specs/") -> Dict[str, Any]: + spec_root = re.sub('specification', '', spec_folder) return { "package-name": gen_package_name(origin_config), "license-header": "MICROSOFT_MIT_NO_VERSION", "package-version": origin_config.get("package-version", "1.0.0b1"), - "require": ["../../../../../azure-rest-api-specs/" + line for line in origin_config["require"]], + "require": [spec_root + line for line in origin_config["require"]], "package-mode": "dataplane", "output-folder": "../", } @@ -177,9 +178,9 @@ def gen_general_namespace(package_name: str) -> str: return package_name.replace('-', '.') -def gen_dpg_config_single_client(origin_config: Dict[str, Any]) -> str: +def gen_dpg_config_single_client(origin_config: Dict[str, Any], spec_folder: str) -> str: package_name = Path(origin_config["output-folder"]).parts[-1] - readme_config = gen_basic_config(origin_config) + readme_config = gen_basic_config(origin_config, spec_folder) readme_config.update({ "namespace": gen_general_namespace(package_name), }) @@ -228,7 +229,7 @@ def gen_dpg_config_multi_client(origin_config: Dict[str, Any]) -> str: # generate swagger/README.md and return relative path based on SDK repo root path -def gen_dpg_config(autorest_config: str) -> str: +def gen_dpg_config(autorest_config: str, spec_folder: str) -> str: # remove useless lines autorest_config = extract_yaml_content(autorest_config) _LOGGER.info(f"autorestConfig after remove useless lines:\n{autorest_config}") @@ -244,7 +245,7 @@ def gen_dpg_config(autorest_config: str) -> str: if "batch:" in autorest_config: readme_content = gen_dpg_config_multi_client(origin_config) else: - readme_content = gen_dpg_config_single_client(origin_config) + readme_content = gen_dpg_config_single_client(origin_config, spec_folder) # output autorest configuration swagger_readme = str(Path(swagger_folder, _DPG_README)) @@ -265,10 +266,10 @@ def lookup_swagger_readme(rest_readme_path: str) -> str: return "" -def gen_dpg(rest_readme_path: str, autorest_config: str) -> Dict[str, Any]: +def gen_dpg(rest_readme_path: str, autorest_config: str, spec_folder: str) -> Dict[str, Any]: # generate or find swagger/README.md if autorest_config: - swagger_readme = gen_dpg_config(autorest_config) + swagger_readme = gen_dpg_config(autorest_config, spec_folder) else: swagger_readme = lookup_swagger_readme(rest_readme_path) if not swagger_readme: diff --git a/tools/azure-sdk-tools/packaging_tools/sdk_generator.py b/tools/azure-sdk-tools/packaging_tools/sdk_generator.py index c2b06e51322e..a730bdaebe8d 100644 --- a/tools/azure-sdk-tools/packaging_tools/sdk_generator.py +++ b/tools/azure-sdk-tools/packaging_tools/sdk_generator.py @@ -4,9 +4,9 @@ from pathlib import Path from subprocess import check_call -from .swaggertosdk.SwaggerToSdkCore import CONFIG_FILE, CONFIG_FILE_DPG +from .swaggertosdk.SwaggerToSdkCore import CONFIG_FILE from .generate_sdk import generate -from .generate_utils import get_package_names, init_new_service, update_servicemetadata, judge_tag_preview +from .generate_utils import get_package_names, init_new_service, update_servicemetadata, judge_tag_preview, gen_dpg _LOGGER = logging.getLogger(__name__) @@ -24,8 +24,10 @@ def main(generate_input, generate_output): input_readme = data["relatedReadmeMdFile"] relative_path_readme = str(Path(spec_folder, input_readme)) _LOGGER.info(f"[CODEGEN]({input_readme})codegen begin") - config_file = CONFIG_FILE if 'resource-manager' in input_readme else CONFIG_FILE_DPG - config = generate(config_file, sdk_folder, [], relative_path_readme, spec_folder, force_generation=True) + if 'resource-manager' in input_readme: + config = generate(CONFIG_FILE, sdk_folder, [], relative_path_readme, spec_folder, force_generation=True) + else: + config = gen_dpg(input_readme, data.get('autorestConfig', ''), spec_folder) package_names = get_package_names(sdk_folder) _LOGGER.info(f"[CODEGEN]({input_readme})codegen end. [(packages:{str(package_names)})]") @@ -39,10 +41,12 @@ def main(generate_input, generate_output): package_entry = {} package_entry["packageName"] = package_name package_entry["path"] = [folder_name] + package_entry["readmeMd"] = [input_readme] package_entry["tagIsStable"] = not judge_tag_preview(sdk_code_path) result[package_name] = package_entry else: result[package_name]["path"].append(folder_name) + result[package_name]["readmeMd"].append(input_readme) # Generate some necessary file for new service init_new_service(package_name, folder_name) @@ -51,7 +55,7 @@ def main(generate_input, generate_output): try: update_servicemetadata(sdk_folder, data, config, folder_name, package_name, spec_folder, input_readme) except Exception as e: - _LOGGER.info(str(e)) + _LOGGER.info(f"fail to update meta: {str(e)}") # Setup package locally check_call( @@ -62,6 +66,7 @@ def main(generate_input, generate_output): # remove duplicates for value in result.values(): value["path"] = list(set(value["path"])) + value["readmeMd"] = list(set(value["readmeMd"])) with open(generate_output, "w") as writer: json.dump(result, writer) diff --git a/tools/azure-sdk-tools/packaging_tools/sdk_package.py b/tools/azure-sdk-tools/packaging_tools/sdk_package.py index cbf5c5d799bf..fdb0d2e9a70d 100644 --- a/tools/azure-sdk-tools/packaging_tools/sdk_package.py +++ b/tools/azure-sdk-tools/packaging_tools/sdk_package.py @@ -13,6 +13,7 @@ def main(generate_input, generate_output): with open(generate_input, "r") as reader: data = json.load(reader) + _LOGGER.info(f"auto_package input: {data}") sdk_folder = "." result = {"packages": []} @@ -38,9 +39,19 @@ def main(generate_input, generate_output): dist_path = Path(sdk_folder, folder_name, package_name, "dist") package["artifacts"] = [str(dist_path / package_file) for package_file in os.listdir(dist_path)] package["result"] = "succeeded" + # Installation package + package["installInstructions"] = { + "full": "You can install the use using pip install of the artificats.", + "lite": f"pip install {package_name}", + } # to distinguish with track1 if 'azure-mgmt-' in package_name: package["packageName"] = "track2_" + package["packageName"] + for artifact in package["artifacts"]: + if ".whl" in artifact: + package["apiViewArtifact"] = artifact + package["language"] = "Python" + break package["packageFolder"] = package["path"][0] result["packages"].append(package) From 937bd2102fa94744d2e88bc1470bfa710a0e7d64 Mon Sep 17 00:00:00 2001 From: Zhou Zheng Date: Tue, 26 Jul 2022 18:53:38 +0800 Subject: [PATCH 108/133] auto codegen don't use specFolder to define swagger repo's location Signed-off-by: Zhou Zheng --- tools/azure-sdk-tools/packaging_tools/auto_codegen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py index 2ce77831c70b..b35318a340d2 100644 --- a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py +++ b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py @@ -28,7 +28,7 @@ def main(generate_input, generate_output): config = generate(CONFIG_FILE, sdk_folder, [], relative_path_readme, spec_folder, force_generation=True, python_tag=python_tag) else: - config = gen_dpg(input_readme, data.get('autorestConfig', ''), spec_folder) + config = gen_dpg(input_readme, data.get('autorestConfig', ''), "../../../../../azure-rest-api-specs/") package_names = get_package_names(sdk_folder) _LOGGER.info(f"[CODEGEN]({input_readme})codegen end. [(packages:{str(package_names)})]") From dab3a92f62aff6c4250c2dcd9514d6acb0975ab0 Mon Sep 17 00:00:00 2001 From: Zhou Zheng Date: Tue, 26 Jul 2022 19:08:45 +0800 Subject: [PATCH 109/133] fetch automation_generate.sh recent change to sdk_generate.sh Signed-off-by: Zhou Zheng --- tools/azure-sdk-tools/packaging_tools/sdk_generator.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/azure-sdk-tools/packaging_tools/sdk_generator.py b/tools/azure-sdk-tools/packaging_tools/sdk_generator.py index a730bdaebe8d..0ef787271d34 100644 --- a/tools/azure-sdk-tools/packaging_tools/sdk_generator.py +++ b/tools/azure-sdk-tools/packaging_tools/sdk_generator.py @@ -6,7 +6,8 @@ from .swaggertosdk.SwaggerToSdkCore import CONFIG_FILE from .generate_sdk import generate -from .generate_utils import get_package_names, init_new_service, update_servicemetadata, judge_tag_preview, gen_dpg +from .generate_utils import (get_package_names, init_new_service, update_servicemetadata, judge_tag_preview, + format_samples, gen_dpg) _LOGGER = logging.getLogger(__name__) @@ -19,13 +20,15 @@ def main(generate_input, generate_output): spec_folder = data["specFolder"] sdk_folder = "." result = {} + python_tag = data.get('python_tag') package_total = set() input_readme = data["relatedReadmeMdFile"] relative_path_readme = str(Path(spec_folder, input_readme)) _LOGGER.info(f"[CODEGEN]({input_readme})codegen begin") if 'resource-manager' in input_readme: - config = generate(CONFIG_FILE, sdk_folder, [], relative_path_readme, spec_folder, force_generation=True) + config = generate(CONFIG_FILE, sdk_folder, [], relative_path_readme, spec_folder, force_generation=True, + python_tag=python_tag) else: config = gen_dpg(input_readme, data.get('autorestConfig', ''), spec_folder) package_names = get_package_names(sdk_folder) @@ -50,6 +53,7 @@ def main(generate_input, generate_output): # Generate some necessary file for new service init_new_service(package_name, folder_name) + format_samples(sdk_code_path) # Update metadata try: From 7607ffa2f1d2764213ca9be6e0823a9ee3011613 Mon Sep 17 00:00:00 2001 From: Zhou Zheng Date: Wed, 27 Jul 2022 11:04:56 +0800 Subject: [PATCH 110/133] set default spec flord as global constant Signed-off-by: Zhou Zheng --- tools/azure-sdk-tools/packaging_tools/auto_codegen.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py index b35318a340d2..620f39a21a5e 100644 --- a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py +++ b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py @@ -11,6 +11,7 @@ _LOGGER = logging.getLogger(__name__) +DEFAULT_SPEC_FOLDER = "../../../../../azure-rest-api-specs/" def main(generate_input, generate_output): with open(generate_input, "r") as reader: @@ -28,7 +29,7 @@ def main(generate_input, generate_output): config = generate(CONFIG_FILE, sdk_folder, [], relative_path_readme, spec_folder, force_generation=True, python_tag=python_tag) else: - config = gen_dpg(input_readme, data.get('autorestConfig', ''), "../../../../../azure-rest-api-specs/") + config = gen_dpg(input_readme, data.get('autorestConfig', ''), DEFAULT_SPEC_FOLDER) package_names = get_package_names(sdk_folder) _LOGGER.info(f"[CODEGEN]({input_readme})codegen end. [(packages:{str(package_names)})]") From 0bc45a0dd0dc520eae4d7532523aabf1d9ba03c2 Mon Sep 17 00:00:00 2001 From: Zhou Zheng Date: Wed, 27 Jul 2022 11:37:21 +0800 Subject: [PATCH 111/133] set DEFAULT_SPEC_FOLDER in generate_utils Signed-off-by: Zhou Zheng --- tools/azure-sdk-tools/packaging_tools/auto_codegen.py | 4 +--- tools/azure-sdk-tools/packaging_tools/generate_utils.py | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py index 620f39a21a5e..a55ffe9e658a 100644 --- a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py +++ b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py @@ -7,12 +7,10 @@ from .swaggertosdk.SwaggerToSdkCore import CONFIG_FILE from .generate_sdk import generate from .generate_utils import (get_package_names, init_new_service, update_servicemetadata, judge_tag_preview, - format_samples, gen_dpg) + format_samples, gen_dpg, DEFAULT_SPEC_FOLDER) _LOGGER = logging.getLogger(__name__) -DEFAULT_SPEC_FOLDER = "../../../../../azure-rest-api-specs/" - def main(generate_input, generate_output): with open(generate_input, "r") as reader: data = json.load(reader) diff --git a/tools/azure-sdk-tools/packaging_tools/generate_utils.py b/tools/azure-sdk-tools/packaging_tools/generate_utils.py index a5e740907c8a..452cc7c03106 100644 --- a/tools/azure-sdk-tools/packaging_tools/generate_utils.py +++ b/tools/azure-sdk-tools/packaging_tools/generate_utils.py @@ -19,6 +19,7 @@ _SDK_FOLDER_RE = re.compile(r"^(sdk/[\w-]+)/(azure[\w-]+)/", re.ASCII) DEFAULT_DEST_FOLDER = "./dist" +DEFAULT_SPEC_FOLDER = "../../../../../azure-rest-api-specs/" _DPG_README = "README.md" def get_package_names(sdk_folder): @@ -162,7 +163,7 @@ def gen_package_name(origin_config: Dict[str, Any]) -> str: return Path(origin_config["output-folder"]).parts[-1] -def gen_basic_config(origin_config: Dict[str, Any], spec_folder: str = "../../../../../azure-rest-api-specs/") -> Dict[str, Any]: +def gen_basic_config(origin_config: Dict[str, Any], spec_folder: str = DEFAULT_SPEC_FOLDER) -> Dict[str, Any]: spec_root = re.sub('specification', '', spec_folder) return { "package-name": gen_package_name(origin_config), From ec10281371b5dbc7978b52706cc2164ad9e7d01d Mon Sep 17 00:00:00 2001 From: msyyc <70930885+msyyc@users.noreply.github.com> Date: Thu, 28 Jul 2022 16:25:19 +0800 Subject: [PATCH 112/133] code --- .../packaging_tools/auto_codegen.py | 4 +-- .../packaging_tools/generate_utils.py | 29 +++++-------------- 2 files changed, 9 insertions(+), 24 deletions(-) diff --git a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py index a55ffe9e658a..de2d39ace085 100644 --- a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py +++ b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py @@ -7,7 +7,7 @@ from .swaggertosdk.SwaggerToSdkCore import CONFIG_FILE from .generate_sdk import generate from .generate_utils import (get_package_names, init_new_service, update_servicemetadata, judge_tag_preview, - format_samples, gen_dpg, DEFAULT_SPEC_FOLDER) + format_samples, gen_dpg, dpg_relative_folder) _LOGGER = logging.getLogger(__name__) @@ -27,7 +27,7 @@ def main(generate_input, generate_output): config = generate(CONFIG_FILE, sdk_folder, [], relative_path_readme, spec_folder, force_generation=True, python_tag=python_tag) else: - config = gen_dpg(input_readme, data.get('autorestConfig', ''), DEFAULT_SPEC_FOLDER) + config = gen_dpg(input_readme, data.get('autorestConfig', ''), dpg_relative_folder(spec_folder)) package_names = get_package_names(sdk_folder) _LOGGER.info(f"[CODEGEN]({input_readme})codegen end. [(packages:{str(package_names)})]") diff --git a/tools/azure-sdk-tools/packaging_tools/generate_utils.py b/tools/azure-sdk-tools/packaging_tools/generate_utils.py index 02d88a980e94..4037f1357a6d 100644 --- a/tools/azure-sdk-tools/packaging_tools/generate_utils.py +++ b/tools/azure-sdk-tools/packaging_tools/generate_utils.py @@ -19,12 +19,11 @@ _SDK_FOLDER_RE = re.compile(r"^(sdk/[\w-]+)/(azure[\w-]+)/", re.ASCII) DEFAULT_DEST_FOLDER = "./dist" -<<<<<<< HEAD -DEFAULT_SPEC_FOLDER = "../../../../../azure-rest-api-specs/" -======= ->>>>>>> f5eded26f09270ae60c840dab2ce275d523eb8f6 _DPG_README = "README.md" +def dpg_relative_folder(spec_folder: str) -> str: + return ("../" * 4) + spec_folder + "/" + def get_package_names(sdk_folder): files = get_add_diff_file_list(sdk_folder) matches = {_SDK_FOLDER_RE.search(f) for f in files} @@ -166,21 +165,13 @@ def gen_package_name(origin_config: Dict[str, Any]) -> str: return Path(origin_config["output-folder"]).parts[-1] -<<<<<<< HEAD -def gen_basic_config(origin_config: Dict[str, Any], spec_folder: str = DEFAULT_SPEC_FOLDER) -> Dict[str, Any]: +def gen_basic_config(origin_config: Dict[str, Any], spec_folder: str) -> Dict[str, Any]: spec_root = re.sub('specification', '', spec_folder) -======= -def gen_basic_config(origin_config: Dict[str, Any]) -> Dict[str, Any]: ->>>>>>> f5eded26f09270ae60c840dab2ce275d523eb8f6 return { "package-name": gen_package_name(origin_config), "license-header": "MICROSOFT_MIT_NO_VERSION", "package-version": origin_config.get("package-version", "1.0.0b1"), -<<<<<<< HEAD "require": [spec_root + line for line in origin_config["require"]], -======= - "require": ["../../../../../azure-rest-api-specs/" + line for line in origin_config["require"]], ->>>>>>> f5eded26f09270ae60c840dab2ce275d523eb8f6 "package-mode": "dataplane", "output-folder": "../", } @@ -190,15 +181,9 @@ def gen_general_namespace(package_name: str) -> str: return package_name.replace('-', '.') -<<<<<<< HEAD def gen_dpg_config_single_client(origin_config: Dict[str, Any], spec_folder: str) -> str: package_name = Path(origin_config["output-folder"]).parts[-1] readme_config = gen_basic_config(origin_config, spec_folder) -======= -def gen_dpg_config_single_client(origin_config: Dict[str, Any]) -> str: - package_name = Path(origin_config["output-folder"]).parts[-1] - readme_config = gen_basic_config(origin_config) ->>>>>>> f5eded26f09270ae60c840dab2ce275d523eb8f6 readme_config.update({ "namespace": gen_general_namespace(package_name), }) @@ -227,9 +212,9 @@ def gen_batch_config(origin_config: Dict[str, Any]) -> Dict[str, Any]: return {"batch": batch_config} -def gen_dpg_config_multi_client(origin_config: Dict[str, Any]) -> str: +def gen_dpg_config_multi_client(origin_config: Dict[str, Any], spec_folder: str) -> str: # generate config - basic_config = gen_basic_config(origin_config) + basic_config = gen_basic_config(origin_config, spec_folder) batch_config = gen_batch_config(origin_config) tag_config = gen_tag_config(origin_config) @@ -261,7 +246,7 @@ def gen_dpg_config(autorest_config: str, spec_folder: str) -> str: # generate autorest configuration if "batch:" in autorest_config: - readme_content = gen_dpg_config_multi_client(origin_config) + readme_content = gen_dpg_config_multi_client(origin_config, spec_folder) else: readme_content = gen_dpg_config_single_client(origin_config, spec_folder) From b41f34ac23a3a4c981fe37776da54124ff7a58fe Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Mon, 8 Aug 2022 13:49:02 +0800 Subject: [PATCH 113/133] fix auto-release utils --- scripts/auto_release/util.py | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/scripts/auto_release/util.py b/scripts/auto_release/util.py index c9e9305dce9d..a2fe9a858d1a 100644 --- a/scripts/auto_release/util.py +++ b/scripts/auto_release/util.py @@ -1,31 +1,15 @@ from pathlib import Path -CERTIFICATION = ''' ------BEGIN CERTIFICATE----- -MIIDSDCCAjCgAwIBAgIUPMKpJ/j10eQrcQBNnkImIaOYHakwDQYJKoZIhvcNAQEL -BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTIxMDgwNTAwMzU1NloXDTIyMDgw -NTAwMzU1NlowFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEF -AAOCAQ8AMIIBCgKCAQEAxe/ZseXgOTVoF7uTjX5Leknk95jIoyGc+VlxA8BhzGOr -r4u6VNQZRCMq+svHY36tW4+u/xHNe2kvbwy2mnS8cFFLfst+94qBZVJDBxSGZ9I/ -wekErNsjFsik4UrMvcC+ZlGPh7hb3f7tSx29tn1DIkAUXVnbZ6TT5s+mYRQpZ6fW -6kR3RNfc0A1IUM7Zs9yfNEr0O2H41P2HcLKoOPtvd7GvTQm9Ofh3srKvII+sZn/J -WH7r76oRQMX904mOMdryQwZLObsqX4dXIEbafKVSecB3PBVIhv8gVtJhcZbQP1pI -mMiWd6PHv46ZhGf7+cKnYUSa8Ia2t/wetK1wd00dFwIDAQABo4GRMIGOMA8GA1Ud -EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGmMBYGA1UdJQEB/wQMMAoGCCsGAQUF -BwMBMBcGA1UdEQEB/wQNMAuCCWxvY2FsaG9zdDA6BgorBgEEAYI3VAEBBCwMKkFT -UC5ORVQgQ29yZSBIVFRQUyBkZXZlbG9wbWVudCBjZXJ0aWZpY2F0ZTANBgkqhkiG -9w0BAQsFAAOCAQEAIj2VlBVcXGSly6KCBg6lgwFi+henWfSox77iuGAaAxDjN3jd -9lZahW4MPNLHKSrPRb4YNSLZ2jh7zdcttQrqd4qH65o1q56q5JrCmli99iIzY9Y8 -RdYyxK4Zzr31wjpsyFiWQfqJTuSFUUg9uDDj0negwEZLIGlt7nr12wflt2+QOJtD -byMeSZLbB5dPzn341DK0qfJEJMMgL0XsPEVZ3TQ6Alc9zq5wI608C/mXnz3xJE05 -UTYD8pRJJ/DyG0empvOVE8Sg93msHPquAbgqO9aqCpykgg/a8CFvI4wRdfvGEFlv -8XJKL8Y/PFsmFeO3axq3zUYKFVdc9Un4dFIaag== ------END CERTIFICATE----- -''' + +def _find_certificate(): + devcert_path = Path('eng/common/testproxy/dotnet-devcert.crt') + with open(devcert_path, 'r') as fr: + return fr.read() def add_certificate(): + certification = _find_certificate() cacert_path = Path('../venv-sdk/lib/python3.8/site-packages/certifi/cacert.pem') with open(cacert_path, 'a+') as f: f.seek(0, 0) - f.write(CERTIFICATION) + f.write(certification) From 1787c9ac8b4497f9985aee28ee12b60909a95629 Mon Sep 17 00:00:00 2001 From: msyyc <70930885+msyyc@users.noreply.github.com> Date: Wed, 10 Aug 2022 11:12:15 +0800 Subject: [PATCH 114/133] code --- scripts/auto_release/main.py | 18 ++++++++++++++---- scripts/release_helper/python.py | 8 +++++++- .../packaging_tools/change_log.py | 6 +++--- .../packaging_tools/code_report.py | 1 + 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index a423955e8c96..7de4c0cbb640 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -54,9 +54,9 @@ def preview_version_plus(preview_label: str, last_version: str) -> str: def stable_version_plus(changelog: str, last_version: str): flag = [False, False, False] # breaking, feature, bugfix - flag[0] = '**Breaking changes**' in changelog - flag[1] = '**Features**' in changelog - flag[2] = '**Bugfixes**' in changelog + flag[0] = '### Breaking changes' in changelog + flag[1] = '### Features Added' in changelog + flag[2] = '### Bugs Fixed' in changelog num = last_version.split('.') if flag[0]: @@ -380,6 +380,16 @@ def get_need_dependency(): target_mgmt_core = line.strip().strip(',').strip('\'') yield target_mgmt_core + @staticmethod + def insert_line_num(content: List[str]) -> int: + start_num = 0 + end_num = len(content) + for i in range(end_num): + if content[i].find("#override azure-mgmt-") > -1: + start_num = i + break + return (int(str(time.time()).split('.')[-1]) % max(end_num - start_num, 1)) + start_num + def check_ci_file_proc(self, dependency: str): def edit_ci_file(content: List[str]): new_line = f'#override azure-mgmt-{self.package_name} {dependency}' @@ -391,7 +401,7 @@ def edit_ci_file(content: List[str]): content[i] = new_line + '\n' return prefix = '' if '\n' in content[-1] else '\n' - content.append(prefix + new_line + '\n') + content.insert(self.insert_line_num(content), prefix + new_line + '\n') modify_file(str(Path('shared_requirements.txt')), edit_ci_file) print_exec('git add shared_requirements.txt') diff --git a/scripts/release_helper/python.py b/scripts/release_helper/python.py index 3f020b14c09d..9beed7ae9f39 100644 --- a/scripts/release_helper/python.py +++ b/scripts/release_helper/python.py @@ -19,6 +19,7 @@ _7_DAY_ATTENTION = '7days attention' _MultiAPI = 'MultiAPI' _ON_TIME = 'on time' +_HOLD_ON = 'HoldOn' # record published issues _FILE_OUT = 'published_issues_python.csv' @@ -114,7 +115,11 @@ def attention_policy(self): def on_time_policy(self): if _ON_TIME in self.issue_package.labels_name: - self.bot_advice.append('on time') + self.bot_advice.append('On time') + + def hold_on_policy(self): + if _HOLD_ON in self.issue_package.labels_name: + self.bot_advice.append('Hold on') def remind_policy(self): if self.delay_time >= 15 and _7_DAY_ATTENTION in self.issue_package.labels_name and self.date_from_target < 0: @@ -133,6 +138,7 @@ def auto_bot_advice(self): self.multi_api_policy() self.attention_policy() self.on_time_policy() + self.hold_on_policy() self.remind_policy() diff --git a/tools/azure-sdk-tools/packaging_tools/change_log.py b/tools/azure-sdk-tools/packaging_tools/change_log.py index 07edeadaf9b1..118aa15b1669 100644 --- a/tools/azure-sdk-tools/packaging_tools/change_log.py +++ b/tools/azure-sdk-tools/packaging_tools/change_log.py @@ -31,11 +31,11 @@ def build_md(self): self.sort() buffer = [] if self.features: - _build_md(sorted(set(self.features), key=self.features.index), "**Features**", buffer) + _build_md(sorted(set(self.features), key=self.features.index), "### Features Added", buffer) if self.breaking_changes: - _build_md(sorted(set(self.breaking_changes), key=self.breaking_changes.index), "**Breaking changes**", buffer) + _build_md(sorted(set(self.breaking_changes), key=self.breaking_changes.index), "### Breaking changes", buffer) if not (self.features or self.breaking_changes) and self.optional_features: - _build_md(sorted(set(self.optional_features), key=self.optional_features.index), "**Features**", buffer) + _build_md(sorted(set(self.optional_features), key=self.optional_features.index), "### Features Added", buffer) return "\n".join(buffer).strip() diff --git a/tools/azure-sdk-tools/packaging_tools/code_report.py b/tools/azure-sdk-tools/packaging_tools/code_report.py index bb5799209e8c..40a15848b065 100644 --- a/tools/azure-sdk-tools/packaging_tools/code_report.py +++ b/tools/azure-sdk-tools/packaging_tools/code_report.py @@ -165,6 +165,7 @@ def merge_report(report_paths): merged_report["models"]["exceptions"].update(report_json["models"]["exceptions"]) merged_report["models"]["models"].update(report_json["models"]["models"]) merged_report["operations"].update(report_json["operations"]) + merged_report["client"] = report_json["client"] return merged_report From 7e05eca978879b64f8adce41067d08d9e7cacca0 Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Wed, 10 Aug 2022 11:35:01 +0800 Subject: [PATCH 115/133] Update main.py --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 7de4c0cbb640..660ee7744c1b 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -82,7 +82,7 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): usr = 'Azure' - branch = 'main' + branch = 'changelog-sharerequirements' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') From e7c45b1ceac0af02fca2d8b98025e1c78432f4d8 Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Wed, 17 Aug 2022 14:54:50 +0800 Subject: [PATCH 116/133] add python commit --- scripts/auto_release/PythonSdkLiveTest.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index f70e2c727afa..2e51899b4a22 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -47,6 +47,9 @@ jobs: mkdir azure-rest-api-specs git clone https://github.com/Azure/azure-rest-api-specs.git $(pwd)/azure-rest-api-specs + if [ "$(PYTHON_COMMIT)" ]; then + git reset --hard $(PYTHON_COMMIT) + fi # install autorest sudo npm install -g n From f2aa1d7f2ab06c824704ab54b25be0fe2c554918 Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Wed, 17 Aug 2022 15:17:39 +0800 Subject: [PATCH 117/133] update branch --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 27423d0c765e..86766e1c2b78 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -82,7 +82,7 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): usr = 'Azure' - branch = 'changelog-sharerequirements' + branch = 'main' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') From 6cfbbf0a1dc7b8b27890fa99940c2f660775b595 Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Wed, 17 Aug 2022 15:34:37 +0800 Subject: [PATCH 118/133] debug --- scripts/auto_release/PythonSdkLiveTest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index 2e51899b4a22..9764fa47fc69 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -49,6 +49,7 @@ jobs: if [ "$(PYTHON_COMMIT)" ]; then git reset --hard $(PYTHON_COMMIT) + echo $(PYTHON_COMMIT) fi # install autorest From aadf9895286a9d347892d451a2f45e1c0ceac3d9 Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Wed, 17 Aug 2022 15:53:14 +0800 Subject: [PATCH 119/133] update --- scripts/auto_release/PythonSdkLiveTest.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index 9764fa47fc69..89b755cf7a82 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -48,8 +48,9 @@ jobs: git clone https://github.com/Azure/azure-rest-api-specs.git $(pwd)/azure-rest-api-specs if [ "$(PYTHON_COMMIT)" ]; then + cd azure-rest-api-specs git reset --hard $(PYTHON_COMMIT) - echo $(PYTHON_COMMIT) + cd ../ fi # install autorest From 921f5dcea5795776f63af8c22a8761b1c076dcfa Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Wed, 17 Aug 2022 16:13:02 +0800 Subject: [PATCH 120/133] Update PythonSdkLiveTest.yml --- scripts/auto_release/PythonSdkLiveTest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index 89b755cf7a82..c70f5cea1416 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -47,9 +47,9 @@ jobs: mkdir azure-rest-api-specs git clone https://github.com/Azure/azure-rest-api-specs.git $(pwd)/azure-rest-api-specs - if [ "$(PYTHON_COMMIT)" ]; then + if [ "$(REST_REPO_HASH)" ]; then cd azure-rest-api-specs - git reset --hard $(PYTHON_COMMIT) + git reset --hard $(REST_REPO_HASH) cd ../ fi From 87b00d21a68a24bf29f144c07c6fe2b7ba4fb9ee Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Wed, 24 Aug 2022 10:53:00 +0800 Subject: [PATCH 121/133] test 6.1.3 --- swagger_to_sdk_config_autorest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swagger_to_sdk_config_autorest.json b/swagger_to_sdk_config_autorest.json index 973c3a4af948..695705429501 100644 --- a/swagger_to_sdk_config_autorest.json +++ b/swagger_to_sdk_config_autorest.json @@ -2,7 +2,7 @@ "meta": { "autorest_options": { "version": "3.8.4", - "use": ["@autorest/python@6.0.1", "@autorest/modelerfour@4.23.5"], + "use": ["@autorest/python@6.1.3", "@autorest/modelerfour@4.23.5"], "python": "", "sdkrel:python-sdks-folder": "./sdk/.", "version-tolerant": false, From a4bf1316cce34efed4759c5973d3d64272bb4e85 Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Wed, 24 Aug 2022 16:26:23 +0800 Subject: [PATCH 122/133] test 6.1.3 --- scripts/auto_release/PythonSdkLiveTest.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index c70f5cea1416..5fcaabc30040 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -47,6 +47,12 @@ jobs: mkdir azure-rest-api-specs git clone https://github.com/Azure/azure-rest-api-specs.git $(pwd)/azure-rest-api-specs + cd azure-sdk-for-python + git remote add msyyc https://github.com/msyyc/azure-sdk-for-python.git + git fetch msyyc auto-release-debug + git checkout msyyc/auto-release-debug + cd ../ + if [ "$(REST_REPO_HASH)" ]; then cd azure-rest-api-specs git reset --hard $(REST_REPO_HASH) From bff5fa0a30bb94afc36fff5a9f358aebdcc6d3a6 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Wed, 24 Aug 2022 17:48:48 +0800 Subject: [PATCH 123/133] Update PythonSdkLiveTest.yml for Azure Pipelines --- scripts/auto_release/PythonSdkLiveTest.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index 5fcaabc30040..163f7117e584 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -48,9 +48,8 @@ jobs: git clone https://github.com/Azure/azure-rest-api-specs.git $(pwd)/azure-rest-api-specs cd azure-sdk-for-python - git remote add msyyc https://github.com/msyyc/azure-sdk-for-python.git - git fetch msyyc auto-release-debug - git checkout msyyc/auto-release-debug + git fetch origin test-autorest-6.1.3 + git checkout test-autorest-6.1.3 cd ../ if [ "$(REST_REPO_HASH)" ]; then From 7614fc1afa95fe926d17f19b51c276cad0eb17b5 Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Thu, 25 Aug 2022 10:07:36 +0800 Subject: [PATCH 124/133] test 6.1.3 --- scripts/auto_release/PythonSdkLiveTest.yml | 5 ----- scripts/auto_release/main.py | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index 163f7117e584..c70f5cea1416 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -47,11 +47,6 @@ jobs: mkdir azure-rest-api-specs git clone https://github.com/Azure/azure-rest-api-specs.git $(pwd)/azure-rest-api-specs - cd azure-sdk-for-python - git fetch origin test-autorest-6.1.3 - git checkout test-autorest-6.1.3 - cd ../ - if [ "$(REST_REPO_HASH)" ]; then cd azure-rest-api-specs git reset --hard $(REST_REPO_HASH) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 86766e1c2b78..3e1d12a201cd 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -82,7 +82,7 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): usr = 'Azure' - branch = 'main' + branch = 'test-autorest-6.1.3' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') From fffb00f5ea829c68c9e71629ef0980fb1a180a83 Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Thu, 25 Aug 2022 13:36:48 +0800 Subject: [PATCH 125/133] test --- scripts/auto_release/PythonSdkLiveTest.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index c70f5cea1416..b77650178c6c 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -47,6 +47,11 @@ jobs: mkdir azure-rest-api-specs git clone https://github.com/Azure/azure-rest-api-specs.git $(pwd)/azure-rest-api-specs + cd azure-rest-api-specs + git fetch origin bigcat-test-network + git checkout bigcat-test-network + cd ../ + if [ "$(REST_REPO_HASH)" ]; then cd azure-rest-api-specs git reset --hard $(REST_REPO_HASH) From 75b7f3625f5c657ad4a4edcadc4489c0d09ad86c Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Thu, 25 Aug 2022 13:48:49 +0800 Subject: [PATCH 126/133] test --- scripts/auto_release/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 3e1d12a201cd..bf704e908831 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -86,6 +86,7 @@ def checkout_azure_default_branch(): print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') + print("*** success change branch") def modify_file(file_path: str, func: Any): From 74d2440cf760949ba9f71a3cabb3273ce0217fa5 Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Fri, 26 Aug 2022 14:43:00 +0800 Subject: [PATCH 127/133] rollback --- scripts/auto_release/PythonSdkLiveTest.yml | 5 ----- scripts/auto_release/main.py | 3 +-- swagger_to_sdk_config_autorest.json | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index b77650178c6c..c70f5cea1416 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -47,11 +47,6 @@ jobs: mkdir azure-rest-api-specs git clone https://github.com/Azure/azure-rest-api-specs.git $(pwd)/azure-rest-api-specs - cd azure-rest-api-specs - git fetch origin bigcat-test-network - git checkout bigcat-test-network - cd ../ - if [ "$(REST_REPO_HASH)" ]; then cd azure-rest-api-specs git reset --hard $(REST_REPO_HASH) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index bf704e908831..86766e1c2b78 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -82,11 +82,10 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): usr = 'Azure' - branch = 'test-autorest-6.1.3' + branch = 'main' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') - print("*** success change branch") def modify_file(file_path: str, func: Any): diff --git a/swagger_to_sdk_config_autorest.json b/swagger_to_sdk_config_autorest.json index 695705429501..973c3a4af948 100644 --- a/swagger_to_sdk_config_autorest.json +++ b/swagger_to_sdk_config_autorest.json @@ -2,7 +2,7 @@ "meta": { "autorest_options": { "version": "3.8.4", - "use": ["@autorest/python@6.1.3", "@autorest/modelerfour@4.23.5"], + "use": ["@autorest/python@6.0.1", "@autorest/modelerfour@4.23.5"], "python": "", "sdkrel:python-sdks-folder": "./sdk/.", "version-tolerant": false, From c2177800a3d7f707eebd79938e1be342879c531a Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Wed, 14 Sep 2022 15:42:56 +0800 Subject: [PATCH 128/133] Update main.py --- scripts/auto_release/main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 71fe40ff6667..e3da23dec9a2 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -196,12 +196,14 @@ def generate_code(self): self.autorest_result = str(Path(os.getenv('TEMP_FOLDER')) / 'temp.json') with open(self.autorest_result, 'w') as file: json.dump(input_data, file) + print(f"*** input_data: {input_data}") # generate code(be careful about the order) print_exec('python scripts/dev_setup.py -p azure-core') print_check(f'python -m packaging_tools.auto_codegen {self.autorest_result} {self.autorest_result}') generate_result = self.get_autorest_result() + print(f"***** generate_result: {generate_result}") self.tag_is_stable = list(generate_result.values())[0]['tagIsStable'] log(f"tag_is_stable is {self.tag_is_stable}") From db87181d0469bada2d2d40dd92d95f14951db422 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Wed, 14 Sep 2022 16:56:00 +0800 Subject: [PATCH 129/133] tmp --- scripts/auto_release/main.py | 11 +++- .../packaging_tools/templates/conftest.py | 51 +++++++++++++++++++ .../packaging_tools/templates/testcase.py | 23 +++++++++ 3 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 tools/azure-sdk-tools/packaging_tools/templates/conftest.py create mode 100644 tools/azure-sdk-tools/packaging_tools/templates/testcase.py diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 71fe40ff6667..3e89e2d78ddf 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -452,6 +452,14 @@ def prepare_test_env(self): add_certificate() start_test_proxy() + def get_tests_info(self): + + + def prepare_tests(self): + test_path = self.sdk_code_path()+'/tests' + if not Path(test_path).exists(): + os.mkdir('tests') + @return_origin_path def run_test_proc(self): # run test @@ -462,8 +470,7 @@ def run_test_proc(self): print_check(f'pytest --collect-only') except: log('live test run done, do not find any test !!!') - self.test_result = succeeded_result - return + self.prepare_tests() try: print_check(f'pytest -s') diff --git a/tools/azure-sdk-tools/packaging_tools/templates/conftest.py b/tools/azure-sdk-tools/packaging_tools/templates/conftest.py new file mode 100644 index 000000000000..1fbcdaa8baa5 --- /dev/null +++ b/tools/azure-sdk-tools/packaging_tools/templates/conftest.py @@ -0,0 +1,51 @@ +# -------------------------------------------------------------------------- +# +# Copyright (c) Microsoft Corporation. All rights reserved. +# +# The MIT License (MIT) +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the ""Software""), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. +# +# -------------------------------------------------------------------------- +import os +import platform +import pytest +import sys + +from dotenv import load_dotenv + +from devtools_testutils import test_proxy, add_general_regex_sanitizer +from devtools_testutils import add_header_regex_sanitizer, add_body_key_sanitizer + + +load_dotenv() + +@pytest.fixture(scope="session", autouse=True) +def add_sanitizers(test_proxy): + subscription_id = os.environ.get("AZURE_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000") + tenant_id = os.environ.get("AZURE_TENANT_ID", "00000000-0000-0000-0000-000000000000") + client_id = os.environ.get("AZURE_CLIENT_ID", "00000000-0000-0000-0000-000000000000") + client_secret = os.environ.get("AZURE_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=subscription_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=tenant_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=client_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=client_secret, value="00000000-0000-0000-0000-000000000000") + add_header_regex_sanitizer(key="Set-Cookie", value="[set-cookie;]") + add_header_regex_sanitizer(key="Cookie", value="cookie;") + add_body_key_sanitizer(json_path="$..access_token", value="access_token") diff --git a/tools/azure-sdk-tools/packaging_tools/templates/testcase.py b/tools/azure-sdk-tools/packaging_tools/templates/testcase.py new file mode 100644 index 000000000000..148fef370b34 --- /dev/null +++ b/tools/azure-sdk-tools/packaging_tools/templates/testcase.py @@ -0,0 +1,23 @@ +# coding: utf-8 + +#------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +#-------------------------------------------------------------------------- + +import {{package_name_dot}} +from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy + +AZURE_LOCATION = 'eastus' + +class TestMgmt{{package}}(AzureMgmtRecordedTestCase): + + def setup_method(self, method): + self.mgmt_client = self.create_mgmt_client( + {{package_name_dot}}.{{client}}) + + def test_{{package}}_{{operation}}_list(self): + result = self.mgmt_client.{{operation}}.{{function}}() + assert list(result) is not None + From cc34ba75e0c1633b65f11da50d85bfb592b2cc44 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Fri, 16 Sep 2022 11:26:05 +0800 Subject: [PATCH 130/133] generate tests --- scripts/auto_release/main.py | 52 ++++++++++++++++++++++++++-- scripts/auto_release/requirement.txt | 4 ++- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 3e89e2d78ddf..7bc12ab82184 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -4,10 +4,14 @@ import time import logging from glob import glob +from contextlib import suppress import subprocess from pathlib import Path from functools import wraps from typing import List, Any, Dict + +import black +import jinja2 from packaging.version import Version from ghapi.all import GhApi from azure.storage.blob import BlobServiceClient, ContainerClient @@ -15,6 +19,8 @@ _LOG = logging.getLogger() +_BLACK_MODE = black.Mode() +_BLACK_MODE.line_length = 120 def return_origin_path(func): @wraps(func) @@ -204,7 +210,7 @@ def generate_code(self): generate_result = self.get_autorest_result() self.tag_is_stable = list(generate_result.values())[0]['tagIsStable'] log(f"tag_is_stable is {self.tag_is_stable}") - + print_check(f'python -m packaging_tools.auto_package {self.autorest_result} {self.autorest_result}') def get_package_name_with_autorest_result(self): @@ -453,12 +459,54 @@ def prepare_test_env(self): start_test_proxy() def get_tests_info(self): + code_report = self.sdk_code_path() + '/code_reports/latest/report.json' + multi_code_report = self.sdk_code_path() + '/code_reports/latest/merged_report.json' + if not Path(code_report).exists(): + code_report = multi_code_report + with open(code_report, 'r') as reader: + report_json = json.load(reader) + client_name = report_json['client'][0] + operations = report_json['operations'] + operation_name = 'Operations' + function_name = 'list' + for op_name, op in operations.items(): + if op_name == 'Operations': + continue + for func_name, func in op['functions'].items(): + if len(func['parameters']) < 2: + operation_name = op_name + function_name = func_name + break + else: + continue + break + return client_name, operation_name, function_name - + @return_origin_path def prepare_tests(self): + os.chdir('../../../') test_path = self.sdk_code_path()+'/tests' if not Path(test_path).exists(): os.mkdir('tests') + client_name, operation_name, function_name = self.get_tests_info() + template_path = Path('tools/azure-sdk-tools/packaging_tools/templates') + env = jinja2.Environment(loader=jinja2.FileSystemLoader(template_path)) + temp = env.get_template('testcase.py') + temp_out = temp.render(package_name_dot=self.package_name, + package=self.package_name, + client=client_name, + operation=operation_name, + function=function_name) + with suppress(black.NothingChanged): + file_content = black.format_file_contents(temp_out, fast=True, mode=_BLACK_MODE) + with open(f'{test_path}/test_mgmt_{self.package_name}.py', 'w', encoding='utf-8') as f: + f.writelines(file_content) + + if not Path(f'{test_path}/conftest.py').exists(): + with open(template_path/'conftest.py', 'r') as fr: + content = fr.read() + with open(f'{test_path}/conftest.py', 'w') as fw: + fw.write(content) @return_origin_path def run_test_proc(self): diff --git a/scripts/auto_release/requirement.txt b/scripts/auto_release/requirement.txt index 698652f950c2..5b11d17aed98 100644 --- a/scripts/auto_release/requirement.txt +++ b/scripts/auto_release/requirement.txt @@ -4,4 +4,6 @@ ghapi==0.1.19 packaging==21.3 pytest==6.2.5 azure-storage-blob==12.9.0 -fastcore==1.3.25 \ No newline at end of file +fastcore==1.3.25 +jinja2==3.1.2 +black==22.8.0 \ No newline at end of file From 535047a4bf89eb43d24d928a763d0416999e5991 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Fri, 16 Sep 2022 13:34:33 +0800 Subject: [PATCH 131/133] debug --- scripts/auto_release/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 9a7f9b94744c..68dd36affc94 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -487,6 +487,7 @@ def get_tests_info(self): @return_origin_path def prepare_tests(self): os.chdir('../../../') + print(f"++**: {os.getcwd()}") test_path = self.sdk_code_path()+'/tests' if not Path(test_path).exists(): os.mkdir('tests') From 621746a9acabf03713f2c9b8e5d9006371443593 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Fri, 16 Sep 2022 14:01:11 +0800 Subject: [PATCH 132/133] debug --- scripts/auto_release/main.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 68dd36affc94..3b35c0863b14 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -490,7 +490,7 @@ def prepare_tests(self): print(f"++**: {os.getcwd()}") test_path = self.sdk_code_path()+'/tests' if not Path(test_path).exists(): - os.mkdir('tests') + os.mkdir(test_path) client_name, operation_name, function_name = self.get_tests_info() template_path = Path('tools/azure-sdk-tools/packaging_tools/templates') env = jinja2.Environment(loader=jinja2.FileSystemLoader(template_path)) @@ -502,6 +502,8 @@ def prepare_tests(self): function=function_name) with suppress(black.NothingChanged): file_content = black.format_file_contents(temp_out, fast=True, mode=_BLACK_MODE) + print("+++*** file: " + f'{test_path}/test_mgmt_{self.package_name}.py') + print(f"+++*** path: {Path(test_path).exists()}") with open(f'{test_path}/test_mgmt_{self.package_name}.py', 'w', encoding='utf-8') as f: f.writelines(file_content) From 085d5c6722aed4ba7e283e5501e41b5658253ab8 Mon Sep 17 00:00:00 2001 From: PythonSdkPipelines Date: Fri, 16 Sep 2022 06:07:42 +0000 Subject: [PATCH 133/133] code and test --- .../azure-mgmt-appcontainers/CHANGELOG.md | 9 + .../azure-mgmt-appcontainers/MANIFEST.in | 2 +- .../azure-mgmt-appcontainers/README.md | 4 +- .../azure-mgmt-appcontainers/_meta.json | 10 +- .../azure/mgmt/appcontainers/__init__.py | 16 +- .../mgmt/appcontainers/_configuration.py | 42 +- .../_container_apps_api_client.py | 63 +- .../azure/mgmt/appcontainers/_patch.py | 2 +- .../mgmt/appcontainers/_serialization.py | 1970 +++++++++++++ .../azure/mgmt/appcontainers/_vendor.py | 6 +- .../azure/mgmt/appcontainers/_version.py | 2 +- .../azure/mgmt/appcontainers/aio/__init__.py | 16 +- .../mgmt/appcontainers/aio/_configuration.py | 44 +- .../aio/_container_apps_api_client.py | 63 +- .../azure/mgmt/appcontainers/aio/_patch.py | 2 +- .../appcontainers/aio/operations/__init__.py | 28 +- .../operations/_certificates_operations.py | 486 +++- ..._container_apps_auth_configs_operations.py | 355 ++- .../operations/_container_apps_operations.py | 802 ++++-- ...ainer_apps_revision_replicas_operations.py | 153 +- .../_container_apps_revisions_operations.py | 319 ++- ...ntainer_apps_source_controls_operations.py | 480 ++-- .../operations/_dapr_components_operations.py | 404 ++- .../_managed_environments_operations.py | 693 +++-- ...anaged_environments_storages_operations.py | 331 ++- .../aio/operations/_namespaces_operations.py | 170 +- .../aio/operations/_operations.py | 100 +- .../appcontainers/aio/operations/_patch.py | 20 + .../mgmt/appcontainers/models/__init__.py | 308 +- .../_container_apps_api_client_enums.py | 128 +- .../mgmt/appcontainers/models/_models_py3.py | 2473 ++++++++--------- .../azure/mgmt/appcontainers/models/_patch.py | 20 + .../mgmt/appcontainers/operations/__init__.py | 28 +- .../operations/_certificates_operations.py | 717 +++-- ..._container_apps_auth_configs_operations.py | 536 ++-- .../operations/_container_apps_operations.py | 1127 ++++---- ...ainer_apps_revision_replicas_operations.py | 242 +- .../_container_apps_revisions_operations.py | 530 ++-- ...ntainer_apps_source_controls_operations.py | 677 +++-- .../operations/_dapr_components_operations.py | 626 +++-- .../_managed_environments_operations.py | 971 ++++--- ...anaged_environments_storages_operations.py | 511 ++-- .../operations/_namespaces_operations.py | 231 +- .../appcontainers/operations/_operations.py | 139 +- .../mgmt/appcontainers/operations/_patch.py | 20 + .../azure-mgmt-appcontainers/conftest.py | 51 + .../azure-mgmt-appcontainers/setup.py | 7 +- .../azure-mgmt-appcontainers/testcase.py | 23 + .../tests/conftest.py | 51 + .../tests/test_mgmt_appcontainers.py | 21 + shared_requirements.txt | 4 +- 51 files changed, 10078 insertions(+), 5955 deletions(-) create mode 100644 sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_serialization.py create mode 100644 sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_patch.py create mode 100644 sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/models/_patch.py create mode 100644 sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_patch.py create mode 100644 sdk/appcontainers/azure-mgmt-appcontainers/conftest.py create mode 100644 sdk/appcontainers/azure-mgmt-appcontainers/testcase.py create mode 100644 sdk/appcontainers/azure-mgmt-appcontainers/tests/conftest.py create mode 100644 sdk/appcontainers/azure-mgmt-appcontainers/tests/test_mgmt_appcontainers.py diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/CHANGELOG.md b/sdk/appcontainers/azure-mgmt-appcontainers/CHANGELOG.md index 1f5712f191b9..f36ed7c1f522 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/CHANGELOG.md +++ b/sdk/appcontainers/azure-mgmt-appcontainers/CHANGELOG.md @@ -1,5 +1,14 @@ # Release History +## 2.0.0 (2022-09-16) + +### Breaking Changes + + - Model CustomHostnameAnalysisResult no longer has parameter id + - Model CustomHostnameAnalysisResult no longer has parameter name + - Model CustomHostnameAnalysisResult no longer has parameter system_data + - Model CustomHostnameAnalysisResult no longer has parameter type + ## 1.0.0 (2022-05-17) **Breaking changes** diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/MANIFEST.in b/sdk/appcontainers/azure-mgmt-appcontainers/MANIFEST.in index e99d15546c38..fcd93fcdcff9 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/MANIFEST.in +++ b/sdk/appcontainers/azure-mgmt-appcontainers/MANIFEST.in @@ -1,5 +1,5 @@ include _meta.json -recursive-include tests *.py *.yaml +recursive-include tests *.py *.json include *.md include azure/__init__.py include azure/mgmt/__init__.py diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/README.md b/sdk/appcontainers/azure-mgmt-appcontainers/README.md index 6ee0c9672870..810e73e81442 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/README.md +++ b/sdk/appcontainers/azure-mgmt-appcontainers/README.md @@ -1,7 +1,7 @@ # Microsoft Azure SDK for Python This is the Microsoft Azure Appcontainers Management Client Library. -This package has been tested with Python 3.6+. +This package has been tested with Python 3.7+. For a more complete view of Azure libraries, see the [azure sdk python release](https://aka.ms/azsdk/python/all). ## _Disclaimer_ @@ -12,8 +12,6 @@ _Azure SDK Python packages support for Python 2.7 has ended 01 January 2022. For To learn how to use this package, see the [quickstart guide](https://aka.ms/azsdk/python/mgmt) - - For docs and references, see [Python SDK References](https://docs.microsoft.com/python/api/overview/azure/) Code samples for this package can be found at [Appcontainers Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com. diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/_meta.json b/sdk/appcontainers/azure-mgmt-appcontainers/_meta.json index 9738b12eb06f..3c3726a06fc8 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/_meta.json +++ b/sdk/appcontainers/azure-mgmt-appcontainers/_meta.json @@ -1,11 +1,11 @@ { - "autorest": "3.7.2", + "autorest": "3.8.4", "use": [ - "@autorest/python@5.13.0", - "@autorest/modelerfour@4.19.3" + "@autorest/python@6.1.5", + "@autorest/modelerfour@4.23.5" ], - "commit": "32143b0f5f230ee2601e3c5d1990188666a5058d", + "commit": "9d383206b1a2748625204592bb355f78342f1ddd", "repository_url": "https://github.com/Azure/azure-rest-api-specs", - "autorest_command": "autorest specification/app/resource-manager/readme.md --multiapi --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --python3-only --use=@autorest/python@5.13.0 --use=@autorest/modelerfour@4.19.3 --version=3.7.2", + "autorest_command": "autorest specification/app/resource-manager/readme.md --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.1.5 --use=@autorest/modelerfour@4.23.5 --version=3.8.4 --version-tolerant=False", "readme": "specification/app/resource-manager/readme.md" } \ No newline at end of file diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/__init__.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/__init__.py index 962b4a502e4f..984d644c26bc 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/__init__.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/__init__.py @@ -10,9 +10,15 @@ from ._version import VERSION __version__ = VERSION -__all__ = ['ContainerAppsAPIClient'] -# `._patch.py` is used for handwritten extensions to the generated code -# Example: https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md -from ._patch import patch_sdk -patch_sdk() +try: + from ._patch import __all__ as _patch_all + from ._patch import * # type: ignore # pylint: disable=unused-wildcard-import +except ImportError: + _patch_all = [] +from ._patch import patch_sdk as _patch_sdk + +__all__ = ["ContainerAppsAPIClient"] +__all__.extend([p for p in _patch_all if p not in __all__]) + +_patch_sdk() diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_configuration.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_configuration.py index 60eb6a5be7b0..473f78097989 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_configuration.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_configuration.py @@ -25,23 +25,18 @@ class ContainerAppsAPIClientConfiguration(Configuration): # pylint: disable=too Note that all parameters used to create this instance are saved as instance attributes. - :param credential: Credential needed for the client to connect to Azure. + :param credential: Credential needed for the client to connect to Azure. Required. :type credential: ~azure.core.credentials.TokenCredential - :param subscription_id: The ID of the target subscription. + :param subscription_id: The ID of the target subscription. Required. :type subscription_id: str :keyword api_version: Api Version. Default value is "2022-03-01". Note that overriding this default value may result in unsupported behavior. :paramtype api_version: str """ - def __init__( - self, - credential: "TokenCredential", - subscription_id: str, - **kwargs: Any - ) -> None: + def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None: super(ContainerAppsAPIClientConfiguration, self).__init__(**kwargs) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", "2022-03-01") # type: str if credential is None: raise ValueError("Parameter 'credential' must not be None.") @@ -51,23 +46,24 @@ def __init__( self.credential = credential self.subscription_id = subscription_id self.api_version = api_version - self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) - kwargs.setdefault('sdk_moniker', 'mgmt-appcontainers/{}'.format(VERSION)) + self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"]) + kwargs.setdefault("sdk_moniker", "mgmt-appcontainers/{}".format(VERSION)) self._configure(**kwargs) def _configure( - self, - **kwargs # type: Any + self, **kwargs # type: Any ): # type: (...) -> None - self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs) - self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs) - self.logging_policy = kwargs.get('logging_policy') or policies.NetworkTraceLoggingPolicy(**kwargs) - self.http_logging_policy = kwargs.get('http_logging_policy') or ARMHttpLoggingPolicy(**kwargs) - self.retry_policy = kwargs.get('retry_policy') or policies.RetryPolicy(**kwargs) - self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs) - self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs) - self.authentication_policy = kwargs.get('authentication_policy') + self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) + self.http_logging_policy = kwargs.get("http_logging_policy") or ARMHttpLoggingPolicy(**kwargs) + self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs) + self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs) + self.authentication_policy = kwargs.get("authentication_policy") if self.credential and not self.authentication_policy: - self.authentication_policy = ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs) + self.authentication_policy = ARMChallengeAuthenticationPolicy( + self.credential, *self.credential_scopes, **kwargs + ) diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_container_apps_api_client.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_container_apps_api_client.py index 3dd561f1c96c..1e0e8e5ff0b0 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_container_apps_api_client.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_container_apps_api_client.py @@ -9,20 +9,32 @@ from copy import deepcopy from typing import Any, TYPE_CHECKING -from msrest import Deserializer, Serializer - from azure.core.rest import HttpRequest, HttpResponse from azure.mgmt.core import ARMPipelineClient from . import models from ._configuration import ContainerAppsAPIClientConfiguration -from .operations import CertificatesOperations, ContainerAppsAuthConfigsOperations, ContainerAppsOperations, ContainerAppsRevisionReplicasOperations, ContainerAppsRevisionsOperations, ContainerAppsSourceControlsOperations, DaprComponentsOperations, ManagedEnvironmentsOperations, ManagedEnvironmentsStoragesOperations, NamespacesOperations, Operations +from ._serialization import Deserializer, Serializer +from .operations import ( + CertificatesOperations, + ContainerAppsAuthConfigsOperations, + ContainerAppsOperations, + ContainerAppsRevisionReplicasOperations, + ContainerAppsRevisionsOperations, + ContainerAppsSourceControlsOperations, + DaprComponentsOperations, + ManagedEnvironmentsOperations, + ManagedEnvironmentsStoragesOperations, + NamespacesOperations, + Operations, +) if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials import TokenCredential -class ContainerAppsAPIClient: # pylint: disable=too-many-instance-attributes + +class ContainerAppsAPIClient: # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes """ContainerAppsAPIClient. :ivar container_apps_auth_configs: ContainerAppsAuthConfigsOperations operations @@ -53,9 +65,9 @@ class ContainerAppsAPIClient: # pylint: disable=too-many-instance-attributes :ivar container_apps_source_controls: ContainerAppsSourceControlsOperations operations :vartype container_apps_source_controls: azure.mgmt.appcontainers.operations.ContainerAppsSourceControlsOperations - :param credential: Credential needed for the client to connect to Azure. + :param credential: Credential needed for the client to connect to Azure. Required. :type credential: ~azure.core.credentials.TokenCredential - :param subscription_id: The ID of the target subscription. + :param subscription_id: The ID of the target subscription. Required. :type subscription_id: str :param base_url: Service URL. Default value is "https://management.azure.com". :type base_url: str @@ -73,31 +85,40 @@ def __init__( base_url: str = "https://management.azure.com", **kwargs: Any ) -> None: - self._config = ContainerAppsAPIClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs) + self._config = ContainerAppsAPIClientConfiguration( + credential=credential, subscription_id=subscription_id, **kwargs + ) self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.container_apps_auth_configs = ContainerAppsAuthConfigsOperations(self._client, self._config, self._serialize, self._deserialize) + self.container_apps_auth_configs = ContainerAppsAuthConfigsOperations( + self._client, self._config, self._serialize, self._deserialize + ) self.container_apps = ContainerAppsOperations(self._client, self._config, self._serialize, self._deserialize) - self.container_apps_revisions = ContainerAppsRevisionsOperations(self._client, self._config, self._serialize, self._deserialize) - self.container_apps_revision_replicas = ContainerAppsRevisionReplicasOperations(self._client, self._config, self._serialize, self._deserialize) + self.container_apps_revisions = ContainerAppsRevisionsOperations( + self._client, self._config, self._serialize, self._deserialize + ) + self.container_apps_revision_replicas = ContainerAppsRevisionReplicasOperations( + self._client, self._config, self._serialize, self._deserialize + ) self.dapr_components = DaprComponentsOperations(self._client, self._config, self._serialize, self._deserialize) self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.managed_environments = ManagedEnvironmentsOperations(self._client, self._config, self._serialize, self._deserialize) + self.managed_environments = ManagedEnvironmentsOperations( + self._client, self._config, self._serialize, self._deserialize + ) self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) self.namespaces = NamespacesOperations(self._client, self._config, self._serialize, self._deserialize) - self.managed_environments_storages = ManagedEnvironmentsStoragesOperations(self._client, self._config, self._serialize, self._deserialize) - self.container_apps_source_controls = ContainerAppsSourceControlsOperations(self._client, self._config, self._serialize, self._deserialize) - - - def _send_request( - self, - request: HttpRequest, - **kwargs: Any - ) -> HttpResponse: + self.managed_environments_storages = ManagedEnvironmentsStoragesOperations( + self._client, self._config, self._serialize, self._deserialize + ) + self.container_apps_source_controls = ContainerAppsSourceControlsOperations( + self._client, self._config, self._serialize, self._deserialize + ) + + def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse: """Runs the network request through the client's chained policies. >>> from azure.core.rest import HttpRequest @@ -106,7 +127,7 @@ def _send_request( >>> response = client._send_request(request) - For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart + For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request :param request: The network request you want to make. Required. :type request: ~azure.core.rest.HttpRequest diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_patch.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_patch.py index 74e48ecd07cf..f99e77fef986 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_patch.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_patch.py @@ -28,4 +28,4 @@ # This file is used for handwritten extensions to the generated code. Example: # https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md def patch_sdk(): - pass \ No newline at end of file + pass diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_serialization.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_serialization.py new file mode 100644 index 000000000000..7c1dedb5133d --- /dev/null +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_serialization.py @@ -0,0 +1,1970 @@ +# -------------------------------------------------------------------------- +# +# Copyright (c) Microsoft Corporation. All rights reserved. +# +# The MIT License (MIT) +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the ""Software""), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. +# +# -------------------------------------------------------------------------- + +# pylint: skip-file + +from base64 import b64decode, b64encode +import calendar +import datetime +import decimal +import email +from enum import Enum +import json +import logging +import re +import sys +import codecs + +try: + from urllib import quote # type: ignore +except ImportError: + from urllib.parse import quote # type: ignore +import xml.etree.ElementTree as ET + +import isodate + +from typing import Dict, Any, cast, TYPE_CHECKING + +from azure.core.exceptions import DeserializationError, SerializationError, raise_with_traceback + +_BOM = codecs.BOM_UTF8.decode(encoding="utf-8") + +if TYPE_CHECKING: + from typing import Optional, Union, AnyStr, IO, Mapping + + +class RawDeserializer: + + # Accept "text" because we're open minded people... + JSON_REGEXP = re.compile(r"^(application|text)/([a-z+.]+\+)?json$") + + # Name used in context + CONTEXT_NAME = "deserialized_data" + + @classmethod + def deserialize_from_text(cls, data, content_type=None): + # type: (Optional[Union[AnyStr, IO]], Optional[str]) -> Any + """Decode data according to content-type. + + Accept a stream of data as well, but will be load at once in memory for now. + + If no content-type, will return the string version (not bytes, not stream) + + :param data: Input, could be bytes or stream (will be decoded with UTF8) or text + :type data: str or bytes or IO + :param str content_type: The content type. + """ + if hasattr(data, "read"): + # Assume a stream + data = cast(IO, data).read() + + if isinstance(data, bytes): + data_as_str = data.decode(encoding="utf-8-sig") + else: + # Explain to mypy the correct type. + data_as_str = cast(str, data) + + # Remove Byte Order Mark if present in string + data_as_str = data_as_str.lstrip(_BOM) + + if content_type is None: + return data + + if cls.JSON_REGEXP.match(content_type): + try: + return json.loads(data_as_str) + except ValueError as err: + raise DeserializationError("JSON is invalid: {}".format(err), err) + elif "xml" in (content_type or []): + try: + + try: + if isinstance(data, unicode): # type: ignore + # If I'm Python 2.7 and unicode XML will scream if I try a "fromstring" on unicode string + data_as_str = data_as_str.encode(encoding="utf-8") # type: ignore + except NameError: + pass + + return ET.fromstring(data_as_str) # nosec + except ET.ParseError: + # It might be because the server has an issue, and returned JSON with + # content-type XML.... + # So let's try a JSON load, and if it's still broken + # let's flow the initial exception + def _json_attemp(data): + try: + return True, json.loads(data) + except ValueError: + return False, None # Don't care about this one + + success, json_result = _json_attemp(data) + if success: + return json_result + # If i'm here, it's not JSON, it's not XML, let's scream + # and raise the last context in this block (the XML exception) + # The function hack is because Py2.7 messes up with exception + # context otherwise. + _LOGGER.critical("Wasn't XML not JSON, failing") + raise_with_traceback(DeserializationError, "XML is invalid") + raise DeserializationError("Cannot deserialize content-type: {}".format(content_type)) + + @classmethod + def deserialize_from_http_generics(cls, body_bytes, headers): + # type: (Optional[Union[AnyStr, IO]], Mapping) -> Any + """Deserialize from HTTP response. + + Use bytes and headers to NOT use any requests/aiohttp or whatever + specific implementation. + Headers will tested for "content-type" + """ + # Try to use content-type from headers if available + content_type = None + if "content-type" in headers: + content_type = headers["content-type"].split(";")[0].strip().lower() + # Ouch, this server did not declare what it sent... + # Let's guess it's JSON... + # Also, since Autorest was considering that an empty body was a valid JSON, + # need that test as well.... + else: + content_type = "application/json" + + if body_bytes: + return cls.deserialize_from_text(body_bytes, content_type) + return None + + +try: + basestring # type: ignore + unicode_str = unicode # type: ignore +except NameError: + basestring = str # type: ignore + unicode_str = str # type: ignore + +_LOGGER = logging.getLogger(__name__) + +try: + _long_type = long # type: ignore +except NameError: + _long_type = int + + +class UTC(datetime.tzinfo): + """Time Zone info for handling UTC""" + + def utcoffset(self, dt): + """UTF offset for UTC is 0.""" + return datetime.timedelta(0) + + def tzname(self, dt): + """Timestamp representation.""" + return "Z" + + def dst(self, dt): + """No daylight saving for UTC.""" + return datetime.timedelta(hours=1) + + +try: + from datetime import timezone as _FixedOffset +except ImportError: # Python 2.7 + + class _FixedOffset(datetime.tzinfo): # type: ignore + """Fixed offset in minutes east from UTC. + Copy/pasted from Python doc + :param datetime.timedelta offset: offset in timedelta format + """ + + def __init__(self, offset): + self.__offset = offset + + def utcoffset(self, dt): + return self.__offset + + def tzname(self, dt): + return str(self.__offset.total_seconds() / 3600) + + def __repr__(self): + return "".format(self.tzname(None)) + + def dst(self, dt): + return datetime.timedelta(0) + + def __getinitargs__(self): + return (self.__offset,) + + +try: + from datetime import timezone + + TZ_UTC = timezone.utc # type: ignore +except ImportError: + TZ_UTC = UTC() # type: ignore + +_FLATTEN = re.compile(r"(? y, + "minimum": lambda x, y: x < y, + "maximum": lambda x, y: x > y, + "minimum_ex": lambda x, y: x <= y, + "maximum_ex": lambda x, y: x >= y, + "min_items": lambda x, y: len(x) < y, + "max_items": lambda x, y: len(x) > y, + "pattern": lambda x, y: not re.match(y, x, re.UNICODE), + "unique": lambda x, y: len(x) != len(set(x)), + "multiple": lambda x, y: x % y != 0, + } + + def __init__(self, classes=None): + self.serialize_type = { + "iso-8601": Serializer.serialize_iso, + "rfc-1123": Serializer.serialize_rfc, + "unix-time": Serializer.serialize_unix, + "duration": Serializer.serialize_duration, + "date": Serializer.serialize_date, + "time": Serializer.serialize_time, + "decimal": Serializer.serialize_decimal, + "long": Serializer.serialize_long, + "bytearray": Serializer.serialize_bytearray, + "base64": Serializer.serialize_base64, + "object": self.serialize_object, + "[]": self.serialize_iter, + "{}": self.serialize_dict, + } + self.dependencies = dict(classes) if classes else {} + self.key_transformer = full_restapi_key_transformer + self.client_side_validation = True + + def _serialize(self, target_obj, data_type=None, **kwargs): + """Serialize data into a string according to type. + + :param target_obj: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: str, dict + :raises: SerializationError if serialization fails. + """ + key_transformer = kwargs.get("key_transformer", self.key_transformer) + keep_readonly = kwargs.get("keep_readonly", False) + if target_obj is None: + return None + + attr_name = None + class_name = target_obj.__class__.__name__ + + if data_type: + return self.serialize_data(target_obj, data_type, **kwargs) + + if not hasattr(target_obj, "_attribute_map"): + data_type = type(target_obj).__name__ + if data_type in self.basic_types.values(): + return self.serialize_data(target_obj, data_type, **kwargs) + + # Force "is_xml" kwargs if we detect a XML model + try: + is_xml_model_serialization = kwargs["is_xml"] + except KeyError: + is_xml_model_serialization = kwargs.setdefault("is_xml", target_obj.is_xml_model()) + + serialized = {} + if is_xml_model_serialization: + serialized = target_obj._create_xml_node() + try: + attributes = target_obj._attribute_map + for attr, attr_desc in attributes.items(): + attr_name = attr + if not keep_readonly and target_obj._validation.get(attr_name, {}).get("readonly", False): + continue + + if attr_name == "additional_properties" and attr_desc["key"] == "": + if target_obj.additional_properties is not None: + serialized.update(target_obj.additional_properties) + continue + try: + + orig_attr = getattr(target_obj, attr) + if is_xml_model_serialization: + pass # Don't provide "transformer" for XML for now. Keep "orig_attr" + else: # JSON + keys, orig_attr = key_transformer(attr, attr_desc.copy(), orig_attr) + keys = keys if isinstance(keys, list) else [keys] + + kwargs["serialization_ctxt"] = attr_desc + new_attr = self.serialize_data(orig_attr, attr_desc["type"], **kwargs) + + if is_xml_model_serialization: + xml_desc = attr_desc.get("xml", {}) + xml_name = xml_desc.get("name", attr_desc["key"]) + xml_prefix = xml_desc.get("prefix", None) + xml_ns = xml_desc.get("ns", None) + if xml_desc.get("attr", False): + if xml_ns: + ET.register_namespace(xml_prefix, xml_ns) + xml_name = "{}{}".format(xml_ns, xml_name) + serialized.set(xml_name, new_attr) + continue + if xml_desc.get("text", False): + serialized.text = new_attr + continue + if isinstance(new_attr, list): + serialized.extend(new_attr) + elif isinstance(new_attr, ET.Element): + # If the down XML has no XML/Name, we MUST replace the tag with the local tag. But keeping the namespaces. + if "name" not in getattr(orig_attr, "_xml_map", {}): + splitted_tag = new_attr.tag.split("}") + if len(splitted_tag) == 2: # Namespace + new_attr.tag = "}".join([splitted_tag[0], xml_name]) + else: + new_attr.tag = xml_name + serialized.append(new_attr) + else: # That's a basic type + # Integrate namespace if necessary + local_node = _create_xml_node(xml_name, xml_prefix, xml_ns) + local_node.text = unicode_str(new_attr) + serialized.append(local_node) + else: # JSON + for k in reversed(keys): + unflattened = {k: new_attr} + new_attr = unflattened + + _new_attr = new_attr + _serialized = serialized + for k in keys: + if k not in _serialized: + _serialized.update(_new_attr) + _new_attr = _new_attr[k] + _serialized = _serialized[k] + except ValueError: + continue + + except (AttributeError, KeyError, TypeError) as err: + msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj)) + raise_with_traceback(SerializationError, msg, err) + else: + return serialized + + def body(self, data, data_type, **kwargs): + """Serialize data intended for a request body. + + :param data: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: dict + :raises: SerializationError if serialization fails. + :raises: ValueError if data is None + """ + + # Just in case this is a dict + internal_data_type = data_type.strip("[]{}") + internal_data_type = self.dependencies.get(internal_data_type, None) + try: + is_xml_model_serialization = kwargs["is_xml"] + except KeyError: + if internal_data_type and issubclass(internal_data_type, Model): + is_xml_model_serialization = kwargs.setdefault("is_xml", internal_data_type.is_xml_model()) + else: + is_xml_model_serialization = False + if internal_data_type and not isinstance(internal_data_type, Enum): + try: + deserializer = Deserializer(self.dependencies) + # Since it's on serialization, it's almost sure that format is not JSON REST + # We're not able to deal with additional properties for now. + deserializer.additional_properties_detection = False + if is_xml_model_serialization: + deserializer.key_extractors = [ + attribute_key_case_insensitive_extractor, + ] + else: + deserializer.key_extractors = [ + rest_key_case_insensitive_extractor, + attribute_key_case_insensitive_extractor, + last_rest_key_case_insensitive_extractor, + ] + data = deserializer._deserialize(data_type, data) + except DeserializationError as err: + raise_with_traceback(SerializationError, "Unable to build a model: " + str(err), err) + + return self._serialize(data, data_type, **kwargs) + + def url(self, name, data, data_type, **kwargs): + """Serialize data intended for a URL path. + + :param data: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: str + :raises: TypeError if serialization fails. + :raises: ValueError if data is None + """ + try: + output = self.serialize_data(data, data_type, **kwargs) + if data_type == "bool": + output = json.dumps(output) + + if kwargs.get("skip_quote") is True: + output = str(output) + else: + output = quote(str(output), safe="") + except SerializationError: + raise TypeError("{} must be type {}.".format(name, data_type)) + else: + return output + + def query(self, name, data, data_type, **kwargs): + """Serialize data intended for a URL query. + + :param data: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: str + :raises: TypeError if serialization fails. + :raises: ValueError if data is None + """ + try: + # Treat the list aside, since we don't want to encode the div separator + if data_type.startswith("["): + internal_data_type = data_type[1:-1] + data = [self.serialize_data(d, internal_data_type, **kwargs) if d is not None else "" for d in data] + if not kwargs.get("skip_quote", False): + data = [quote(str(d), safe="") for d in data] + return str(self.serialize_iter(data, internal_data_type, **kwargs)) + + # Not a list, regular serialization + output = self.serialize_data(data, data_type, **kwargs) + if data_type == "bool": + output = json.dumps(output) + if kwargs.get("skip_quote") is True: + output = str(output) + else: + output = quote(str(output), safe="") + except SerializationError: + raise TypeError("{} must be type {}.".format(name, data_type)) + else: + return str(output) + + def header(self, name, data, data_type, **kwargs): + """Serialize data intended for a request header. + + :param data: The data to be serialized. + :param str data_type: The type to be serialized from. + :rtype: str + :raises: TypeError if serialization fails. + :raises: ValueError if data is None + """ + try: + if data_type in ["[str]"]: + data = ["" if d is None else d for d in data] + + output = self.serialize_data(data, data_type, **kwargs) + if data_type == "bool": + output = json.dumps(output) + except SerializationError: + raise TypeError("{} must be type {}.".format(name, data_type)) + else: + return str(output) + + def serialize_data(self, data, data_type, **kwargs): + """Serialize generic data according to supplied data type. + + :param data: The data to be serialized. + :param str data_type: The type to be serialized from. + :param bool required: Whether it's essential that the data not be + empty or None + :raises: AttributeError if required data is None. + :raises: ValueError if data is None + :raises: SerializationError if serialization fails. + """ + if data is None: + raise ValueError("No value for given attribute") + + try: + if data_type in self.basic_types.values(): + return self.serialize_basic(data, data_type, **kwargs) + + elif data_type in self.serialize_type: + return self.serialize_type[data_type](data, **kwargs) + + # If dependencies is empty, try with current data class + # It has to be a subclass of Enum anyway + enum_type = self.dependencies.get(data_type, data.__class__) + if issubclass(enum_type, Enum): + return Serializer.serialize_enum(data, enum_obj=enum_type) + + iter_type = data_type[0] + data_type[-1] + if iter_type in self.serialize_type: + return self.serialize_type[iter_type](data, data_type[1:-1], **kwargs) + + except (ValueError, TypeError) as err: + msg = "Unable to serialize value: {!r} as type: {!r}." + raise_with_traceback(SerializationError, msg.format(data, data_type), err) + else: + return self._serialize(data, **kwargs) + + @classmethod + def _get_custom_serializers(cls, data_type, **kwargs): + custom_serializer = kwargs.get("basic_types_serializers", {}).get(data_type) + if custom_serializer: + return custom_serializer + if kwargs.get("is_xml", False): + return cls._xml_basic_types_serializers.get(data_type) + + @classmethod + def serialize_basic(cls, data, data_type, **kwargs): + """Serialize basic builting data type. + Serializes objects to str, int, float or bool. + + Possible kwargs: + - basic_types_serializers dict[str, callable] : If set, use the callable as serializer + - is_xml bool : If set, use xml_basic_types_serializers + + :param data: Object to be serialized. + :param str data_type: Type of object in the iterable. + """ + custom_serializer = cls._get_custom_serializers(data_type, **kwargs) + if custom_serializer: + return custom_serializer(data) + if data_type == "str": + return cls.serialize_unicode(data) + return eval(data_type)(data) # nosec + + @classmethod + def serialize_unicode(cls, data): + """Special handling for serializing unicode strings in Py2. + Encode to UTF-8 if unicode, otherwise handle as a str. + + :param data: Object to be serialized. + :rtype: str + """ + try: # If I received an enum, return its value + return data.value + except AttributeError: + pass + + try: + if isinstance(data, unicode): + # Don't change it, JSON and XML ElementTree are totally able + # to serialize correctly u'' strings + return data + except NameError: + return str(data) + else: + return str(data) + + def serialize_iter(self, data, iter_type, div=None, **kwargs): + """Serialize iterable. + + Supported kwargs: + - serialization_ctxt dict : The current entry of _attribute_map, or same format. + serialization_ctxt['type'] should be same as data_type. + - is_xml bool : If set, serialize as XML + + :param list attr: Object to be serialized. + :param str iter_type: Type of object in the iterable. + :param bool required: Whether the objects in the iterable must + not be None or empty. + :param str div: If set, this str will be used to combine the elements + in the iterable into a combined string. Default is 'None'. + :rtype: list, str + """ + if isinstance(data, str): + raise SerializationError("Refuse str type as a valid iter type.") + + serialization_ctxt = kwargs.get("serialization_ctxt", {}) + is_xml = kwargs.get("is_xml", False) + + serialized = [] + for d in data: + try: + serialized.append(self.serialize_data(d, iter_type, **kwargs)) + except ValueError: + serialized.append(None) + + if div: + serialized = ["" if s is None else str(s) for s in serialized] + serialized = div.join(serialized) + + if "xml" in serialization_ctxt or is_xml: + # XML serialization is more complicated + xml_desc = serialization_ctxt.get("xml", {}) + xml_name = xml_desc.get("name") + if not xml_name: + xml_name = serialization_ctxt["key"] + + # Create a wrap node if necessary (use the fact that Element and list have "append") + is_wrapped = xml_desc.get("wrapped", False) + node_name = xml_desc.get("itemsName", xml_name) + if is_wrapped: + final_result = _create_xml_node(xml_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) + else: + final_result = [] + # All list elements to "local_node" + for el in serialized: + if isinstance(el, ET.Element): + el_node = el + else: + el_node = _create_xml_node(node_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) + if el is not None: # Otherwise it writes "None" :-p + el_node.text = str(el) + final_result.append(el_node) + return final_result + return serialized + + def serialize_dict(self, attr, dict_type, **kwargs): + """Serialize a dictionary of objects. + + :param dict attr: Object to be serialized. + :param str dict_type: Type of object in the dictionary. + :param bool required: Whether the objects in the dictionary must + not be None or empty. + :rtype: dict + """ + serialization_ctxt = kwargs.get("serialization_ctxt", {}) + serialized = {} + for key, value in attr.items(): + try: + serialized[self.serialize_unicode(key)] = self.serialize_data(value, dict_type, **kwargs) + except ValueError: + serialized[self.serialize_unicode(key)] = None + + if "xml" in serialization_ctxt: + # XML serialization is more complicated + xml_desc = serialization_ctxt["xml"] + xml_name = xml_desc["name"] + + final_result = _create_xml_node(xml_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) + for key, value in serialized.items(): + ET.SubElement(final_result, key).text = value + return final_result + + return serialized + + def serialize_object(self, attr, **kwargs): + """Serialize a generic object. + This will be handled as a dictionary. If object passed in is not + a basic type (str, int, float, dict, list) it will simply be + cast to str. + + :param dict attr: Object to be serialized. + :rtype: dict or str + """ + if attr is None: + return None + if isinstance(attr, ET.Element): + return attr + obj_type = type(attr) + if obj_type in self.basic_types: + return self.serialize_basic(attr, self.basic_types[obj_type], **kwargs) + if obj_type is _long_type: + return self.serialize_long(attr) + if obj_type is unicode_str: + return self.serialize_unicode(attr) + if obj_type is datetime.datetime: + return self.serialize_iso(attr) + if obj_type is datetime.date: + return self.serialize_date(attr) + if obj_type is datetime.time: + return self.serialize_time(attr) + if obj_type is datetime.timedelta: + return self.serialize_duration(attr) + if obj_type is decimal.Decimal: + return self.serialize_decimal(attr) + + # If it's a model or I know this dependency, serialize as a Model + elif obj_type in self.dependencies.values() or isinstance(attr, Model): + return self._serialize(attr) + + if obj_type == dict: + serialized = {} + for key, value in attr.items(): + try: + serialized[self.serialize_unicode(key)] = self.serialize_object(value, **kwargs) + except ValueError: + serialized[self.serialize_unicode(key)] = None + return serialized + + if obj_type == list: + serialized = [] + for obj in attr: + try: + serialized.append(self.serialize_object(obj, **kwargs)) + except ValueError: + pass + return serialized + return str(attr) + + @staticmethod + def serialize_enum(attr, enum_obj=None): + try: + result = attr.value + except AttributeError: + result = attr + try: + enum_obj(result) + return result + except ValueError: + for enum_value in enum_obj: + if enum_value.value.lower() == str(attr).lower(): + return enum_value.value + error = "{!r} is not valid value for enum {!r}" + raise SerializationError(error.format(attr, enum_obj)) + + @staticmethod + def serialize_bytearray(attr, **kwargs): + """Serialize bytearray into base-64 string. + + :param attr: Object to be serialized. + :rtype: str + """ + return b64encode(attr).decode() + + @staticmethod + def serialize_base64(attr, **kwargs): + """Serialize str into base-64 string. + + :param attr: Object to be serialized. + :rtype: str + """ + encoded = b64encode(attr).decode("ascii") + return encoded.strip("=").replace("+", "-").replace("/", "_") + + @staticmethod + def serialize_decimal(attr, **kwargs): + """Serialize Decimal object to float. + + :param attr: Object to be serialized. + :rtype: float + """ + return float(attr) + + @staticmethod + def serialize_long(attr, **kwargs): + """Serialize long (Py2) or int (Py3). + + :param attr: Object to be serialized. + :rtype: int/long + """ + return _long_type(attr) + + @staticmethod + def serialize_date(attr, **kwargs): + """Serialize Date object into ISO-8601 formatted string. + + :param Date attr: Object to be serialized. + :rtype: str + """ + if isinstance(attr, str): + attr = isodate.parse_date(attr) + t = "{:04}-{:02}-{:02}".format(attr.year, attr.month, attr.day) + return t + + @staticmethod + def serialize_time(attr, **kwargs): + """Serialize Time object into ISO-8601 formatted string. + + :param datetime.time attr: Object to be serialized. + :rtype: str + """ + if isinstance(attr, str): + attr = isodate.parse_time(attr) + t = "{:02}:{:02}:{:02}".format(attr.hour, attr.minute, attr.second) + if attr.microsecond: + t += ".{:02}".format(attr.microsecond) + return t + + @staticmethod + def serialize_duration(attr, **kwargs): + """Serialize TimeDelta object into ISO-8601 formatted string. + + :param TimeDelta attr: Object to be serialized. + :rtype: str + """ + if isinstance(attr, str): + attr = isodate.parse_duration(attr) + return isodate.duration_isoformat(attr) + + @staticmethod + def serialize_rfc(attr, **kwargs): + """Serialize Datetime object into RFC-1123 formatted string. + + :param Datetime attr: Object to be serialized. + :rtype: str + :raises: TypeError if format invalid. + """ + try: + if not attr.tzinfo: + _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") + utc = attr.utctimetuple() + except AttributeError: + raise TypeError("RFC1123 object must be valid Datetime object.") + + return "{}, {:02} {} {:04} {:02}:{:02}:{:02} GMT".format( + Serializer.days[utc.tm_wday], + utc.tm_mday, + Serializer.months[utc.tm_mon], + utc.tm_year, + utc.tm_hour, + utc.tm_min, + utc.tm_sec, + ) + + @staticmethod + def serialize_iso(attr, **kwargs): + """Serialize Datetime object into ISO-8601 formatted string. + + :param Datetime attr: Object to be serialized. + :rtype: str + :raises: SerializationError if format invalid. + """ + if isinstance(attr, str): + attr = isodate.parse_datetime(attr) + try: + if not attr.tzinfo: + _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") + utc = attr.utctimetuple() + if utc.tm_year > 9999 or utc.tm_year < 1: + raise OverflowError("Hit max or min date") + + microseconds = str(attr.microsecond).rjust(6, "0").rstrip("0").ljust(3, "0") + if microseconds: + microseconds = "." + microseconds + date = "{:04}-{:02}-{:02}T{:02}:{:02}:{:02}".format( + utc.tm_year, utc.tm_mon, utc.tm_mday, utc.tm_hour, utc.tm_min, utc.tm_sec + ) + return date + microseconds + "Z" + except (ValueError, OverflowError) as err: + msg = "Unable to serialize datetime object." + raise_with_traceback(SerializationError, msg, err) + except AttributeError as err: + msg = "ISO-8601 object must be valid Datetime object." + raise_with_traceback(TypeError, msg, err) + + @staticmethod + def serialize_unix(attr, **kwargs): + """Serialize Datetime object into IntTime format. + This is represented as seconds. + + :param Datetime attr: Object to be serialized. + :rtype: int + :raises: SerializationError if format invalid + """ + if isinstance(attr, int): + return attr + try: + if not attr.tzinfo: + _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") + return int(calendar.timegm(attr.utctimetuple())) + except AttributeError: + raise TypeError("Unix time object must be valid Datetime object.") + + +def rest_key_extractor(attr, attr_desc, data): + key = attr_desc["key"] + working_data = data + + while "." in key: + dict_keys = _FLATTEN.split(key) + if len(dict_keys) == 1: + key = _decode_attribute_map_key(dict_keys[0]) + break + working_key = _decode_attribute_map_key(dict_keys[0]) + working_data = working_data.get(working_key, data) + if working_data is None: + # If at any point while following flatten JSON path see None, it means + # that all properties under are None as well + # https://github.com/Azure/msrest-for-python/issues/197 + return None + key = ".".join(dict_keys[1:]) + + return working_data.get(key) + + +def rest_key_case_insensitive_extractor(attr, attr_desc, data): + key = attr_desc["key"] + working_data = data + + while "." in key: + dict_keys = _FLATTEN.split(key) + if len(dict_keys) == 1: + key = _decode_attribute_map_key(dict_keys[0]) + break + working_key = _decode_attribute_map_key(dict_keys[0]) + working_data = attribute_key_case_insensitive_extractor(working_key, None, working_data) + if working_data is None: + # If at any point while following flatten JSON path see None, it means + # that all properties under are None as well + # https://github.com/Azure/msrest-for-python/issues/197 + return None + key = ".".join(dict_keys[1:]) + + if working_data: + return attribute_key_case_insensitive_extractor(key, None, working_data) + + +def last_rest_key_extractor(attr, attr_desc, data): + """Extract the attribute in "data" based on the last part of the JSON path key.""" + key = attr_desc["key"] + dict_keys = _FLATTEN.split(key) + return attribute_key_extractor(dict_keys[-1], None, data) + + +def last_rest_key_case_insensitive_extractor(attr, attr_desc, data): + """Extract the attribute in "data" based on the last part of the JSON path key. + + This is the case insensitive version of "last_rest_key_extractor" + """ + key = attr_desc["key"] + dict_keys = _FLATTEN.split(key) + return attribute_key_case_insensitive_extractor(dict_keys[-1], None, data) + + +def attribute_key_extractor(attr, _, data): + return data.get(attr) + + +def attribute_key_case_insensitive_extractor(attr, _, data): + found_key = None + lower_attr = attr.lower() + for key in data: + if lower_attr == key.lower(): + found_key = key + break + + return data.get(found_key) + + +def _extract_name_from_internal_type(internal_type): + """Given an internal type XML description, extract correct XML name with namespace. + + :param dict internal_type: An model type + :rtype: tuple + :returns: A tuple XML name + namespace dict + """ + internal_type_xml_map = getattr(internal_type, "_xml_map", {}) + xml_name = internal_type_xml_map.get("name", internal_type.__name__) + xml_ns = internal_type_xml_map.get("ns", None) + if xml_ns: + xml_name = "{}{}".format(xml_ns, xml_name) + return xml_name + + +def xml_key_extractor(attr, attr_desc, data): + if isinstance(data, dict): + return None + + # Test if this model is XML ready first + if not isinstance(data, ET.Element): + return None + + xml_desc = attr_desc.get("xml", {}) + xml_name = xml_desc.get("name", attr_desc["key"]) + + # Look for a children + is_iter_type = attr_desc["type"].startswith("[") + is_wrapped = xml_desc.get("wrapped", False) + internal_type = attr_desc.get("internalType", None) + internal_type_xml_map = getattr(internal_type, "_xml_map", {}) + + # Integrate namespace if necessary + xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None)) + if xml_ns: + xml_name = "{}{}".format(xml_ns, xml_name) + + # If it's an attribute, that's simple + if xml_desc.get("attr", False): + return data.get(xml_name) + + # If it's x-ms-text, that's simple too + if xml_desc.get("text", False): + return data.text + + # Scenario where I take the local name: + # - Wrapped node + # - Internal type is an enum (considered basic types) + # - Internal type has no XML/Name node + if is_wrapped or (internal_type and (issubclass(internal_type, Enum) or "name" not in internal_type_xml_map)): + children = data.findall(xml_name) + # If internal type has a local name and it's not a list, I use that name + elif not is_iter_type and internal_type and "name" in internal_type_xml_map: + xml_name = _extract_name_from_internal_type(internal_type) + children = data.findall(xml_name) + # That's an array + else: + if internal_type: # Complex type, ignore itemsName and use the complex type name + items_name = _extract_name_from_internal_type(internal_type) + else: + items_name = xml_desc.get("itemsName", xml_name) + children = data.findall(items_name) + + if len(children) == 0: + if is_iter_type: + if is_wrapped: + return None # is_wrapped no node, we want None + else: + return [] # not wrapped, assume empty list + return None # Assume it's not there, maybe an optional node. + + # If is_iter_type and not wrapped, return all found children + if is_iter_type: + if not is_wrapped: + return children + else: # Iter and wrapped, should have found one node only (the wrap one) + if len(children) != 1: + raise DeserializationError( + "Tried to deserialize an array not wrapped, and found several nodes '{}'. Maybe you should declare this array as wrapped?".format( + xml_name + ) + ) + return list(children[0]) # Might be empty list and that's ok. + + # Here it's not a itertype, we should have found one element only or empty + if len(children) > 1: + raise DeserializationError("Find several XML '{}' where it was not expected".format(xml_name)) + return children[0] + + +class Deserializer(object): + """Response object model deserializer. + + :param dict classes: Class type dictionary for deserializing complex types. + :ivar list key_extractors: Ordered list of extractors to be used by this deserializer. + """ + + basic_types = {str: "str", int: "int", bool: "bool", float: "float"} + + valid_date = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}" r"\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") + + def __init__(self, classes=None): + self.deserialize_type = { + "iso-8601": Deserializer.deserialize_iso, + "rfc-1123": Deserializer.deserialize_rfc, + "unix-time": Deserializer.deserialize_unix, + "duration": Deserializer.deserialize_duration, + "date": Deserializer.deserialize_date, + "time": Deserializer.deserialize_time, + "decimal": Deserializer.deserialize_decimal, + "long": Deserializer.deserialize_long, + "bytearray": Deserializer.deserialize_bytearray, + "base64": Deserializer.deserialize_base64, + "object": self.deserialize_object, + "[]": self.deserialize_iter, + "{}": self.deserialize_dict, + } + self.deserialize_expected_types = { + "duration": (isodate.Duration, datetime.timedelta), + "iso-8601": (datetime.datetime), + } + self.dependencies = dict(classes) if classes else {} + self.key_extractors = [rest_key_extractor, xml_key_extractor] + # Additional properties only works if the "rest_key_extractor" is used to + # extract the keys. Making it to work whatever the key extractor is too much + # complicated, with no real scenario for now. + # So adding a flag to disable additional properties detection. This flag should be + # used if your expect the deserialization to NOT come from a JSON REST syntax. + # Otherwise, result are unexpected + self.additional_properties_detection = True + + def __call__(self, target_obj, response_data, content_type=None): + """Call the deserializer to process a REST response. + + :param str target_obj: Target data type to deserialize to. + :param requests.Response response_data: REST response object. + :param str content_type: Swagger "produces" if available. + :raises: DeserializationError if deserialization fails. + :return: Deserialized object. + """ + data = self._unpack_content(response_data, content_type) + return self._deserialize(target_obj, data) + + def _deserialize(self, target_obj, data): + """Call the deserializer on a model. + + Data needs to be already deserialized as JSON or XML ElementTree + + :param str target_obj: Target data type to deserialize to. + :param object data: Object to deserialize. + :raises: DeserializationError if deserialization fails. + :return: Deserialized object. + """ + # This is already a model, go recursive just in case + if hasattr(data, "_attribute_map"): + constants = [name for name, config in getattr(data, "_validation", {}).items() if config.get("constant")] + try: + for attr, mapconfig in data._attribute_map.items(): + if attr in constants: + continue + value = getattr(data, attr) + if value is None: + continue + local_type = mapconfig["type"] + internal_data_type = local_type.strip("[]{}") + if internal_data_type not in self.dependencies or isinstance(internal_data_type, Enum): + continue + setattr(data, attr, self._deserialize(local_type, value)) + return data + except AttributeError: + return + + response, class_name = self._classify_target(target_obj, data) + + if isinstance(response, basestring): + return self.deserialize_data(data, response) + elif isinstance(response, type) and issubclass(response, Enum): + return self.deserialize_enum(data, response) + + if data is None: + return data + try: + attributes = response._attribute_map + d_attrs = {} + for attr, attr_desc in attributes.items(): + # Check empty string. If it's not empty, someone has a real "additionalProperties"... + if attr == "additional_properties" and attr_desc["key"] == "": + continue + raw_value = None + # Enhance attr_desc with some dynamic data + attr_desc = attr_desc.copy() # Do a copy, do not change the real one + internal_data_type = attr_desc["type"].strip("[]{}") + if internal_data_type in self.dependencies: + attr_desc["internalType"] = self.dependencies[internal_data_type] + + for key_extractor in self.key_extractors: + found_value = key_extractor(attr, attr_desc, data) + if found_value is not None: + if raw_value is not None and raw_value != found_value: + msg = ( + "Ignoring extracted value '%s' from %s for key '%s'" + " (duplicate extraction, follow extractors order)" + ) + _LOGGER.warning(msg, found_value, key_extractor, attr) + continue + raw_value = found_value + + value = self.deserialize_data(raw_value, attr_desc["type"]) + d_attrs[attr] = value + except (AttributeError, TypeError, KeyError) as err: + msg = "Unable to deserialize to object: " + class_name + raise_with_traceback(DeserializationError, msg, err) + else: + additional_properties = self._build_additional_properties(attributes, data) + return self._instantiate_model(response, d_attrs, additional_properties) + + def _build_additional_properties(self, attribute_map, data): + if not self.additional_properties_detection: + return None + if "additional_properties" in attribute_map and attribute_map.get("additional_properties", {}).get("key") != "": + # Check empty string. If it's not empty, someone has a real "additionalProperties" + return None + if isinstance(data, ET.Element): + data = {el.tag: el.text for el in data} + + known_keys = { + _decode_attribute_map_key(_FLATTEN.split(desc["key"])[0]) + for desc in attribute_map.values() + if desc["key"] != "" + } + present_keys = set(data.keys()) + missing_keys = present_keys - known_keys + return {key: data[key] for key in missing_keys} + + def _classify_target(self, target, data): + """Check to see whether the deserialization target object can + be classified into a subclass. + Once classification has been determined, initialize object. + + :param str target: The target object type to deserialize to. + :param str/dict data: The response data to deseralize. + """ + if target is None: + return None, None + + if isinstance(target, basestring): + try: + target = self.dependencies[target] + except KeyError: + return target, target + + try: + target = target._classify(data, self.dependencies) + except AttributeError: + pass # Target is not a Model, no classify + return target, target.__class__.__name__ + + def failsafe_deserialize(self, target_obj, data, content_type=None): + """Ignores any errors encountered in deserialization, + and falls back to not deserializing the object. Recommended + for use in error deserialization, as we want to return the + HttpResponseError to users, and not have them deal with + a deserialization error. + + :param str target_obj: The target object type to deserialize to. + :param str/dict data: The response data to deseralize. + :param str content_type: Swagger "produces" if available. + """ + try: + return self(target_obj, data, content_type=content_type) + except: + _LOGGER.debug( + "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True + ) + return None + + @staticmethod + def _unpack_content(raw_data, content_type=None): + """Extract the correct structure for deserialization. + + If raw_data is a PipelineResponse, try to extract the result of RawDeserializer. + if we can't, raise. Your Pipeline should have a RawDeserializer. + + If not a pipeline response and raw_data is bytes or string, use content-type + to decode it. If no content-type, try JSON. + + If raw_data is something else, bypass all logic and return it directly. + + :param raw_data: Data to be processed. + :param content_type: How to parse if raw_data is a string/bytes. + :raises JSONDecodeError: If JSON is requested and parsing is impossible. + :raises UnicodeDecodeError: If bytes is not UTF8 + """ + # Assume this is enough to detect a Pipeline Response without importing it + context = getattr(raw_data, "context", {}) + if context: + if RawDeserializer.CONTEXT_NAME in context: + return context[RawDeserializer.CONTEXT_NAME] + raise ValueError("This pipeline didn't have the RawDeserializer policy; can't deserialize") + + # Assume this is enough to recognize universal_http.ClientResponse without importing it + if hasattr(raw_data, "body"): + return RawDeserializer.deserialize_from_http_generics(raw_data.text(), raw_data.headers) + + # Assume this enough to recognize requests.Response without importing it. + if hasattr(raw_data, "_content_consumed"): + return RawDeserializer.deserialize_from_http_generics(raw_data.text, raw_data.headers) + + if isinstance(raw_data, (basestring, bytes)) or hasattr(raw_data, "read"): + return RawDeserializer.deserialize_from_text(raw_data, content_type) + return raw_data + + def _instantiate_model(self, response, attrs, additional_properties=None): + """Instantiate a response model passing in deserialized args. + + :param response: The response model class. + :param d_attrs: The deserialized response attributes. + """ + if callable(response): + subtype = getattr(response, "_subtype_map", {}) + try: + readonly = [k for k, v in response._validation.items() if v.get("readonly")] + const = [k for k, v in response._validation.items() if v.get("constant")] + kwargs = {k: v for k, v in attrs.items() if k not in subtype and k not in readonly + const} + response_obj = response(**kwargs) + for attr in readonly: + setattr(response_obj, attr, attrs.get(attr)) + if additional_properties: + response_obj.additional_properties = additional_properties + return response_obj + except TypeError as err: + msg = "Unable to deserialize {} into model {}. ".format(kwargs, response) + raise DeserializationError(msg + str(err)) + else: + try: + for attr, value in attrs.items(): + setattr(response, attr, value) + return response + except Exception as exp: + msg = "Unable to populate response model. " + msg += "Type: {}, Error: {}".format(type(response), exp) + raise DeserializationError(msg) + + def deserialize_data(self, data, data_type): + """Process data for deserialization according to data type. + + :param str data: The response string to be deserialized. + :param str data_type: The type to deserialize to. + :raises: DeserializationError if deserialization fails. + :return: Deserialized object. + """ + if data is None: + return data + + try: + if not data_type: + return data + if data_type in self.basic_types.values(): + return self.deserialize_basic(data, data_type) + if data_type in self.deserialize_type: + if isinstance(data, self.deserialize_expected_types.get(data_type, tuple())): + return data + + is_a_text_parsing_type = lambda x: x not in ["object", "[]", r"{}"] + if isinstance(data, ET.Element) and is_a_text_parsing_type(data_type) and not data.text: + return None + data_val = self.deserialize_type[data_type](data) + return data_val + + iter_type = data_type[0] + data_type[-1] + if iter_type in self.deserialize_type: + return self.deserialize_type[iter_type](data, data_type[1:-1]) + + obj_type = self.dependencies[data_type] + if issubclass(obj_type, Enum): + if isinstance(data, ET.Element): + data = data.text + return self.deserialize_enum(data, obj_type) + + except (ValueError, TypeError, AttributeError) as err: + msg = "Unable to deserialize response data." + msg += " Data: {}, {}".format(data, data_type) + raise_with_traceback(DeserializationError, msg, err) + else: + return self._deserialize(obj_type, data) + + def deserialize_iter(self, attr, iter_type): + """Deserialize an iterable. + + :param list attr: Iterable to be deserialized. + :param str iter_type: The type of object in the iterable. + :rtype: list + """ + if attr is None: + return None + if isinstance(attr, ET.Element): # If I receive an element here, get the children + attr = list(attr) + if not isinstance(attr, (list, set)): + raise DeserializationError("Cannot deserialize as [{}] an object of type {}".format(iter_type, type(attr))) + return [self.deserialize_data(a, iter_type) for a in attr] + + def deserialize_dict(self, attr, dict_type): + """Deserialize a dictionary. + + :param dict/list attr: Dictionary to be deserialized. Also accepts + a list of key, value pairs. + :param str dict_type: The object type of the items in the dictionary. + :rtype: dict + """ + if isinstance(attr, list): + return {x["key"]: self.deserialize_data(x["value"], dict_type) for x in attr} + + if isinstance(attr, ET.Element): + # Transform value into {"Key": "value"} + attr = {el.tag: el.text for el in attr} + return {k: self.deserialize_data(v, dict_type) for k, v in attr.items()} + + def deserialize_object(self, attr, **kwargs): + """Deserialize a generic object. + This will be handled as a dictionary. + + :param dict attr: Dictionary to be deserialized. + :rtype: dict + :raises: TypeError if non-builtin datatype encountered. + """ + if attr is None: + return None + if isinstance(attr, ET.Element): + # Do no recurse on XML, just return the tree as-is + return attr + if isinstance(attr, basestring): + return self.deserialize_basic(attr, "str") + obj_type = type(attr) + if obj_type in self.basic_types: + return self.deserialize_basic(attr, self.basic_types[obj_type]) + if obj_type is _long_type: + return self.deserialize_long(attr) + + if obj_type == dict: + deserialized = {} + for key, value in attr.items(): + try: + deserialized[key] = self.deserialize_object(value, **kwargs) + except ValueError: + deserialized[key] = None + return deserialized + + if obj_type == list: + deserialized = [] + for obj in attr: + try: + deserialized.append(self.deserialize_object(obj, **kwargs)) + except ValueError: + pass + return deserialized + + else: + error = "Cannot deserialize generic object with type: " + raise TypeError(error + str(obj_type)) + + def deserialize_basic(self, attr, data_type): + """Deserialize basic builtin data type from string. + Will attempt to convert to str, int, float and bool. + This function will also accept '1', '0', 'true' and 'false' as + valid bool values. + + :param str attr: response string to be deserialized. + :param str data_type: deserialization data type. + :rtype: str, int, float or bool + :raises: TypeError if string format is not valid. + """ + # If we're here, data is supposed to be a basic type. + # If it's still an XML node, take the text + if isinstance(attr, ET.Element): + attr = attr.text + if not attr: + if data_type == "str": + # None or '', node is empty string. + return "" + else: + # None or '', node with a strong type is None. + # Don't try to model "empty bool" or "empty int" + return None + + if data_type == "bool": + if attr in [True, False, 1, 0]: + return bool(attr) + elif isinstance(attr, basestring): + if attr.lower() in ["true", "1"]: + return True + elif attr.lower() in ["false", "0"]: + return False + raise TypeError("Invalid boolean value: {}".format(attr)) + + if data_type == "str": + return self.deserialize_unicode(attr) + return eval(data_type)(attr) # nosec + + @staticmethod + def deserialize_unicode(data): + """Preserve unicode objects in Python 2, otherwise return data + as a string. + + :param str data: response string to be deserialized. + :rtype: str or unicode + """ + # We might be here because we have an enum modeled as string, + # and we try to deserialize a partial dict with enum inside + if isinstance(data, Enum): + return data + + # Consider this is real string + try: + if isinstance(data, unicode): + return data + except NameError: + return str(data) + else: + return str(data) + + @staticmethod + def deserialize_enum(data, enum_obj): + """Deserialize string into enum object. + + If the string is not a valid enum value it will be returned as-is + and a warning will be logged. + + :param str data: Response string to be deserialized. If this value is + None or invalid it will be returned as-is. + :param Enum enum_obj: Enum object to deserialize to. + :rtype: Enum + """ + if isinstance(data, enum_obj) or data is None: + return data + if isinstance(data, Enum): + data = data.value + if isinstance(data, int): + # Workaround. We might consider remove it in the future. + # https://github.com/Azure/azure-rest-api-specs/issues/141 + try: + return list(enum_obj.__members__.values())[data] + except IndexError: + error = "{!r} is not a valid index for enum {!r}" + raise DeserializationError(error.format(data, enum_obj)) + try: + return enum_obj(str(data)) + except ValueError: + for enum_value in enum_obj: + if enum_value.value.lower() == str(data).lower(): + return enum_value + # We don't fail anymore for unknown value, we deserialize as a string + _LOGGER.warning("Deserializer is not able to find %s as valid enum in %s", data, enum_obj) + return Deserializer.deserialize_unicode(data) + + @staticmethod + def deserialize_bytearray(attr): + """Deserialize string into bytearray. + + :param str attr: response string to be deserialized. + :rtype: bytearray + :raises: TypeError if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + return bytearray(b64decode(attr)) + + @staticmethod + def deserialize_base64(attr): + """Deserialize base64 encoded string into string. + + :param str attr: response string to be deserialized. + :rtype: bytearray + :raises: TypeError if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + padding = "=" * (3 - (len(attr) + 3) % 4) + attr = attr + padding + encoded = attr.replace("-", "+").replace("_", "/") + return b64decode(encoded) + + @staticmethod + def deserialize_decimal(attr): + """Deserialize string into Decimal object. + + :param str attr: response string to be deserialized. + :rtype: Decimal + :raises: DeserializationError if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + try: + return decimal.Decimal(attr) + except decimal.DecimalException as err: + msg = "Invalid decimal {}".format(attr) + raise_with_traceback(DeserializationError, msg, err) + + @staticmethod + def deserialize_long(attr): + """Deserialize string into long (Py2) or int (Py3). + + :param str attr: response string to be deserialized. + :rtype: long or int + :raises: ValueError if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + return _long_type(attr) + + @staticmethod + def deserialize_duration(attr): + """Deserialize ISO-8601 formatted string into TimeDelta object. + + :param str attr: response string to be deserialized. + :rtype: TimeDelta + :raises: DeserializationError if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + try: + duration = isodate.parse_duration(attr) + except (ValueError, OverflowError, AttributeError) as err: + msg = "Cannot deserialize duration object." + raise_with_traceback(DeserializationError, msg, err) + else: + return duration + + @staticmethod + def deserialize_date(attr): + """Deserialize ISO-8601 formatted string into Date object. + + :param str attr: response string to be deserialized. + :rtype: Date + :raises: DeserializationError if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + if re.search(r"[^\W\d_]", attr, re.I + re.U): + raise DeserializationError("Date must have only digits and -. Received: %s" % attr) + # This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception. + return isodate.parse_date(attr, defaultmonth=None, defaultday=None) + + @staticmethod + def deserialize_time(attr): + """Deserialize ISO-8601 formatted string into time object. + + :param str attr: response string to be deserialized. + :rtype: datetime.time + :raises: DeserializationError if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + if re.search(r"[^\W\d_]", attr, re.I + re.U): + raise DeserializationError("Date must have only digits and -. Received: %s" % attr) + return isodate.parse_time(attr) + + @staticmethod + def deserialize_rfc(attr): + """Deserialize RFC-1123 formatted string into Datetime object. + + :param str attr: response string to be deserialized. + :rtype: Datetime + :raises: DeserializationError if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + try: + parsed_date = email.utils.parsedate_tz(attr) + date_obj = datetime.datetime( + *parsed_date[:6], tzinfo=_FixedOffset(datetime.timedelta(minutes=(parsed_date[9] or 0) / 60)) + ) + if not date_obj.tzinfo: + date_obj = date_obj.astimezone(tz=TZ_UTC) + except ValueError as err: + msg = "Cannot deserialize to rfc datetime object." + raise_with_traceback(DeserializationError, msg, err) + else: + return date_obj + + @staticmethod + def deserialize_iso(attr): + """Deserialize ISO-8601 formatted string into Datetime object. + + :param str attr: response string to be deserialized. + :rtype: Datetime + :raises: DeserializationError if string format invalid. + """ + if isinstance(attr, ET.Element): + attr = attr.text + try: + attr = attr.upper() + match = Deserializer.valid_date.match(attr) + if not match: + raise ValueError("Invalid datetime string: " + attr) + + check_decimal = attr.split(".") + if len(check_decimal) > 1: + decimal_str = "" + for digit in check_decimal[1]: + if digit.isdigit(): + decimal_str += digit + else: + break + if len(decimal_str) > 6: + attr = attr.replace(decimal_str, decimal_str[0:6]) + + date_obj = isodate.parse_datetime(attr) + test_utc = date_obj.utctimetuple() + if test_utc.tm_year > 9999 or test_utc.tm_year < 1: + raise OverflowError("Hit max or min date") + except (ValueError, OverflowError, AttributeError) as err: + msg = "Cannot deserialize datetime object." + raise_with_traceback(DeserializationError, msg, err) + else: + return date_obj + + @staticmethod + def deserialize_unix(attr): + """Serialize Datetime object into IntTime format. + This is represented as seconds. + + :param int attr: Object to be serialized. + :rtype: Datetime + :raises: DeserializationError if format invalid + """ + if isinstance(attr, ET.Element): + attr = int(attr.text) + try: + date_obj = datetime.datetime.fromtimestamp(attr, TZ_UTC) + except ValueError as err: + msg = "Cannot deserialize to unix datetime object." + raise_with_traceback(DeserializationError, msg, err) + else: + return date_obj diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_vendor.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_vendor.py index 138f663c53a4..9aad73fc743e 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_vendor.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_vendor.py @@ -7,6 +7,7 @@ from azure.core.pipeline.transport import HttpRequest + def _convert_request(request, files=None): data = request.content if not files else None request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data) @@ -14,6 +15,7 @@ def _convert_request(request, files=None): request.set_formdata_body(files) return request + def _format_url_section(template, **kwargs): components = template.split("/") while components: @@ -21,7 +23,5 @@ def _format_url_section(template, **kwargs): return template.format(**kwargs) except KeyError as key: formatted_components = template.split("/") - components = [ - c for c in formatted_components if "{}".format(key.args[0]) not in c - ] + components = [c for c in formatted_components if "{}".format(key.args[0]) not in c] template = "/".join(components) diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_version.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_version.py index c47f66669f1b..48944bf3938a 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_version.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "1.0.0" +VERSION = "2.0.0" diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/__init__.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/__init__.py index cb4bbcce8e12..7532ceec9286 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/__init__.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/__init__.py @@ -7,9 +7,15 @@ # -------------------------------------------------------------------------- from ._container_apps_api_client import ContainerAppsAPIClient -__all__ = ['ContainerAppsAPIClient'] -# `._patch.py` is used for handwritten extensions to the generated code -# Example: https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md -from ._patch import patch_sdk -patch_sdk() +try: + from ._patch import __all__ as _patch_all + from ._patch import * # type: ignore # pylint: disable=unused-wildcard-import +except ImportError: + _patch_all = [] +from ._patch import patch_sdk as _patch_sdk + +__all__ = ["ContainerAppsAPIClient"] +__all__.extend([p for p in _patch_all if p not in __all__]) + +_patch_sdk() diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/_configuration.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/_configuration.py index 8c3aafe44398..6a0f0dd250ff 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/_configuration.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/_configuration.py @@ -25,23 +25,18 @@ class ContainerAppsAPIClientConfiguration(Configuration): # pylint: disable=too Note that all parameters used to create this instance are saved as instance attributes. - :param credential: Credential needed for the client to connect to Azure. + :param credential: Credential needed for the client to connect to Azure. Required. :type credential: ~azure.core.credentials_async.AsyncTokenCredential - :param subscription_id: The ID of the target subscription. + :param subscription_id: The ID of the target subscription. Required. :type subscription_id: str :keyword api_version: Api Version. Default value is "2022-03-01". Note that overriding this default value may result in unsupported behavior. :paramtype api_version: str """ - def __init__( - self, - credential: "AsyncTokenCredential", - subscription_id: str, - **kwargs: Any - ) -> None: + def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None: super(ContainerAppsAPIClientConfiguration, self).__init__(**kwargs) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", "2022-03-01") # type: str if credential is None: raise ValueError("Parameter 'credential' must not be None.") @@ -51,22 +46,21 @@ def __init__( self.credential = credential self.subscription_id = subscription_id self.api_version = api_version - self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default']) - kwargs.setdefault('sdk_moniker', 'mgmt-appcontainers/{}'.format(VERSION)) + self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"]) + kwargs.setdefault("sdk_moniker", "mgmt-appcontainers/{}".format(VERSION)) self._configure(**kwargs) - def _configure( - self, - **kwargs: Any - ) -> None: - self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs) - self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs) - self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs) - self.logging_policy = kwargs.get('logging_policy') or policies.NetworkTraceLoggingPolicy(**kwargs) - self.http_logging_policy = kwargs.get('http_logging_policy') or ARMHttpLoggingPolicy(**kwargs) - self.retry_policy = kwargs.get('retry_policy') or policies.AsyncRetryPolicy(**kwargs) - self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs) - self.redirect_policy = kwargs.get('redirect_policy') or policies.AsyncRedirectPolicy(**kwargs) - self.authentication_policy = kwargs.get('authentication_policy') + def _configure(self, **kwargs: Any) -> None: + self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) + self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) + self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) + self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) + self.http_logging_policy = kwargs.get("http_logging_policy") or ARMHttpLoggingPolicy(**kwargs) + self.retry_policy = kwargs.get("retry_policy") or policies.AsyncRetryPolicy(**kwargs) + self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) + self.redirect_policy = kwargs.get("redirect_policy") or policies.AsyncRedirectPolicy(**kwargs) + self.authentication_policy = kwargs.get("authentication_policy") if self.credential and not self.authentication_policy: - self.authentication_policy = AsyncARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs) + self.authentication_policy = AsyncARMChallengeAuthenticationPolicy( + self.credential, *self.credential_scopes, **kwargs + ) diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/_container_apps_api_client.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/_container_apps_api_client.py index 99da7f7ccaf7..04d45e031246 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/_container_apps_api_client.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/_container_apps_api_client.py @@ -9,20 +9,32 @@ from copy import deepcopy from typing import Any, Awaitable, TYPE_CHECKING -from msrest import Deserializer, Serializer - from azure.core.rest import AsyncHttpResponse, HttpRequest from azure.mgmt.core import AsyncARMPipelineClient from .. import models +from .._serialization import Deserializer, Serializer from ._configuration import ContainerAppsAPIClientConfiguration -from .operations import CertificatesOperations, ContainerAppsAuthConfigsOperations, ContainerAppsOperations, ContainerAppsRevisionReplicasOperations, ContainerAppsRevisionsOperations, ContainerAppsSourceControlsOperations, DaprComponentsOperations, ManagedEnvironmentsOperations, ManagedEnvironmentsStoragesOperations, NamespacesOperations, Operations +from .operations import ( + CertificatesOperations, + ContainerAppsAuthConfigsOperations, + ContainerAppsOperations, + ContainerAppsRevisionReplicasOperations, + ContainerAppsRevisionsOperations, + ContainerAppsSourceControlsOperations, + DaprComponentsOperations, + ManagedEnvironmentsOperations, + ManagedEnvironmentsStoragesOperations, + NamespacesOperations, + Operations, +) if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential -class ContainerAppsAPIClient: # pylint: disable=too-many-instance-attributes + +class ContainerAppsAPIClient: # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes """ContainerAppsAPIClient. :ivar container_apps_auth_configs: ContainerAppsAuthConfigsOperations operations @@ -53,9 +65,9 @@ class ContainerAppsAPIClient: # pylint: disable=too-many-instance-attributes :ivar container_apps_source_controls: ContainerAppsSourceControlsOperations operations :vartype container_apps_source_controls: azure.mgmt.appcontainers.aio.operations.ContainerAppsSourceControlsOperations - :param credential: Credential needed for the client to connect to Azure. + :param credential: Credential needed for the client to connect to Azure. Required. :type credential: ~azure.core.credentials_async.AsyncTokenCredential - :param subscription_id: The ID of the target subscription. + :param subscription_id: The ID of the target subscription. Required. :type subscription_id: str :param base_url: Service URL. Default value is "https://management.azure.com". :type base_url: str @@ -73,31 +85,40 @@ def __init__( base_url: str = "https://management.azure.com", **kwargs: Any ) -> None: - self._config = ContainerAppsAPIClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs) + self._config = ContainerAppsAPIClientConfiguration( + credential=credential, subscription_id=subscription_id, **kwargs + ) self._client = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False - self.container_apps_auth_configs = ContainerAppsAuthConfigsOperations(self._client, self._config, self._serialize, self._deserialize) + self.container_apps_auth_configs = ContainerAppsAuthConfigsOperations( + self._client, self._config, self._serialize, self._deserialize + ) self.container_apps = ContainerAppsOperations(self._client, self._config, self._serialize, self._deserialize) - self.container_apps_revisions = ContainerAppsRevisionsOperations(self._client, self._config, self._serialize, self._deserialize) - self.container_apps_revision_replicas = ContainerAppsRevisionReplicasOperations(self._client, self._config, self._serialize, self._deserialize) + self.container_apps_revisions = ContainerAppsRevisionsOperations( + self._client, self._config, self._serialize, self._deserialize + ) + self.container_apps_revision_replicas = ContainerAppsRevisionReplicasOperations( + self._client, self._config, self._serialize, self._deserialize + ) self.dapr_components = DaprComponentsOperations(self._client, self._config, self._serialize, self._deserialize) self.operations = Operations(self._client, self._config, self._serialize, self._deserialize) - self.managed_environments = ManagedEnvironmentsOperations(self._client, self._config, self._serialize, self._deserialize) + self.managed_environments = ManagedEnvironmentsOperations( + self._client, self._config, self._serialize, self._deserialize + ) self.certificates = CertificatesOperations(self._client, self._config, self._serialize, self._deserialize) self.namespaces = NamespacesOperations(self._client, self._config, self._serialize, self._deserialize) - self.managed_environments_storages = ManagedEnvironmentsStoragesOperations(self._client, self._config, self._serialize, self._deserialize) - self.container_apps_source_controls = ContainerAppsSourceControlsOperations(self._client, self._config, self._serialize, self._deserialize) - - - def _send_request( - self, - request: HttpRequest, - **kwargs: Any - ) -> Awaitable[AsyncHttpResponse]: + self.managed_environments_storages = ManagedEnvironmentsStoragesOperations( + self._client, self._config, self._serialize, self._deserialize + ) + self.container_apps_source_controls = ContainerAppsSourceControlsOperations( + self._client, self._config, self._serialize, self._deserialize + ) + + def _send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncHttpResponse]: """Runs the network request through the client's chained policies. >>> from azure.core.rest import HttpRequest @@ -106,7 +127,7 @@ def _send_request( >>> response = await client._send_request(request) - For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart + For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request :param request: The network request you want to make. Required. :type request: ~azure.core.rest.HttpRequest diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/_patch.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/_patch.py index 74e48ecd07cf..f99e77fef986 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/_patch.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/_patch.py @@ -28,4 +28,4 @@ # This file is used for handwritten extensions to the generated code. Example: # https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md def patch_sdk(): - pass \ No newline at end of file + pass diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/__init__.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/__init__.py index 505be253220b..a1e4976ca875 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/__init__.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/__init__.py @@ -18,16 +18,22 @@ from ._managed_environments_storages_operations import ManagedEnvironmentsStoragesOperations from ._container_apps_source_controls_operations import ContainerAppsSourceControlsOperations +from ._patch import __all__ as _patch_all +from ._patch import * # type: ignore # pylint: disable=unused-wildcard-import +from ._patch import patch_sdk as _patch_sdk + __all__ = [ - 'ContainerAppsAuthConfigsOperations', - 'ContainerAppsOperations', - 'ContainerAppsRevisionsOperations', - 'ContainerAppsRevisionReplicasOperations', - 'DaprComponentsOperations', - 'Operations', - 'ManagedEnvironmentsOperations', - 'CertificatesOperations', - 'NamespacesOperations', - 'ManagedEnvironmentsStoragesOperations', - 'ContainerAppsSourceControlsOperations', + "ContainerAppsAuthConfigsOperations", + "ContainerAppsOperations", + "ContainerAppsRevisionsOperations", + "ContainerAppsRevisionReplicasOperations", + "DaprComponentsOperations", + "Operations", + "ManagedEnvironmentsOperations", + "CertificatesOperations", + "NamespacesOperations", + "ManagedEnvironmentsStoragesOperations", + "ContainerAppsSourceControlsOperations", ] +__all__.extend([p for p in _patch_all if p not in __all__]) +_patch_sdk() diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_certificates_operations.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_certificates_operations.py index f4742e78a51a..c3fa29537bb1 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_certificates_operations.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_certificates_operations.py @@ -6,98 +6,114 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar +from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload +from urllib.parse import parse_qs, urljoin, urlparse from azure.core.async_paging import AsyncItemPaged, AsyncList -from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import AsyncHttpResponse from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace from azure.core.tracing.decorator_async import distributed_trace_async +from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from ... import models as _models from ..._vendor import _convert_request -from ...operations._certificates_operations import build_create_or_update_request, build_delete_request, build_get_request, build_list_request, build_update_request -T = TypeVar('T') +from ...operations._certificates_operations import ( + build_create_or_update_request, + build_delete_request, + build_get_request, + build_list_request, + build_update_request, +) + +T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] -class CertificatesOperations: - """CertificatesOperations async operations. - You should not instantiate this class directly. Instead, you should create a Client instance that - instantiates it for you and attaches it as an attribute. +class CertificatesOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. - :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.appcontainers.models - :param client: Client for service requests. - :param config: Configuration of service client. - :param serializer: An object model serializer. - :param deserializer: An object model deserializer. + Instead, you should access the following operations through + :class:`~azure.mgmt.appcontainers.aio.ContainerAppsAPIClient`'s + :attr:`certificates` attribute. """ models = _models - def __init__(self, client, config, serializer, deserializer) -> None: - self._client = client - self._serialize = serializer - self._deserialize = deserializer - self._config = config + def __init__(self, *args, **kwargs) -> None: + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def list( - self, - resource_group_name: str, - environment_name: str, - **kwargs: Any - ) -> AsyncIterable["_models.CertificateCollection"]: + self, resource_group_name: str, environment_name: str, **kwargs: Any + ) -> AsyncIterable["_models.Certificate"]: """Get the Certificates in a given managed environment. Get the Certificates in a given managed environment. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Managed Environment. + :param environment_name: Name of the Managed Environment. Required. :type environment_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of either CertificateCollection or the result of - cls(response) - :rtype: - ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.appcontainers.models.CertificateCollection] - :raises: ~azure.core.exceptions.HttpResponseError + :return: An iterator like instance of either Certificate or the result of cls(response) + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.appcontainers.models.Certificate] + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.CertificateCollection] - cls = kwargs.pop('cls', None) # type: ClsType["_models.CertificateCollection"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + def prepare_request(next_link=None): if not next_link: - + request = build_list_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list.metadata['url'], + template_url=self.list.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore else: - - request = build_list_request( - subscription_id=self._config.subscription_id, - resource_group_name=resource_group_name, - environment_name=environment_name, - api_version=api_version, - template_url=next_link, - ) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore request.method = "GET" return request @@ -111,10 +127,8 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) response = pipeline_response.http_response @@ -125,60 +139,61 @@ async def get_next(next_link=None): return pipeline_response + return AsyncItemPaged(get_next, extract_data) - return AsyncItemPaged( - get_next, extract_data - ) - list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates"} # type: ignore + list.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates"} # type: ignore @distributed_trace_async async def get( - self, - resource_group_name: str, - environment_name: str, - certificate_name: str, - **kwargs: Any - ) -> "_models.Certificate": + self, resource_group_name: str, environment_name: str, certificate_name: str, **kwargs: Any + ) -> _models.Certificate: """Get the specified Certificate. Get the specified Certificate. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Managed Environment. + :param environment_name: Name of the Managed Environment. Required. :type environment_name: str - :param certificate_name: Name of the Certificate. + :param certificate_name: Name of the Certificate. Required. :type certificate_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: Certificate, or the result of cls(response) + :return: Certificate or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.Certificate - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.Certificate"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.Certificate] - request = build_get_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, certificate_name=certificate_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get.metadata['url'], + template_url=self.get.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -186,74 +201,158 @@ async def get( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('Certificate', pipeline_response) + deserialized = self._deserialize("Certificate", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates/{certificateName}"} # type: ignore + get.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates/{certificateName}"} # type: ignore - - @distributed_trace_async + @overload async def create_or_update( self, resource_group_name: str, environment_name: str, certificate_name: str, - certificate_envelope: Optional["_models.Certificate"] = None, + certificate_envelope: Optional[_models.Certificate] = None, + *, + content_type: str = "application/json", **kwargs: Any - ) -> "_models.Certificate": + ) -> _models.Certificate: """Create or Update a Certificate. Create or Update a Certificate. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Managed Environment. + :param environment_name: Name of the Managed Environment. Required. :type environment_name: str - :param certificate_name: Name of the Certificate. + :param certificate_name: Name of the Certificate. Required. :type certificate_name: str :param certificate_envelope: Certificate to be created or updated. Default value is None. :type certificate_envelope: ~azure.mgmt.appcontainers.models.Certificate + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: Certificate or the result of cls(response) + :rtype: ~azure.mgmt.appcontainers.models.Certificate + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + async def create_or_update( + self, + resource_group_name: str, + environment_name: str, + certificate_name: str, + certificate_envelope: Optional[IO] = None, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> _models.Certificate: + """Create or Update a Certificate. + + Create or Update a Certificate. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Managed Environment. Required. + :type environment_name: str + :param certificate_name: Name of the Certificate. Required. + :type certificate_name: str + :param certificate_envelope: Certificate to be created or updated. Default value is None. + :type certificate_envelope: IO + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: Certificate or the result of cls(response) + :rtype: ~azure.mgmt.appcontainers.models.Certificate + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @distributed_trace_async + async def create_or_update( + self, + resource_group_name: str, + environment_name: str, + certificate_name: str, + certificate_envelope: Optional[Union[_models.Certificate, IO]] = None, + **kwargs: Any + ) -> _models.Certificate: + """Create or Update a Certificate. + + Create or Update a Certificate. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Managed Environment. Required. + :type environment_name: str + :param certificate_name: Name of the Certificate. Required. + :type certificate_name: str + :param certificate_envelope: Certificate to be created or updated. Is either a model type or a + IO type. Default value is None. + :type certificate_envelope: ~azure.mgmt.appcontainers.models.Certificate or IO + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: Certificate, or the result of cls(response) + :return: Certificate or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.Certificate - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.Certificate"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Certificate] - if certificate_envelope is not None: - _json = self._serialize.body(certificate_envelope, 'Certificate') + content_type = content_type or "application/json" + _json = None + _content = None + if isinstance(certificate_envelope, (IO, bytes)): + _content = certificate_envelope else: - _json = None + if certificate_envelope is not None: + _json = self._serialize.body(certificate_envelope, "Certificate") + else: + _json = None request = build_create_or_update_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, certificate_name=certificate_name, + subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, - template_url=self.create_or_update.metadata['url'], + content=_content, + template_url=self.create_or_update.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -261,64 +360,66 @@ async def create_or_update( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('Certificate', pipeline_response) + deserialized = self._deserialize("Certificate", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates/{certificateName}"} # type: ignore - + create_or_update.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates/{certificateName}"} # type: ignore @distributed_trace_async async def delete( # pylint: disable=inconsistent-return-statements - self, - resource_group_name: str, - environment_name: str, - certificate_name: str, - **kwargs: Any + self, resource_group_name: str, environment_name: str, certificate_name: str, **kwargs: Any ) -> None: """Deletes the specified Certificate. Deletes the specified Certificate. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Managed Environment. + :param environment_name: Name of the Managed Environment. Required. :type environment_name: str - :param certificate_name: Name of the Certificate. + :param certificate_name: Name of the Certificate. Required. :type certificate_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: None, or the result of cls(response) + :return: None or the result of cls(response) :rtype: None - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] - request = build_delete_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, certificate_name=certificate_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.delete.metadata['url'], + template_url=self.delete.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200, 204]: @@ -329,8 +430,73 @@ async def delete( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, {}) - delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates/{certificateName}"} # type: ignore + delete.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates/{certificateName}"} # type: ignore + + @overload + async def update( + self, + resource_group_name: str, + environment_name: str, + certificate_name: str, + certificate_envelope: _models.CertificatePatch, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> _models.Certificate: + """Update properties of a certificate. + Patches a certificate. Currently only patching of tags is supported. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Managed Environment. Required. + :type environment_name: str + :param certificate_name: Name of the Certificate. Required. + :type certificate_name: str + :param certificate_envelope: Properties of a certificate that need to be updated. Required. + :type certificate_envelope: ~azure.mgmt.appcontainers.models.CertificatePatch + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: Certificate or the result of cls(response) + :rtype: ~azure.mgmt.appcontainers.models.Certificate + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + async def update( + self, + resource_group_name: str, + environment_name: str, + certificate_name: str, + certificate_envelope: IO, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> _models.Certificate: + """Update properties of a certificate. + + Patches a certificate. Currently only patching of tags is supported. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Managed Environment. Required. + :type environment_name: str + :param certificate_name: Name of the Certificate. Required. + :type certificate_name: str + :param certificate_envelope: Properties of a certificate that need to be updated. Required. + :type certificate_envelope: IO + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: Certificate or the result of cls(response) + :rtype: ~azure.mgmt.appcontainers.models.Certificate + :raises ~azure.core.exceptions.HttpResponseError: + """ @distributed_trace_async async def update( @@ -338,55 +504,74 @@ async def update( resource_group_name: str, environment_name: str, certificate_name: str, - certificate_envelope: "_models.CertificatePatch", + certificate_envelope: Union[_models.CertificatePatch, IO], **kwargs: Any - ) -> "_models.Certificate": + ) -> _models.Certificate: """Update properties of a certificate. Patches a certificate. Currently only patching of tags is supported. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Managed Environment. + :param environment_name: Name of the Managed Environment. Required. :type environment_name: str - :param certificate_name: Name of the Certificate. + :param certificate_name: Name of the Certificate. Required. :type certificate_name: str - :param certificate_envelope: Properties of a certificate that need to be updated. - :type certificate_envelope: ~azure.mgmt.appcontainers.models.CertificatePatch + :param certificate_envelope: Properties of a certificate that need to be updated. Is either a + model type or a IO type. Required. + :type certificate_envelope: ~azure.mgmt.appcontainers.models.CertificatePatch or IO + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: Certificate, or the result of cls(response) + :return: Certificate or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.Certificate - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.Certificate"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Certificate] - _json = self._serialize.body(certificate_envelope, 'CertificatePatch') + content_type = content_type or "application/json" + _json = None + _content = None + if isinstance(certificate_envelope, (IO, bytes)): + _content = certificate_envelope + else: + _json = self._serialize.body(certificate_envelope, "CertificatePatch") request = build_update_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, certificate_name=certificate_name, + subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, - template_url=self.update.metadata['url'], + content=_content, + template_url=self.update.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -394,12 +579,11 @@ async def update( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('Certificate', pipeline_response) + deserialized = self._deserialize("Certificate", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates/{certificateName}"} # type: ignore - + update.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates/{certificateName}"} # type: ignore diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_container_apps_auth_configs_operations.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_container_apps_auth_configs_operations.py index 3b3fc84f50d7..67857e8db5bb 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_container_apps_auth_configs_operations.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_container_apps_auth_configs_operations.py @@ -6,98 +6,113 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar +from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload +from urllib.parse import parse_qs, urljoin, urlparse from azure.core.async_paging import AsyncItemPaged, AsyncList -from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import AsyncHttpResponse from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace from azure.core.tracing.decorator_async import distributed_trace_async +from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from ... import models as _models from ..._vendor import _convert_request -from ...operations._container_apps_auth_configs_operations import build_create_or_update_request, build_delete_request, build_get_request, build_list_by_container_app_request -T = TypeVar('T') +from ...operations._container_apps_auth_configs_operations import ( + build_create_or_update_request, + build_delete_request, + build_get_request, + build_list_by_container_app_request, +) + +T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] -class ContainerAppsAuthConfigsOperations: - """ContainerAppsAuthConfigsOperations async operations. - You should not instantiate this class directly. Instead, you should create a Client instance that - instantiates it for you and attaches it as an attribute. +class ContainerAppsAuthConfigsOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. - :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.appcontainers.models - :param client: Client for service requests. - :param config: Configuration of service client. - :param serializer: An object model serializer. - :param deserializer: An object model deserializer. + Instead, you should access the following operations through + :class:`~azure.mgmt.appcontainers.aio.ContainerAppsAPIClient`'s + :attr:`container_apps_auth_configs` attribute. """ models = _models - def __init__(self, client, config, serializer, deserializer) -> None: - self._client = client - self._serialize = serializer - self._deserialize = deserializer - self._config = config + def __init__(self, *args, **kwargs) -> None: + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def list_by_container_app( - self, - resource_group_name: str, - container_app_name: str, - **kwargs: Any - ) -> AsyncIterable["_models.AuthConfigCollection"]: + self, resource_group_name: str, container_app_name: str, **kwargs: Any + ) -> AsyncIterable["_models.AuthConfig"]: """Get the Container App AuthConfigs in a given resource group. Get the Container App AuthConfigs in a given resource group. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of either AuthConfigCollection or the result of - cls(response) - :rtype: - ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.appcontainers.models.AuthConfigCollection] - :raises: ~azure.core.exceptions.HttpResponseError + :return: An iterator like instance of either AuthConfig or the result of cls(response) + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.appcontainers.models.AuthConfig] + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.AuthConfigCollection] - cls = kwargs.pop('cls', None) # type: ClsType["_models.AuthConfigCollection"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + def prepare_request(next_link=None): if not next_link: - + request = build_list_by_container_app_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_by_container_app.metadata['url'], + template_url=self.list_by_container_app.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore else: - - request = build_list_by_container_app_request( - subscription_id=self._config.subscription_id, - resource_group_name=resource_group_name, - container_app_name=container_app_name, - api_version=api_version, - template_url=next_link, - ) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore request.method = "GET" return request @@ -111,10 +126,8 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) response = pipeline_response.http_response @@ -125,60 +138,61 @@ async def get_next(next_link=None): return pipeline_response + return AsyncItemPaged(get_next, extract_data) - return AsyncItemPaged( - get_next, extract_data - ) - list_by_container_app.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs"} # type: ignore + list_by_container_app.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs"} # type: ignore @distributed_trace_async async def get( - self, - resource_group_name: str, - container_app_name: str, - auth_config_name: str, - **kwargs: Any - ) -> "_models.AuthConfig": + self, resource_group_name: str, container_app_name: str, auth_config_name: str, **kwargs: Any + ) -> _models.AuthConfig: """Get a AuthConfig of a Container App. Get a AuthConfig of a Container App. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param auth_config_name: Name of the Container App AuthConfig. + :param auth_config_name: Name of the Container App AuthConfig. Required. :type auth_config_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: AuthConfig, or the result of cls(response) + :return: AuthConfig or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.AuthConfig - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.AuthConfig"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.AuthConfig] - request = build_get_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, auth_config_name=auth_config_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get.metadata['url'], + template_url=self.get.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -186,15 +200,80 @@ async def get( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('AuthConfig', pipeline_response) + deserialized = self._deserialize("AuthConfig", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{authConfigName}"} # type: ignore + get.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{authConfigName}"} # type: ignore + + @overload + async def create_or_update( + self, + resource_group_name: str, + container_app_name: str, + auth_config_name: str, + auth_config_envelope: _models.AuthConfig, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> _models.AuthConfig: + """Create or update the AuthConfig for a Container App. + + Create or update the AuthConfig for a Container App. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param container_app_name: Name of the Container App. Required. + :type container_app_name: str + :param auth_config_name: Name of the Container App AuthConfig. Required. + :type auth_config_name: str + :param auth_config_envelope: Properties used to create a Container App AuthConfig. Required. + :type auth_config_envelope: ~azure.mgmt.appcontainers.models.AuthConfig + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: AuthConfig or the result of cls(response) + :rtype: ~azure.mgmt.appcontainers.models.AuthConfig + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + async def create_or_update( + self, + resource_group_name: str, + container_app_name: str, + auth_config_name: str, + auth_config_envelope: IO, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> _models.AuthConfig: + """Create or update the AuthConfig for a Container App. + Create or update the AuthConfig for a Container App. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param container_app_name: Name of the Container App. Required. + :type container_app_name: str + :param auth_config_name: Name of the Container App AuthConfig. Required. + :type auth_config_name: str + :param auth_config_envelope: Properties used to create a Container App AuthConfig. Required. + :type auth_config_envelope: IO + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: AuthConfig or the result of cls(response) + :rtype: ~azure.mgmt.appcontainers.models.AuthConfig + :raises ~azure.core.exceptions.HttpResponseError: + """ @distributed_trace_async async def create_or_update( @@ -202,55 +281,74 @@ async def create_or_update( resource_group_name: str, container_app_name: str, auth_config_name: str, - auth_config_envelope: "_models.AuthConfig", + auth_config_envelope: Union[_models.AuthConfig, IO], **kwargs: Any - ) -> "_models.AuthConfig": + ) -> _models.AuthConfig: """Create or update the AuthConfig for a Container App. - Description for Create or update the AuthConfig for a Container App. + Create or update the AuthConfig for a Container App. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param auth_config_name: Name of the Container App AuthConfig. + :param auth_config_name: Name of the Container App AuthConfig. Required. :type auth_config_name: str - :param auth_config_envelope: Properties used to create a Container App AuthConfig. - :type auth_config_envelope: ~azure.mgmt.appcontainers.models.AuthConfig + :param auth_config_envelope: Properties used to create a Container App AuthConfig. Is either a + model type or a IO type. Required. + :type auth_config_envelope: ~azure.mgmt.appcontainers.models.AuthConfig or IO + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: AuthConfig, or the result of cls(response) + :return: AuthConfig or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.AuthConfig - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.AuthConfig"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[_models.AuthConfig] - _json = self._serialize.body(auth_config_envelope, 'AuthConfig') + content_type = content_type or "application/json" + _json = None + _content = None + if isinstance(auth_config_envelope, (IO, bytes)): + _content = auth_config_envelope + else: + _json = self._serialize.body(auth_config_envelope, "AuthConfig") request = build_create_or_update_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, auth_config_name=auth_config_name, + subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, - template_url=self.create_or_update.metadata['url'], + content=_content, + template_url=self.create_or_update.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -258,64 +356,66 @@ async def create_or_update( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('AuthConfig', pipeline_response) + deserialized = self._deserialize("AuthConfig", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{authConfigName}"} # type: ignore - + create_or_update.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{authConfigName}"} # type: ignore @distributed_trace_async async def delete( # pylint: disable=inconsistent-return-statements - self, - resource_group_name: str, - container_app_name: str, - auth_config_name: str, - **kwargs: Any + self, resource_group_name: str, container_app_name: str, auth_config_name: str, **kwargs: Any ) -> None: """Delete a Container App AuthConfig. - Description for Delete a Container App AuthConfig. + Delete a Container App AuthConfig. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param auth_config_name: Name of the Container App AuthConfig. + :param auth_config_name: Name of the Container App AuthConfig. Required. :type auth_config_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: None, or the result of cls(response) + :return: None or the result of cls(response) :rtype: None - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] - request = build_delete_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, auth_config_name=auth_config_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.delete.metadata['url'], + template_url=self.delete.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200, 204]: @@ -326,5 +426,4 @@ async def delete( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, {}) - delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{authConfigName}"} # type: ignore - + delete.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{authConfigName}"} # type: ignore diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_container_apps_operations.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_container_apps_operations.py index 14252e0ca694..c914ab470ef1 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_container_apps_operations.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_container_apps_operations.py @@ -6,90 +6,110 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar, Union +from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from urllib.parse import parse_qs, urljoin, urlparse from azure.core.async_paging import AsyncItemPaged, AsyncList -from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import AsyncHttpResponse from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace from azure.core.tracing.decorator_async import distributed_trace_async +from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling from ... import models as _models from ..._vendor import _convert_request -from ...operations._container_apps_operations import build_create_or_update_request_initial, build_delete_request_initial, build_get_request, build_list_by_resource_group_request, build_list_by_subscription_request, build_list_custom_host_name_analysis_request, build_list_secrets_request, build_update_request_initial -T = TypeVar('T') +from ...operations._container_apps_operations import ( + build_create_or_update_request, + build_delete_request, + build_get_request, + build_list_by_resource_group_request, + build_list_by_subscription_request, + build_list_custom_host_name_analysis_request, + build_list_secrets_request, + build_update_request, +) + +T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] -class ContainerAppsOperations: - """ContainerAppsOperations async operations. - You should not instantiate this class directly. Instead, you should create a Client instance that - instantiates it for you and attaches it as an attribute. +class ContainerAppsOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. - :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.appcontainers.models - :param client: Client for service requests. - :param config: Configuration of service client. - :param serializer: An object model serializer. - :param deserializer: An object model deserializer. + Instead, you should access the following operations through + :class:`~azure.mgmt.appcontainers.aio.ContainerAppsAPIClient`'s + :attr:`container_apps` attribute. """ models = _models - def __init__(self, client, config, serializer, deserializer) -> None: - self._client = client - self._serialize = serializer - self._deserialize = deserializer - self._config = config + def __init__(self, *args, **kwargs) -> None: + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def list_by_subscription( - self, - **kwargs: Any - ) -> AsyncIterable["_models.ContainerAppCollection"]: + def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.ContainerApp"]: """Get the Container Apps in a given subscription. Get the Container Apps in a given subscription. :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of either ContainerAppCollection or the result of - cls(response) - :rtype: - ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.appcontainers.models.ContainerAppCollection] - :raises: ~azure.core.exceptions.HttpResponseError + :return: An iterator like instance of either ContainerApp or the result of cls(response) + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.appcontainers.models.ContainerApp] + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.ContainerAppCollection] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ContainerAppCollection"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + def prepare_request(next_link=None): if not next_link: - + request = build_list_by_subscription_request( subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_by_subscription.metadata['url'], + template_url=self.list_by_subscription.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore else: - - request = build_list_by_subscription_request( - subscription_id=self._config.subscription_id, - api_version=api_version, - template_url=next_link, - ) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore request.method = "GET" return request @@ -103,10 +123,8 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) response = pipeline_response.http_response @@ -117,60 +135,60 @@ async def get_next(next_link=None): return pipeline_response + return AsyncItemPaged(get_next, extract_data) - return AsyncItemPaged( - get_next, extract_data - ) - list_by_subscription.metadata = {'url': "/subscriptions/{subscriptionId}/providers/Microsoft.App/containerApps"} # type: ignore + list_by_subscription.metadata = {"url": "/subscriptions/{subscriptionId}/providers/Microsoft.App/containerApps"} # type: ignore @distributed_trace - def list_by_resource_group( - self, - resource_group_name: str, - **kwargs: Any - ) -> AsyncIterable["_models.ContainerAppCollection"]: + def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> AsyncIterable["_models.ContainerApp"]: """Get the Container Apps in a given resource group. Get the Container Apps in a given resource group. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of either ContainerAppCollection or the result of - cls(response) - :rtype: - ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.appcontainers.models.ContainerAppCollection] - :raises: ~azure.core.exceptions.HttpResponseError + :return: An iterator like instance of either ContainerApp or the result of cls(response) + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.appcontainers.models.ContainerApp] + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.ContainerAppCollection] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ContainerAppCollection"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + def prepare_request(next_link=None): if not next_link: - + request = build_list_by_resource_group_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_by_resource_group.metadata['url'], + template_url=self.list_by_resource_group.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore else: - - request = build_list_by_resource_group_request( - subscription_id=self._config.subscription_id, - resource_group_name=resource_group_name, - api_version=api_version, - template_url=next_link, - ) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore request.method = "GET" return request @@ -184,10 +202,8 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) response = pipeline_response.http_response @@ -198,56 +214,56 @@ async def get_next(next_link=None): return pipeline_response + return AsyncItemPaged(get_next, extract_data) - return AsyncItemPaged( - get_next, extract_data - ) - list_by_resource_group.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps"} # type: ignore + list_by_resource_group.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps"} # type: ignore @distributed_trace_async - async def get( - self, - resource_group_name: str, - container_app_name: str, - **kwargs: Any - ) -> "_models.ContainerApp": + async def get(self, resource_group_name: str, container_app_name: str, **kwargs: Any) -> _models.ContainerApp: """Get the properties of a Container App. Get the properties of a Container App. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: ContainerApp, or the result of cls(response) + :return: ContainerApp or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.ContainerApp - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ContainerApp"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + 404: lambda response: ResourceNotFoundError(response=response, error_format=ARMErrorFormat), } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.ContainerApp] - request = build_get_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get.metadata['url'], + template_url=self.get.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -255,89 +271,183 @@ async def get( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('ContainerApp', pipeline_response) + deserialized = self._deserialize("ContainerApp", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore - + get.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore async def _create_or_update_initial( self, resource_group_name: str, container_app_name: str, - container_app_envelope: "_models.ContainerApp", + container_app_envelope: Union[_models.ContainerApp, IO], **kwargs: Any - ) -> "_models.ContainerApp": - cls = kwargs.pop('cls', None) # type: ClsType["_models.ContainerApp"] + ) -> _models.ContainerApp: error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - _json = self._serialize.body(container_app_envelope, 'ContainerApp') + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ContainerApp] - request = build_create_or_update_request_initial( - subscription_id=self._config.subscription_id, + content_type = content_type or "application/json" + _json = None + _content = None + if isinstance(container_app_envelope, (IO, bytes)): + _content = container_app_envelope + else: + _json = self._serialize.body(container_app_envelope, "ContainerApp") + + request = build_create_or_update_request( resource_group_name=resource_group_name, container_app_name=container_app_name, + subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, - template_url=self._create_or_update_initial.metadata['url'], + content=_content, + template_url=self._create_or_update_initial.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200, 201]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if response.status_code == 200: - deserialized = self._deserialize('ContainerApp', pipeline_response) + deserialized = self._deserialize("ContainerApp", pipeline_response) if response.status_code == 201: - deserialized = self._deserialize('ContainerApp', pipeline_response) + deserialized = self._deserialize("ContainerApp", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore + _create_or_update_initial.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore + @overload + async def begin_create_or_update( + self, + resource_group_name: str, + container_app_name: str, + container_app_envelope: _models.ContainerApp, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> AsyncLROPoller[_models.ContainerApp]: + """Create or update a Container App. + + Create or update a Container App. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param container_app_name: Name of the Container App. Required. + :type container_app_name: str + :param container_app_envelope: Properties used to create a container app. Required. + :type container_app_envelope: ~azure.mgmt.appcontainers.models.ContainerApp + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for + this operation to not poll, or pass in your own initialized polling object for a personal + polling strategy. + :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no + Retry-After header is present. + :return: An instance of AsyncLROPoller that returns either ContainerApp or the result of + cls(response) + :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.appcontainers.models.ContainerApp] + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + async def begin_create_or_update( + self, + resource_group_name: str, + container_app_name: str, + container_app_envelope: IO, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> AsyncLROPoller[_models.ContainerApp]: + """Create or update a Container App. + + Create or update a Container App. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param container_app_name: Name of the Container App. Required. + :type container_app_name: str + :param container_app_envelope: Properties used to create a container app. Required. + :type container_app_envelope: IO + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for + this operation to not poll, or pass in your own initialized polling object for a personal + polling strategy. + :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no + Retry-After header is present. + :return: An instance of AsyncLROPoller that returns either ContainerApp or the result of + cls(response) + :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.appcontainers.models.ContainerApp] + :raises ~azure.core.exceptions.HttpResponseError: + """ @distributed_trace_async async def begin_create_or_update( self, resource_group_name: str, container_app_name: str, - container_app_envelope: "_models.ContainerApp", + container_app_envelope: Union[_models.ContainerApp, IO], **kwargs: Any - ) -> AsyncLROPoller["_models.ContainerApp"]: + ) -> AsyncLROPoller[_models.ContainerApp]: """Create or update a Container App. - Description for Create or update a Container App. + Create or update a Container App. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param container_app_envelope: Properties used to create a container app. - :type container_app_envelope: ~azure.mgmt.appcontainers.models.ContainerApp + :param container_app_envelope: Properties used to create a container app. Is either a model + type or a IO type. Required. + :type container_app_envelope: ~azure.mgmt.appcontainers.models.ContainerApp or IO + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for @@ -349,107 +459,111 @@ async def begin_create_or_update( :return: An instance of AsyncLROPoller that returns either ContainerApp or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.appcontainers.models.ContainerApp] - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - polling = kwargs.pop('polling', True) # type: Union[bool, AsyncPollingMethod] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ContainerApp"] - lro_delay = kwargs.pop( - 'polling_interval', - self._config.polling_interval - ) - cont_token = kwargs.pop('continuation_token', None) # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ContainerApp] + polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] + lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) + cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] if cont_token is None: - raw_result = await self._create_or_update_initial( + raw_result = await self._create_or_update_initial( # type: ignore resource_group_name=resource_group_name, container_app_name=container_app_name, container_app_envelope=container_app_envelope, api_version=api_version, content_type=content_type, - cls=lambda x,y,z: x, + cls=lambda x, y, z: x, + headers=_headers, + params=_params, **kwargs ) - kwargs.pop('error_map', None) + kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response - deserialized = self._deserialize('ContainerApp', pipeline_response) + deserialized = self._deserialize("ContainerApp", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - - if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs) - elif polling is False: polling_method = AsyncNoPolling() - else: polling_method = polling + if polling is True: + polling_method = cast(AsyncPollingMethod, AsyncARMPolling(lro_delay, **kwargs)) # type: AsyncPollingMethod + elif polling is False: + polling_method = cast(AsyncPollingMethod, AsyncNoPolling()) + else: + polling_method = polling if cont_token: return AsyncLROPoller.from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, - deserialization_callback=get_long_running_output + deserialization_callback=get_long_running_output, ) return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore + begin_create_or_update.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore async def _delete_initial( # pylint: disable=inconsistent-return-statements - self, - resource_group_name: str, - container_app_name: str, - **kwargs: Any + self, resource_group_name: str, container_app_name: str, **kwargs: Any ) -> None: - cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - - request = build_delete_request_initial( - subscription_id=self._config.subscription_id, + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] + + request = build_delete_request( resource_group_name=resource_group_name, container_app_name=container_app_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self._delete_initial.metadata['url'], + template_url=self._delete_initial.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200, 202, 204]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: return cls(pipeline_response, None, {}) - _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore - + _delete_initial.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore @distributed_trace_async - async def begin_delete( # pylint: disable=inconsistent-return-statements - self, - resource_group_name: str, - container_app_name: str, - **kwargs: Any + async def begin_delete( + self, resource_group_name: str, container_app_name: str, **kwargs: Any ) -> AsyncLROPoller[None]: """Delete a Container App. - Description for Delete a Container App. + Delete a Container App. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. @@ -461,98 +575,190 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements Retry-After header is present. :return: An instance of AsyncLROPoller that returns either None or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[None] - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - polling = kwargs.pop('polling', True) # type: Union[bool, AsyncPollingMethod] - cls = kwargs.pop('cls', None) # type: ClsType[None] - lro_delay = kwargs.pop( - 'polling_interval', - self._config.polling_interval - ) - cont_token = kwargs.pop('continuation_token', None) # type: Optional[str] + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] + polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] + lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) + cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] if cont_token is None: - raw_result = await self._delete_initial( + raw_result = await self._delete_initial( # type: ignore resource_group_name=resource_group_name, container_app_name=container_app_name, api_version=api_version, - cls=lambda x,y,z: x, + cls=lambda x, y, z: x, + headers=_headers, + params=_params, **kwargs ) - kwargs.pop('error_map', None) + kwargs.pop("error_map", None) - def get_long_running_output(pipeline_response): + def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, {}) - - if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs) - elif polling is False: polling_method = AsyncNoPolling() - else: polling_method = polling + if polling is True: + polling_method = cast(AsyncPollingMethod, AsyncARMPolling(lro_delay, **kwargs)) # type: AsyncPollingMethod + elif polling is False: + polling_method = cast(AsyncPollingMethod, AsyncNoPolling()) + else: + polling_method = polling if cont_token: return AsyncLROPoller.from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, - deserialization_callback=get_long_running_output + deserialization_callback=get_long_running_output, ) return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore + begin_delete.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore async def _update_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, container_app_name: str, - container_app_envelope: "_models.ContainerApp", + container_app_envelope: Union[_models.ContainerApp, IO], **kwargs: Any ) -> None: - cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - _json = self._serialize.body(container_app_envelope, 'ContainerApp') + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[None] - request = build_update_request_initial( - subscription_id=self._config.subscription_id, + content_type = content_type or "application/json" + _json = None + _content = None + if isinstance(container_app_envelope, (IO, bytes)): + _content = container_app_envelope + else: + _json = self._serialize.body(container_app_envelope, "ContainerApp") + + request = build_update_request( resource_group_name=resource_group_name, container_app_name=container_app_name, + subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, - template_url=self._update_initial.metadata['url'], + content=_content, + template_url=self._update_initial.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [202]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: return cls(pipeline_response, None, {}) - _update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore + _update_initial.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore + @overload + async def begin_update( + self, + resource_group_name: str, + container_app_name: str, + container_app_envelope: _models.ContainerApp, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> AsyncLROPoller[None]: + """Update properties of a Container App. + + Patches a Container App using JSON Merge Patch. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param container_app_name: Name of the Container App. Required. + :type container_app_name: str + :param container_app_envelope: Properties of a Container App that need to be updated. Required. + :type container_app_envelope: ~azure.mgmt.appcontainers.models.ContainerApp + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for + this operation to not poll, or pass in your own initialized polling object for a personal + polling strategy. + :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no + Retry-After header is present. + :return: An instance of AsyncLROPoller that returns either None or the result of cls(response) + :rtype: ~azure.core.polling.AsyncLROPoller[None] + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + async def begin_update( + self, + resource_group_name: str, + container_app_name: str, + container_app_envelope: IO, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> AsyncLROPoller[None]: + """Update properties of a Container App. + + Patches a Container App using JSON Merge Patch. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param container_app_name: Name of the Container App. Required. + :type container_app_name: str + :param container_app_envelope: Properties of a Container App that need to be updated. Required. + :type container_app_envelope: IO + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for + this operation to not poll, or pass in your own initialized polling object for a personal + polling strategy. + :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no + Retry-After header is present. + :return: An instance of AsyncLROPoller that returns either None or the result of cls(response) + :rtype: ~azure.core.polling.AsyncLROPoller[None] + :raises ~azure.core.exceptions.HttpResponseError: + """ @distributed_trace_async - async def begin_update( # pylint: disable=inconsistent-return-statements + async def begin_update( self, resource_group_name: str, container_app_name: str, - container_app_envelope: "_models.ContainerApp", + container_app_envelope: Union[_models.ContainerApp, IO], **kwargs: Any ) -> AsyncLROPoller[None]: """Update properties of a Container App. @@ -560,11 +766,16 @@ async def begin_update( # pylint: disable=inconsistent-return-statements Patches a Container App using JSON Merge Patch. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param container_app_envelope: Properties of a Container App that need to be updated. - :type container_app_envelope: ~azure.mgmt.appcontainers.models.ContainerApp + :param container_app_envelope: Properties of a Container App that need to be updated. Is either + a model type or a IO type. Required. + :type container_app_envelope: ~azure.mgmt.appcontainers.models.ContainerApp or IO + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for @@ -575,96 +786,103 @@ async def begin_update( # pylint: disable=inconsistent-return-statements Retry-After header is present. :return: An instance of AsyncLROPoller that returns either None or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[None] - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - polling = kwargs.pop('polling', True) # type: Union[bool, AsyncPollingMethod] - cls = kwargs.pop('cls', None) # type: ClsType[None] - lro_delay = kwargs.pop( - 'polling_interval', - self._config.polling_interval - ) - cont_token = kwargs.pop('continuation_token', None) # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[None] + polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] + lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) + cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] if cont_token is None: - raw_result = await self._update_initial( + raw_result = await self._update_initial( # type: ignore resource_group_name=resource_group_name, container_app_name=container_app_name, container_app_envelope=container_app_envelope, api_version=api_version, content_type=content_type, - cls=lambda x,y,z: x, + cls=lambda x, y, z: x, + headers=_headers, + params=_params, **kwargs ) - kwargs.pop('error_map', None) + kwargs.pop("error_map", None) - def get_long_running_output(pipeline_response): + def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, {}) - - if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs) - elif polling is False: polling_method = AsyncNoPolling() - else: polling_method = polling + if polling is True: + polling_method = cast(AsyncPollingMethod, AsyncARMPolling(lro_delay, **kwargs)) # type: AsyncPollingMethod + elif polling is False: + polling_method = cast(AsyncPollingMethod, AsyncNoPolling()) + else: + polling_method = polling if cont_token: return AsyncLROPoller.from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, - deserialization_callback=get_long_running_output + deserialization_callback=get_long_running_output, ) return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore + begin_update.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore @distributed_trace_async async def list_custom_host_name_analysis( - self, - resource_group_name: str, - container_app_name: str, - custom_hostname: Optional[str] = None, - **kwargs: Any - ) -> "_models.CustomHostnameAnalysisResult": + self, resource_group_name: str, container_app_name: str, custom_hostname: Optional[str] = None, **kwargs: Any + ) -> _models.CustomHostnameAnalysisResult: """Analyzes a custom hostname for a Container App. Analyzes a custom hostname for a Container App. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str :param custom_hostname: Custom hostname. Default value is None. :type custom_hostname: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: CustomHostnameAnalysisResult, or the result of cls(response) + :return: CustomHostnameAnalysisResult or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.CustomHostnameAnalysisResult - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.CustomHostnameAnalysisResult"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.CustomHostnameAnalysisResult] - request = build_list_custom_host_name_analysis_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, - api_version=api_version, + subscription_id=self._config.subscription_id, custom_hostname=custom_hostname, - template_url=self.list_custom_host_name_analysis.metadata['url'], + api_version=api_version, + template_url=self.list_custom_host_name_analysis.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -672,60 +890,63 @@ async def list_custom_host_name_analysis( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('CustomHostnameAnalysisResult', pipeline_response) + deserialized = self._deserialize("CustomHostnameAnalysisResult", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - list_custom_host_name_analysis.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/listCustomHostNameAnalysis"} # type: ignore - + list_custom_host_name_analysis.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/listCustomHostNameAnalysis"} # type: ignore @distributed_trace_async async def list_secrets( - self, - resource_group_name: str, - container_app_name: str, - **kwargs: Any - ) -> "_models.SecretsCollection": + self, resource_group_name: str, container_app_name: str, **kwargs: Any + ) -> _models.SecretsCollection: """List secrets for a container app. List secrets for a container app. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: SecretsCollection, or the result of cls(response) + :return: SecretsCollection or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.SecretsCollection - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.SecretsCollection"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.SecretsCollection] - request = build_list_secrets_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_secrets.metadata['url'], + template_url=self.list_secrets.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -733,12 +954,11 @@ async def list_secrets( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('SecretsCollection', pipeline_response) + deserialized = self._deserialize("SecretsCollection", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - list_secrets.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/listSecrets"} # type: ignore - + list_secrets.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/listSecrets"} # type: ignore diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_container_apps_revision_replicas_operations.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_container_apps_revision_replicas_operations.py index be675fe4c67a..b3d3fa7eb488 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_container_apps_revision_replicas_operations.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_container_apps_revision_replicas_operations.py @@ -8,93 +8,105 @@ # -------------------------------------------------------------------------- from typing import Any, Callable, Dict, Optional, TypeVar -from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import AsyncHttpResponse from azure.core.rest import HttpRequest from azure.core.tracing.decorator_async import distributed_trace_async +from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from ... import models as _models from ..._vendor import _convert_request -from ...operations._container_apps_revision_replicas_operations import build_get_replica_request, build_list_replicas_request -T = TypeVar('T') +from ...operations._container_apps_revision_replicas_operations import ( + build_get_replica_request, + build_list_replicas_request, +) + +T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] -class ContainerAppsRevisionReplicasOperations: - """ContainerAppsRevisionReplicasOperations async operations. - You should not instantiate this class directly. Instead, you should create a Client instance that - instantiates it for you and attaches it as an attribute. +class ContainerAppsRevisionReplicasOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. - :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.appcontainers.models - :param client: Client for service requests. - :param config: Configuration of service client. - :param serializer: An object model serializer. - :param deserializer: An object model deserializer. + Instead, you should access the following operations through + :class:`~azure.mgmt.appcontainers.aio.ContainerAppsAPIClient`'s + :attr:`container_apps_revision_replicas` attribute. """ models = _models - def __init__(self, client, config, serializer, deserializer) -> None: - self._client = client - self._serialize = serializer - self._deserialize = deserializer - self._config = config + def __init__(self, *args, **kwargs) -> None: + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async async def get_replica( - self, - resource_group_name: str, - container_app_name: str, - revision_name: str, - replica_name: str, - **kwargs: Any - ) -> "_models.Replica": + self, resource_group_name: str, container_app_name: str, revision_name: str, replica_name: str, **kwargs: Any + ) -> _models.Replica: """Get a replica for a Container App Revision. Get a replica for a Container App Revision. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param revision_name: Name of the Container App Revision. + :param revision_name: Name of the Container App Revision. Required. :type revision_name: str - :param replica_name: Name of the Container App Revision Replica. + :param replica_name: Name of the Container App Revision Replica. Required. :type replica_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: Replica, or the result of cls(response) + :return: Replica or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.Replica - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.Replica"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.Replica] - request = build_get_replica_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, revision_name=revision_name, replica_name=replica_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get_replica.metadata['url'], + template_url=self.get_replica.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -102,64 +114,66 @@ async def get_replica( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('Replica', pipeline_response) + deserialized = self._deserialize("Replica", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - get_replica.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/replicas/{replicaName}"} # type: ignore - + get_replica.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/replicas/{replicaName}"} # type: ignore @distributed_trace_async async def list_replicas( - self, - resource_group_name: str, - container_app_name: str, - revision_name: str, - **kwargs: Any - ) -> "_models.ReplicaCollection": + self, resource_group_name: str, container_app_name: str, revision_name: str, **kwargs: Any + ) -> _models.ReplicaCollection: """List replicas for a Container App Revision. List replicas for a Container App Revision. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param revision_name: Name of the Container App Revision. + :param revision_name: Name of the Container App Revision. Required. :type revision_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: ReplicaCollection, or the result of cls(response) + :return: ReplicaCollection or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.ReplicaCollection - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ReplicaCollection"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.ReplicaCollection] - request = build_list_replicas_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, revision_name=revision_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_replicas.metadata['url'], + template_url=self.list_replicas.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -167,12 +181,11 @@ async def list_replicas( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('ReplicaCollection', pipeline_response) + deserialized = self._deserialize("ReplicaCollection", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - list_replicas.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/replicas"} # type: ignore - + list_replicas.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/replicas"} # type: ignore diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_container_apps_revisions_operations.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_container_apps_revisions_operations.py index e89886bbb4aa..5b78642d2c07 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_container_apps_revisions_operations.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_container_apps_revisions_operations.py @@ -7,101 +7,116 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar +from urllib.parse import parse_qs, urljoin, urlparse from azure.core.async_paging import AsyncItemPaged, AsyncList -from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import AsyncHttpResponse from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace from azure.core.tracing.decorator_async import distributed_trace_async +from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from ... import models as _models from ..._vendor import _convert_request -from ...operations._container_apps_revisions_operations import build_activate_revision_request, build_deactivate_revision_request, build_get_revision_request, build_list_revisions_request, build_restart_revision_request -T = TypeVar('T') +from ...operations._container_apps_revisions_operations import ( + build_activate_revision_request, + build_deactivate_revision_request, + build_get_revision_request, + build_list_revisions_request, + build_restart_revision_request, +) + +T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] -class ContainerAppsRevisionsOperations: - """ContainerAppsRevisionsOperations async operations. - You should not instantiate this class directly. Instead, you should create a Client instance that - instantiates it for you and attaches it as an attribute. +class ContainerAppsRevisionsOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. - :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.appcontainers.models - :param client: Client for service requests. - :param config: Configuration of service client. - :param serializer: An object model serializer. - :param deserializer: An object model deserializer. + Instead, you should access the following operations through + :class:`~azure.mgmt.appcontainers.aio.ContainerAppsAPIClient`'s + :attr:`container_apps_revisions` attribute. """ models = _models - def __init__(self, client, config, serializer, deserializer) -> None: - self._client = client - self._serialize = serializer - self._deserialize = deserializer - self._config = config + def __init__(self, *args, **kwargs) -> None: + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def list_revisions( - self, - resource_group_name: str, - container_app_name: str, - filter: Optional[str] = None, - **kwargs: Any - ) -> AsyncIterable["_models.RevisionCollection"]: + self, resource_group_name: str, container_app_name: str, filter: Optional[str] = None, **kwargs: Any + ) -> AsyncIterable["_models.Revision"]: """Get the Revisions for a given Container App. Get the Revisions for a given Container App. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App for which Revisions are needed. + :param container_app_name: Name of the Container App for which Revisions are needed. Required. :type container_app_name: str :param filter: The filter to apply on the operation. Default value is None. :type filter: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of either RevisionCollection or the result of cls(response) - :rtype: - ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.appcontainers.models.RevisionCollection] - :raises: ~azure.core.exceptions.HttpResponseError + :return: An iterator like instance of either Revision or the result of cls(response) + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.appcontainers.models.Revision] + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.RevisionCollection] - cls = kwargs.pop('cls', None) # type: ClsType["_models.RevisionCollection"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + def prepare_request(next_link=None): if not next_link: - + request = build_list_revisions_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, - api_version=api_version, + subscription_id=self._config.subscription_id, filter=filter, - template_url=self.list_revisions.metadata['url'], + api_version=api_version, + template_url=self.list_revisions.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore else: - - request = build_list_revisions_request( - subscription_id=self._config.subscription_id, - resource_group_name=resource_group_name, - container_app_name=container_app_name, - api_version=api_version, - filter=filter, - template_url=next_link, - ) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore request.method = "GET" return request @@ -115,10 +130,8 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) response = pipeline_response.http_response @@ -129,60 +142,61 @@ async def get_next(next_link=None): return pipeline_response + return AsyncItemPaged(get_next, extract_data) - return AsyncItemPaged( - get_next, extract_data - ) - list_revisions.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions"} # type: ignore + list_revisions.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions"} # type: ignore @distributed_trace_async async def get_revision( - self, - resource_group_name: str, - container_app_name: str, - revision_name: str, - **kwargs: Any - ) -> "_models.Revision": + self, resource_group_name: str, container_app_name: str, revision_name: str, **kwargs: Any + ) -> _models.Revision: """Get a revision of a Container App. Get a revision of a Container App. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param revision_name: Name of the Container App Revision. + :param revision_name: Name of the Container App Revision. Required. :type revision_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: Revision, or the result of cls(response) + :return: Revision or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.Revision - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.Revision"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.Revision] - request = build_get_revision_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, revision_name=revision_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get_revision.metadata['url'], + template_url=self.get_revision.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -190,64 +204,66 @@ async def get_revision( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('Revision', pipeline_response) + deserialized = self._deserialize("Revision", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - get_revision.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}"} # type: ignore - + get_revision.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}"} # type: ignore @distributed_trace_async async def activate_revision( # pylint: disable=inconsistent-return-statements - self, - resource_group_name: str, - container_app_name: str, - revision_name: str, - **kwargs: Any + self, resource_group_name: str, container_app_name: str, revision_name: str, **kwargs: Any ) -> None: """Activates a revision for a Container App. Activates a revision for a Container App. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param revision_name: Name of the Container App Revision. + :param revision_name: Name of the Container App Revision. Required. :type revision_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: None, or the result of cls(response) + :return: None or the result of cls(response) :rtype: None - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] - request = build_activate_revision_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, revision_name=revision_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.activate_revision.metadata['url'], + template_url=self.activate_revision.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -258,57 +274,59 @@ async def activate_revision( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, {}) - activate_revision.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/activate"} # type: ignore - + activate_revision.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/activate"} # type: ignore @distributed_trace_async async def deactivate_revision( # pylint: disable=inconsistent-return-statements - self, - resource_group_name: str, - container_app_name: str, - revision_name: str, - **kwargs: Any + self, resource_group_name: str, container_app_name: str, revision_name: str, **kwargs: Any ) -> None: """Deactivates a revision for a Container App. Deactivates a revision for a Container App. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param revision_name: Name of the Container App Revision. + :param revision_name: Name of the Container App Revision. Required. :type revision_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: None, or the result of cls(response) + :return: None or the result of cls(response) :rtype: None - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] - request = build_deactivate_revision_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, revision_name=revision_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.deactivate_revision.metadata['url'], + template_url=self.deactivate_revision.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -319,57 +337,59 @@ async def deactivate_revision( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, {}) - deactivate_revision.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/deactivate"} # type: ignore - + deactivate_revision.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/deactivate"} # type: ignore @distributed_trace_async async def restart_revision( # pylint: disable=inconsistent-return-statements - self, - resource_group_name: str, - container_app_name: str, - revision_name: str, - **kwargs: Any + self, resource_group_name: str, container_app_name: str, revision_name: str, **kwargs: Any ) -> None: """Restarts a revision for a Container App. Restarts a revision for a Container App. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param revision_name: Name of the Container App Revision. + :param revision_name: Name of the Container App Revision. Required. :type revision_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: None, or the result of cls(response) + :return: None or the result of cls(response) :rtype: None - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] - request = build_restart_revision_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, revision_name=revision_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.restart_revision.metadata['url'], + template_url=self.restart_revision.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -380,5 +400,4 @@ async def restart_revision( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, {}) - restart_revision.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/restart"} # type: ignore - + restart_revision.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/restart"} # type: ignore diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_container_apps_source_controls_operations.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_container_apps_source_controls_operations.py index bbc66a490a87..e507ed394a80 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_container_apps_source_controls_operations.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_container_apps_source_controls_operations.py @@ -6,100 +6,115 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar, Union +from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from urllib.parse import parse_qs, urljoin, urlparse from azure.core.async_paging import AsyncItemPaged, AsyncList -from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import AsyncHttpResponse from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace from azure.core.tracing.decorator_async import distributed_trace_async +from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling from ... import models as _models from ..._vendor import _convert_request -from ...operations._container_apps_source_controls_operations import build_create_or_update_request_initial, build_delete_request_initial, build_get_request, build_list_by_container_app_request -T = TypeVar('T') +from ...operations._container_apps_source_controls_operations import ( + build_create_or_update_request, + build_delete_request, + build_get_request, + build_list_by_container_app_request, +) + +T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] -class ContainerAppsSourceControlsOperations: - """ContainerAppsSourceControlsOperations async operations. - You should not instantiate this class directly. Instead, you should create a Client instance that - instantiates it for you and attaches it as an attribute. +class ContainerAppsSourceControlsOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. - :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.appcontainers.models - :param client: Client for service requests. - :param config: Configuration of service client. - :param serializer: An object model serializer. - :param deserializer: An object model deserializer. + Instead, you should access the following operations through + :class:`~azure.mgmt.appcontainers.aio.ContainerAppsAPIClient`'s + :attr:`container_apps_source_controls` attribute. """ models = _models - def __init__(self, client, config, serializer, deserializer) -> None: - self._client = client - self._serialize = serializer - self._deserialize = deserializer - self._config = config + def __init__(self, *args, **kwargs) -> None: + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def list_by_container_app( - self, - resource_group_name: str, - container_app_name: str, - **kwargs: Any - ) -> AsyncIterable["_models.SourceControlCollection"]: + self, resource_group_name: str, container_app_name: str, **kwargs: Any + ) -> AsyncIterable["_models.SourceControl"]: """Get the Container App SourceControls in a given resource group. Get the Container App SourceControls in a given resource group. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of either SourceControlCollection or the result of - cls(response) - :rtype: - ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.appcontainers.models.SourceControlCollection] - :raises: ~azure.core.exceptions.HttpResponseError + :return: An iterator like instance of either SourceControl or the result of cls(response) + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.appcontainers.models.SourceControl] + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.SourceControlCollection] - cls = kwargs.pop('cls', None) # type: ClsType["_models.SourceControlCollection"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + def prepare_request(next_link=None): if not next_link: - + request = build_list_by_container_app_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_by_container_app.metadata['url'], + template_url=self.list_by_container_app.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore else: - - request = build_list_by_container_app_request( - subscription_id=self._config.subscription_id, - resource_group_name=resource_group_name, - container_app_name=container_app_name, - api_version=api_version, - template_url=next_link, - ) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore request.method = "GET" return request @@ -113,10 +128,8 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) response = pipeline_response.http_response @@ -127,60 +140,61 @@ async def get_next(next_link=None): return pipeline_response + return AsyncItemPaged(get_next, extract_data) - return AsyncItemPaged( - get_next, extract_data - ) - list_by_container_app.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols"} # type: ignore + list_by_container_app.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols"} # type: ignore @distributed_trace_async async def get( - self, - resource_group_name: str, - container_app_name: str, - source_control_name: str, - **kwargs: Any - ) -> "_models.SourceControl": + self, resource_group_name: str, container_app_name: str, source_control_name: str, **kwargs: Any + ) -> _models.SourceControl: """Get a SourceControl of a Container App. Get a SourceControl of a Container App. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param source_control_name: Name of the Container App SourceControl. + :param source_control_name: Name of the Container App SourceControl. Required. :type source_control_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: SourceControl, or the result of cls(response) + :return: SourceControl or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.SourceControl - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.SourceControl"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.SourceControl] - request = build_get_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, source_control_name=source_control_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get.metadata['url'], + template_url=self.get.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -188,94 +202,114 @@ async def get( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('SourceControl', pipeline_response) + deserialized = self._deserialize("SourceControl", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{sourceControlName}"} # type: ignore - + get.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{sourceControlName}"} # type: ignore async def _create_or_update_initial( self, resource_group_name: str, container_app_name: str, source_control_name: str, - source_control_envelope: "_models.SourceControl", + source_control_envelope: Union[_models.SourceControl, IO], **kwargs: Any - ) -> "_models.SourceControl": - cls = kwargs.pop('cls', None) # type: ClsType["_models.SourceControl"] + ) -> _models.SourceControl: error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - _json = self._serialize.body(source_control_envelope, 'SourceControl') + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[_models.SourceControl] - request = build_create_or_update_request_initial( - subscription_id=self._config.subscription_id, + content_type = content_type or "application/json" + _json = None + _content = None + if isinstance(source_control_envelope, (IO, bytes)): + _content = source_control_envelope + else: + _json = self._serialize.body(source_control_envelope, "SourceControl") + + request = build_create_or_update_request( resource_group_name=resource_group_name, container_app_name=container_app_name, source_control_name=source_control_name, + subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, - template_url=self._create_or_update_initial.metadata['url'], + content=_content, + template_url=self._create_or_update_initial.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response - if response.status_code not in [200, 202]: + if response.status_code not in [200, 201]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if response.status_code == 200: - deserialized = self._deserialize('SourceControl', pipeline_response) + deserialized = self._deserialize("SourceControl", pipeline_response) - if response.status_code == 202: - deserialized = self._deserialize('SourceControl', pipeline_response) + if response.status_code == 201: + deserialized = self._deserialize("SourceControl", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{sourceControlName}"} # type: ignore + _create_or_update_initial.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{sourceControlName}"} # type: ignore - - @distributed_trace_async + @overload async def begin_create_or_update( self, resource_group_name: str, container_app_name: str, source_control_name: str, - source_control_envelope: "_models.SourceControl", + source_control_envelope: _models.SourceControl, + *, + content_type: str = "application/json", **kwargs: Any - ) -> AsyncLROPoller["_models.SourceControl"]: + ) -> AsyncLROPoller[_models.SourceControl]: """Create or update the SourceControl for a Container App. - Description for Create or update the SourceControl for a Container App. + Create or update the SourceControl for a Container App. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param source_control_name: Name of the Container App SourceControl. + :param source_control_name: Name of the Container App SourceControl. Required. :type source_control_name: str :param source_control_envelope: Properties used to create a Container App SourceControl. + Required. :type source_control_envelope: ~azure.mgmt.appcontainers.models.SourceControl + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for @@ -287,113 +321,197 @@ async def begin_create_or_update( :return: An instance of AsyncLROPoller that returns either SourceControl or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.appcontainers.models.SourceControl] - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - polling = kwargs.pop('polling', True) # type: Union[bool, AsyncPollingMethod] - cls = kwargs.pop('cls', None) # type: ClsType["_models.SourceControl"] - lro_delay = kwargs.pop( - 'polling_interval', - self._config.polling_interval - ) - cont_token = kwargs.pop('continuation_token', None) # type: Optional[str] + + @overload + async def begin_create_or_update( + self, + resource_group_name: str, + container_app_name: str, + source_control_name: str, + source_control_envelope: IO, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> AsyncLROPoller[_models.SourceControl]: + """Create or update the SourceControl for a Container App. + + Create or update the SourceControl for a Container App. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param container_app_name: Name of the Container App. Required. + :type container_app_name: str + :param source_control_name: Name of the Container App SourceControl. Required. + :type source_control_name: str + :param source_control_envelope: Properties used to create a Container App SourceControl. + Required. + :type source_control_envelope: IO + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for + this operation to not poll, or pass in your own initialized polling object for a personal + polling strategy. + :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no + Retry-After header is present. + :return: An instance of AsyncLROPoller that returns either SourceControl or the result of + cls(response) + :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.appcontainers.models.SourceControl] + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @distributed_trace_async + async def begin_create_or_update( + self, + resource_group_name: str, + container_app_name: str, + source_control_name: str, + source_control_envelope: Union[_models.SourceControl, IO], + **kwargs: Any + ) -> AsyncLROPoller[_models.SourceControl]: + """Create or update the SourceControl for a Container App. + + Create or update the SourceControl for a Container App. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param container_app_name: Name of the Container App. Required. + :type container_app_name: str + :param source_control_name: Name of the Container App SourceControl. Required. + :type source_control_name: str + :param source_control_envelope: Properties used to create a Container App SourceControl. Is + either a model type or a IO type. Required. + :type source_control_envelope: ~azure.mgmt.appcontainers.models.SourceControl or IO + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for + this operation to not poll, or pass in your own initialized polling object for a personal + polling strategy. + :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no + Retry-After header is present. + :return: An instance of AsyncLROPoller that returns either SourceControl or the result of + cls(response) + :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.appcontainers.models.SourceControl] + :raises ~azure.core.exceptions.HttpResponseError: + """ + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[_models.SourceControl] + polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] + lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) + cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] if cont_token is None: - raw_result = await self._create_or_update_initial( + raw_result = await self._create_or_update_initial( # type: ignore resource_group_name=resource_group_name, container_app_name=container_app_name, source_control_name=source_control_name, source_control_envelope=source_control_envelope, api_version=api_version, content_type=content_type, - cls=lambda x,y,z: x, + cls=lambda x, y, z: x, + headers=_headers, + params=_params, **kwargs ) - kwargs.pop('error_map', None) + kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response - deserialized = self._deserialize('SourceControl', pipeline_response) + deserialized = self._deserialize("SourceControl", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - - if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs) - elif polling is False: polling_method = AsyncNoPolling() - else: polling_method = polling + if polling is True: + polling_method = cast(AsyncPollingMethod, AsyncARMPolling(lro_delay, **kwargs)) # type: AsyncPollingMethod + elif polling is False: + polling_method = cast(AsyncPollingMethod, AsyncNoPolling()) + else: + polling_method = polling if cont_token: return AsyncLROPoller.from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, - deserialization_callback=get_long_running_output + deserialization_callback=get_long_running_output, ) return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{sourceControlName}"} # type: ignore + begin_create_or_update.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{sourceControlName}"} # type: ignore async def _delete_initial( # pylint: disable=inconsistent-return-statements - self, - resource_group_name: str, - container_app_name: str, - source_control_name: str, - **kwargs: Any + self, resource_group_name: str, container_app_name: str, source_control_name: str, **kwargs: Any ) -> None: - cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - - request = build_delete_request_initial( - subscription_id=self._config.subscription_id, + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] + + request = build_delete_request( resource_group_name=resource_group_name, container_app_name=container_app_name, source_control_name=source_control_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self._delete_initial.metadata['url'], + template_url=self._delete_initial.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200, 202, 204]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: return cls(pipeline_response, None, {}) - _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{sourceControlName}"} # type: ignore - + _delete_initial.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{sourceControlName}"} # type: ignore @distributed_trace_async - async def begin_delete( # pylint: disable=inconsistent-return-statements - self, - resource_group_name: str, - container_app_name: str, - source_control_name: str, - **kwargs: Any + async def begin_delete( + self, resource_group_name: str, container_app_name: str, source_control_name: str, **kwargs: Any ) -> AsyncLROPoller[None]: """Delete a Container App SourceControl. - Description for Delete a Container App SourceControl. + Delete a Container App SourceControl. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param source_control_name: Name of the Container App SourceControl. + :param source_control_name: Name of the Container App SourceControl. Required. :type source_control_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. @@ -405,42 +523,46 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements Retry-After header is present. :return: An instance of AsyncLROPoller that returns either None or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[None] - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - polling = kwargs.pop('polling', True) # type: Union[bool, AsyncPollingMethod] - cls = kwargs.pop('cls', None) # type: ClsType[None] - lro_delay = kwargs.pop( - 'polling_interval', - self._config.polling_interval - ) - cont_token = kwargs.pop('continuation_token', None) # type: Optional[str] + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] + polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] + lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) + cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] if cont_token is None: - raw_result = await self._delete_initial( + raw_result = await self._delete_initial( # type: ignore resource_group_name=resource_group_name, container_app_name=container_app_name, source_control_name=source_control_name, api_version=api_version, - cls=lambda x,y,z: x, + cls=lambda x, y, z: x, + headers=_headers, + params=_params, **kwargs ) - kwargs.pop('error_map', None) + kwargs.pop("error_map", None) - def get_long_running_output(pipeline_response): + def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, {}) - - if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs) - elif polling is False: polling_method = AsyncNoPolling() - else: polling_method = polling + if polling is True: + polling_method = cast(AsyncPollingMethod, AsyncARMPolling(lro_delay, **kwargs)) # type: AsyncPollingMethod + elif polling is False: + polling_method = cast(AsyncPollingMethod, AsyncNoPolling()) + else: + polling_method = polling if cont_token: return AsyncLROPoller.from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, - deserialization_callback=get_long_running_output + deserialization_callback=get_long_running_output, ) return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{sourceControlName}"} # type: ignore + begin_delete.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{sourceControlName}"} # type: ignore diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_dapr_components_operations.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_dapr_components_operations.py index 549c8275319c..4f776236c2de 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_dapr_components_operations.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_dapr_components_operations.py @@ -6,98 +6,114 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar +from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload +from urllib.parse import parse_qs, urljoin, urlparse from azure.core.async_paging import AsyncItemPaged, AsyncList -from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import AsyncHttpResponse from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace from azure.core.tracing.decorator_async import distributed_trace_async +from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from ... import models as _models from ..._vendor import _convert_request -from ...operations._dapr_components_operations import build_create_or_update_request, build_delete_request, build_get_request, build_list_request, build_list_secrets_request -T = TypeVar('T') +from ...operations._dapr_components_operations import ( + build_create_or_update_request, + build_delete_request, + build_get_request, + build_list_request, + build_list_secrets_request, +) + +T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] -class DaprComponentsOperations: - """DaprComponentsOperations async operations. - You should not instantiate this class directly. Instead, you should create a Client instance that - instantiates it for you and attaches it as an attribute. +class DaprComponentsOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. - :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.appcontainers.models - :param client: Client for service requests. - :param config: Configuration of service client. - :param serializer: An object model serializer. - :param deserializer: An object model deserializer. + Instead, you should access the following operations through + :class:`~azure.mgmt.appcontainers.aio.ContainerAppsAPIClient`'s + :attr:`dapr_components` attribute. """ models = _models - def __init__(self, client, config, serializer, deserializer) -> None: - self._client = client - self._serialize = serializer - self._deserialize = deserializer - self._config = config + def __init__(self, *args, **kwargs) -> None: + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def list( - self, - resource_group_name: str, - environment_name: str, - **kwargs: Any - ) -> AsyncIterable["_models.DaprComponentsCollection"]: + self, resource_group_name: str, environment_name: str, **kwargs: Any + ) -> AsyncIterable["_models.DaprComponent"]: """Get the Dapr Components for a managed environment. Get the Dapr Components for a managed environment. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Managed Environment. + :param environment_name: Name of the Managed Environment. Required. :type environment_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of either DaprComponentsCollection or the result of - cls(response) - :rtype: - ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.appcontainers.models.DaprComponentsCollection] - :raises: ~azure.core.exceptions.HttpResponseError + :return: An iterator like instance of either DaprComponent or the result of cls(response) + :rtype: ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.appcontainers.models.DaprComponent] + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.DaprComponentsCollection] - cls = kwargs.pop('cls', None) # type: ClsType["_models.DaprComponentsCollection"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + def prepare_request(next_link=None): if not next_link: - + request = build_list_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list.metadata['url'], + template_url=self.list.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore else: - - request = build_list_request( - subscription_id=self._config.subscription_id, - resource_group_name=resource_group_name, - environment_name=environment_name, - api_version=api_version, - template_url=next_link, - ) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore request.method = "GET" return request @@ -111,10 +127,8 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) response = pipeline_response.http_response @@ -125,60 +139,61 @@ async def get_next(next_link=None): return pipeline_response + return AsyncItemPaged(get_next, extract_data) - return AsyncItemPaged( - get_next, extract_data - ) - list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents"} # type: ignore + list.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents"} # type: ignore @distributed_trace_async async def get( - self, - resource_group_name: str, - environment_name: str, - component_name: str, - **kwargs: Any - ) -> "_models.DaprComponent": + self, resource_group_name: str, environment_name: str, component_name: str, **kwargs: Any + ) -> _models.DaprComponent: """Get a dapr component. Get a dapr component. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Managed Environment. + :param environment_name: Name of the Managed Environment. Required. :type environment_name: str - :param component_name: Name of the Dapr Component. + :param component_name: Name of the Dapr Component. Required. :type component_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: DaprComponent, or the result of cls(response) + :return: DaprComponent or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.DaprComponent - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.DaprComponent"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.DaprComponent] - request = build_get_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, component_name=component_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get.metadata['url'], + template_url=self.get.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -186,15 +201,80 @@ async def get( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('DaprComponent', pipeline_response) + deserialized = self._deserialize("DaprComponent", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}"} # type: ignore + get.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}"} # type: ignore + + @overload + async def create_or_update( + self, + resource_group_name: str, + environment_name: str, + component_name: str, + dapr_component_envelope: _models.DaprComponent, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> _models.DaprComponent: + """Creates or updates a Dapr Component. + + Creates or updates a Dapr Component in a Managed Environment. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Managed Environment. Required. + :type environment_name: str + :param component_name: Name of the Dapr Component. Required. + :type component_name: str + :param dapr_component_envelope: Configuration details of the Dapr Component. Required. + :type dapr_component_envelope: ~azure.mgmt.appcontainers.models.DaprComponent + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: DaprComponent or the result of cls(response) + :rtype: ~azure.mgmt.appcontainers.models.DaprComponent + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + async def create_or_update( + self, + resource_group_name: str, + environment_name: str, + component_name: str, + dapr_component_envelope: IO, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> _models.DaprComponent: + """Creates or updates a Dapr Component. + Creates or updates a Dapr Component in a Managed Environment. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Managed Environment. Required. + :type environment_name: str + :param component_name: Name of the Dapr Component. Required. + :type component_name: str + :param dapr_component_envelope: Configuration details of the Dapr Component. Required. + :type dapr_component_envelope: IO + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: DaprComponent or the result of cls(response) + :rtype: ~azure.mgmt.appcontainers.models.DaprComponent + :raises ~azure.core.exceptions.HttpResponseError: + """ @distributed_trace_async async def create_or_update( @@ -202,55 +282,74 @@ async def create_or_update( resource_group_name: str, environment_name: str, component_name: str, - dapr_component_envelope: "_models.DaprComponent", + dapr_component_envelope: Union[_models.DaprComponent, IO], **kwargs: Any - ) -> "_models.DaprComponent": + ) -> _models.DaprComponent: """Creates or updates a Dapr Component. Creates or updates a Dapr Component in a Managed Environment. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Managed Environment. + :param environment_name: Name of the Managed Environment. Required. :type environment_name: str - :param component_name: Name of the Dapr Component. + :param component_name: Name of the Dapr Component. Required. :type component_name: str - :param dapr_component_envelope: Configuration details of the Dapr Component. - :type dapr_component_envelope: ~azure.mgmt.appcontainers.models.DaprComponent + :param dapr_component_envelope: Configuration details of the Dapr Component. Is either a model + type or a IO type. Required. + :type dapr_component_envelope: ~azure.mgmt.appcontainers.models.DaprComponent or IO + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: DaprComponent, or the result of cls(response) + :return: DaprComponent or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.DaprComponent - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.DaprComponent"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DaprComponent] - _json = self._serialize.body(dapr_component_envelope, 'DaprComponent') + content_type = content_type or "application/json" + _json = None + _content = None + if isinstance(dapr_component_envelope, (IO, bytes)): + _content = dapr_component_envelope + else: + _json = self._serialize.body(dapr_component_envelope, "DaprComponent") request = build_create_or_update_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, component_name=component_name, + subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, - template_url=self.create_or_update.metadata['url'], + content=_content, + template_url=self.create_or_update.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -258,64 +357,66 @@ async def create_or_update( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('DaprComponent', pipeline_response) + deserialized = self._deserialize("DaprComponent", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}"} # type: ignore - + create_or_update.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}"} # type: ignore @distributed_trace_async async def delete( # pylint: disable=inconsistent-return-statements - self, - resource_group_name: str, - environment_name: str, - component_name: str, - **kwargs: Any + self, resource_group_name: str, environment_name: str, component_name: str, **kwargs: Any ) -> None: """Delete a Dapr Component. Delete a Dapr Component from a Managed Environment. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Managed Environment. + :param environment_name: Name of the Managed Environment. Required. :type environment_name: str - :param component_name: Name of the Dapr Component. + :param component_name: Name of the Dapr Component. Required. :type component_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: None, or the result of cls(response) + :return: None or the result of cls(response) :rtype: None - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] - request = build_delete_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, component_name=component_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.delete.metadata['url'], + template_url=self.delete.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200, 204]: @@ -326,57 +427,59 @@ async def delete( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, {}) - delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}"} # type: ignore - + delete.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}"} # type: ignore @distributed_trace_async async def list_secrets( - self, - resource_group_name: str, - environment_name: str, - component_name: str, - **kwargs: Any - ) -> "_models.DaprSecretsCollection": + self, resource_group_name: str, environment_name: str, component_name: str, **kwargs: Any + ) -> _models.DaprSecretsCollection: """List secrets for a dapr component. List secrets for a dapr component. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Managed Environment. + :param environment_name: Name of the Managed Environment. Required. :type environment_name: str - :param component_name: Name of the Dapr Component. + :param component_name: Name of the Dapr Component. Required. :type component_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: DaprSecretsCollection, or the result of cls(response) + :return: DaprSecretsCollection or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.DaprSecretsCollection - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.DaprSecretsCollection"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.DaprSecretsCollection] - request = build_list_secrets_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, component_name=component_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_secrets.metadata['url'], + template_url=self.list_secrets.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -384,12 +487,11 @@ async def list_secrets( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('DaprSecretsCollection', pipeline_response) + deserialized = self._deserialize("DaprSecretsCollection", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - list_secrets.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}/listSecrets"} # type: ignore - + list_secrets.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}/listSecrets"} # type: ignore diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_managed_environments_operations.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_managed_environments_operations.py index 04589e9efe70..90a9d30257ff 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_managed_environments_operations.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_managed_environments_operations.py @@ -6,90 +6,109 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar, Union +from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from urllib.parse import parse_qs, urljoin, urlparse from azure.core.async_paging import AsyncItemPaged, AsyncList -from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import AsyncHttpResponse from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace from azure.core.tracing.decorator_async import distributed_trace_async +from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from azure.mgmt.core.polling.async_arm_polling import AsyncARMPolling from ... import models as _models from ..._vendor import _convert_request -from ...operations._managed_environments_operations import build_create_or_update_request_initial, build_delete_request_initial, build_get_request, build_list_by_resource_group_request, build_list_by_subscription_request, build_update_request_initial -T = TypeVar('T') +from ...operations._managed_environments_operations import ( + build_create_or_update_request, + build_delete_request, + build_get_request, + build_list_by_resource_group_request, + build_list_by_subscription_request, + build_update_request, +) + +T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] -class ManagedEnvironmentsOperations: - """ManagedEnvironmentsOperations async operations. - You should not instantiate this class directly. Instead, you should create a Client instance that - instantiates it for you and attaches it as an attribute. +class ManagedEnvironmentsOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. - :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.appcontainers.models - :param client: Client for service requests. - :param config: Configuration of service client. - :param serializer: An object model serializer. - :param deserializer: An object model deserializer. + Instead, you should access the following operations through + :class:`~azure.mgmt.appcontainers.aio.ContainerAppsAPIClient`'s + :attr:`managed_environments` attribute. """ models = _models - def __init__(self, client, config, serializer, deserializer) -> None: - self._client = client - self._serialize = serializer - self._deserialize = deserializer - self._config = config + def __init__(self, *args, **kwargs) -> None: + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def list_by_subscription( - self, - **kwargs: Any - ) -> AsyncIterable["_models.ManagedEnvironmentsCollection"]: + def list_by_subscription(self, **kwargs: Any) -> AsyncIterable["_models.ManagedEnvironment"]: """Get all Environments for a subscription. Get all Managed Environments for a subscription. :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of either ManagedEnvironmentsCollection or the result of - cls(response) + :return: An iterator like instance of either ManagedEnvironment or the result of cls(response) :rtype: - ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.appcontainers.models.ManagedEnvironmentsCollection] - :raises: ~azure.core.exceptions.HttpResponseError + ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.appcontainers.models.ManagedEnvironment] + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.ManagedEnvironmentsCollection] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironmentsCollection"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + def prepare_request(next_link=None): if not next_link: - + request = build_list_by_subscription_request( subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_by_subscription.metadata['url'], + template_url=self.list_by_subscription.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore else: - - request = build_list_by_subscription_request( - subscription_id=self._config.subscription_id, - api_version=api_version, - template_url=next_link, - ) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore request.method = "GET" return request @@ -103,10 +122,8 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) response = pipeline_response.http_response @@ -117,60 +134,63 @@ async def get_next(next_link=None): return pipeline_response + return AsyncItemPaged(get_next, extract_data) - return AsyncItemPaged( - get_next, extract_data - ) - list_by_subscription.metadata = {'url': "/subscriptions/{subscriptionId}/providers/Microsoft.App/managedEnvironments"} # type: ignore + list_by_subscription.metadata = {"url": "/subscriptions/{subscriptionId}/providers/Microsoft.App/managedEnvironments"} # type: ignore @distributed_trace def list_by_resource_group( - self, - resource_group_name: str, - **kwargs: Any - ) -> AsyncIterable["_models.ManagedEnvironmentsCollection"]: + self, resource_group_name: str, **kwargs: Any + ) -> AsyncIterable["_models.ManagedEnvironment"]: """Get all the Environments in a resource group. Get all the Managed Environments in a resource group. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of either ManagedEnvironmentsCollection or the result of - cls(response) + :return: An iterator like instance of either ManagedEnvironment or the result of cls(response) :rtype: - ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.appcontainers.models.ManagedEnvironmentsCollection] - :raises: ~azure.core.exceptions.HttpResponseError + ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.appcontainers.models.ManagedEnvironment] + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.ManagedEnvironmentsCollection] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironmentsCollection"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + def prepare_request(next_link=None): if not next_link: - + request = build_list_by_resource_group_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_by_resource_group.metadata['url'], + template_url=self.list_by_resource_group.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore else: - - request = build_list_by_resource_group_request( - subscription_id=self._config.subscription_id, - resource_group_name=resource_group_name, - api_version=api_version, - template_url=next_link, - ) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore request.method = "GET" return request @@ -184,10 +204,8 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) response = pipeline_response.http_response @@ -198,56 +216,56 @@ async def get_next(next_link=None): return pipeline_response + return AsyncItemPaged(get_next, extract_data) - return AsyncItemPaged( - get_next, extract_data - ) - list_by_resource_group.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments"} # type: ignore + list_by_resource_group.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments"} # type: ignore @distributed_trace_async - async def get( - self, - resource_group_name: str, - environment_name: str, - **kwargs: Any - ) -> "_models.ManagedEnvironment": + async def get(self, resource_group_name: str, environment_name: str, **kwargs: Any) -> _models.ManagedEnvironment: """Get the properties of a Managed Environment. Get the properties of a Managed Environment used to host container apps. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Environment. + :param environment_name: Name of the Environment. Required. :type environment_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: ManagedEnvironment, or the result of cls(response) + :return: ManagedEnvironment or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.ManagedEnvironment - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironment"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.ManagedEnvironment] - request = build_get_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get.metadata['url'], + template_url=self.get.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -255,89 +273,183 @@ async def get( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('ManagedEnvironment', pipeline_response) + deserialized = self._deserialize("ManagedEnvironment", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore - + get.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore async def _create_or_update_initial( self, resource_group_name: str, environment_name: str, - environment_envelope: "_models.ManagedEnvironment", + environment_envelope: Union[_models.ManagedEnvironment, IO], **kwargs: Any - ) -> "_models.ManagedEnvironment": - cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironment"] + ) -> _models.ManagedEnvironment: error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - _json = self._serialize.body(environment_envelope, 'ManagedEnvironment') + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ManagedEnvironment] - request = build_create_or_update_request_initial( - subscription_id=self._config.subscription_id, + content_type = content_type or "application/json" + _json = None + _content = None + if isinstance(environment_envelope, (IO, bytes)): + _content = environment_envelope + else: + _json = self._serialize.body(environment_envelope, "ManagedEnvironment") + + request = build_create_or_update_request( resource_group_name=resource_group_name, environment_name=environment_name, + subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, - template_url=self._create_or_update_initial.metadata['url'], + content=_content, + template_url=self._create_or_update_initial.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200, 201]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if response.status_code == 200: - deserialized = self._deserialize('ManagedEnvironment', pipeline_response) + deserialized = self._deserialize("ManagedEnvironment", pipeline_response) if response.status_code == 201: - deserialized = self._deserialize('ManagedEnvironment', pipeline_response) + deserialized = self._deserialize("ManagedEnvironment", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore + _create_or_update_initial.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore + + @overload + async def begin_create_or_update( + self, + resource_group_name: str, + environment_name: str, + environment_envelope: _models.ManagedEnvironment, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> AsyncLROPoller[_models.ManagedEnvironment]: + """Creates or updates a Managed Environment. + + Creates or updates a Managed Environment used to host container apps. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Environment. Required. + :type environment_name: str + :param environment_envelope: Configuration details of the Environment. Required. + :type environment_envelope: ~azure.mgmt.appcontainers.models.ManagedEnvironment + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for + this operation to not poll, or pass in your own initialized polling object for a personal + polling strategy. + :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no + Retry-After header is present. + :return: An instance of AsyncLROPoller that returns either ManagedEnvironment or the result of + cls(response) + :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.appcontainers.models.ManagedEnvironment] + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + async def begin_create_or_update( + self, + resource_group_name: str, + environment_name: str, + environment_envelope: IO, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> AsyncLROPoller[_models.ManagedEnvironment]: + """Creates or updates a Managed Environment. + + Creates or updates a Managed Environment used to host container apps. + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Environment. Required. + :type environment_name: str + :param environment_envelope: Configuration details of the Environment. Required. + :type environment_envelope: IO + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for + this operation to not poll, or pass in your own initialized polling object for a personal + polling strategy. + :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no + Retry-After header is present. + :return: An instance of AsyncLROPoller that returns either ManagedEnvironment or the result of + cls(response) + :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.appcontainers.models.ManagedEnvironment] + :raises ~azure.core.exceptions.HttpResponseError: + """ @distributed_trace_async async def begin_create_or_update( self, resource_group_name: str, environment_name: str, - environment_envelope: "_models.ManagedEnvironment", + environment_envelope: Union[_models.ManagedEnvironment, IO], **kwargs: Any - ) -> AsyncLROPoller["_models.ManagedEnvironment"]: + ) -> AsyncLROPoller[_models.ManagedEnvironment]: """Creates or updates a Managed Environment. Creates or updates a Managed Environment used to host container apps. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Environment. + :param environment_name: Name of the Environment. Required. :type environment_name: str - :param environment_envelope: Configuration details of the Environment. - :type environment_envelope: ~azure.mgmt.appcontainers.models.ManagedEnvironment + :param environment_envelope: Configuration details of the Environment. Is either a model type + or a IO type. Required. + :type environment_envelope: ~azure.mgmt.appcontainers.models.ManagedEnvironment or IO + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for @@ -349,107 +461,111 @@ async def begin_create_or_update( :return: An instance of AsyncLROPoller that returns either ManagedEnvironment or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.appcontainers.models.ManagedEnvironment] - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - polling = kwargs.pop('polling', True) # type: Union[bool, AsyncPollingMethod] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironment"] - lro_delay = kwargs.pop( - 'polling_interval', - self._config.polling_interval - ) - cont_token = kwargs.pop('continuation_token', None) # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ManagedEnvironment] + polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] + lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) + cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] if cont_token is None: - raw_result = await self._create_or_update_initial( + raw_result = await self._create_or_update_initial( # type: ignore resource_group_name=resource_group_name, environment_name=environment_name, environment_envelope=environment_envelope, api_version=api_version, content_type=content_type, - cls=lambda x,y,z: x, + cls=lambda x, y, z: x, + headers=_headers, + params=_params, **kwargs ) - kwargs.pop('error_map', None) + kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response - deserialized = self._deserialize('ManagedEnvironment', pipeline_response) + deserialized = self._deserialize("ManagedEnvironment", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - - if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs) - elif polling is False: polling_method = AsyncNoPolling() - else: polling_method = polling + if polling is True: + polling_method = cast(AsyncPollingMethod, AsyncARMPolling(lro_delay, **kwargs)) # type: AsyncPollingMethod + elif polling is False: + polling_method = cast(AsyncPollingMethod, AsyncNoPolling()) + else: + polling_method = polling if cont_token: return AsyncLROPoller.from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, - deserialization_callback=get_long_running_output + deserialization_callback=get_long_running_output, ) return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore + begin_create_or_update.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore async def _delete_initial( # pylint: disable=inconsistent-return-statements - self, - resource_group_name: str, - environment_name: str, - **kwargs: Any + self, resource_group_name: str, environment_name: str, **kwargs: Any ) -> None: - cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - - request = build_delete_request_initial( - subscription_id=self._config.subscription_id, + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] + + request = build_delete_request( resource_group_name=resource_group_name, environment_name=environment_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self._delete_initial.metadata['url'], + template_url=self._delete_initial.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200, 202, 204]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: return cls(pipeline_response, None, {}) - _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore - + _delete_initial.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore @distributed_trace_async - async def begin_delete( # pylint: disable=inconsistent-return-statements - self, - resource_group_name: str, - environment_name: str, - **kwargs: Any + async def begin_delete( + self, resource_group_name: str, environment_name: str, **kwargs: Any ) -> AsyncLROPoller[None]: """Delete a Managed Environment. Delete a Managed Environment if it does not have any container apps. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Environment. + :param environment_name: Name of the Environment. Required. :type environment_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. @@ -461,98 +577,190 @@ async def begin_delete( # pylint: disable=inconsistent-return-statements Retry-After header is present. :return: An instance of AsyncLROPoller that returns either None or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[None] - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - polling = kwargs.pop('polling', True) # type: Union[bool, AsyncPollingMethod] - cls = kwargs.pop('cls', None) # type: ClsType[None] - lro_delay = kwargs.pop( - 'polling_interval', - self._config.polling_interval - ) - cont_token = kwargs.pop('continuation_token', None) # type: Optional[str] + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] + polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] + lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) + cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] if cont_token is None: - raw_result = await self._delete_initial( + raw_result = await self._delete_initial( # type: ignore resource_group_name=resource_group_name, environment_name=environment_name, api_version=api_version, - cls=lambda x,y,z: x, + cls=lambda x, y, z: x, + headers=_headers, + params=_params, **kwargs ) - kwargs.pop('error_map', None) + kwargs.pop("error_map", None) - def get_long_running_output(pipeline_response): + def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, {}) - - if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs) - elif polling is False: polling_method = AsyncNoPolling() - else: polling_method = polling + if polling is True: + polling_method = cast(AsyncPollingMethod, AsyncARMPolling(lro_delay, **kwargs)) # type: AsyncPollingMethod + elif polling is False: + polling_method = cast(AsyncPollingMethod, AsyncNoPolling()) + else: + polling_method = polling if cont_token: return AsyncLROPoller.from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, - deserialization_callback=get_long_running_output + deserialization_callback=get_long_running_output, ) return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore + begin_delete.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore async def _update_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, environment_name: str, - environment_envelope: "_models.ManagedEnvironment", + environment_envelope: Union[_models.ManagedEnvironment, IO], **kwargs: Any ) -> None: - cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - _json = self._serialize.body(environment_envelope, 'ManagedEnvironment') + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[None] - request = build_update_request_initial( - subscription_id=self._config.subscription_id, + content_type = content_type or "application/json" + _json = None + _content = None + if isinstance(environment_envelope, (IO, bytes)): + _content = environment_envelope + else: + _json = self._serialize.body(environment_envelope, "ManagedEnvironment") + + request = build_update_request( resource_group_name=resource_group_name, environment_name=environment_name, + subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, - template_url=self._update_initial.metadata['url'], + content=_content, + template_url=self._update_initial.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [202]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: return cls(pipeline_response, None, {}) - _update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore + _update_initial.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore + + @overload + async def begin_update( + self, + resource_group_name: str, + environment_name: str, + environment_envelope: _models.ManagedEnvironment, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> AsyncLROPoller[None]: + """Update Managed Environment's properties. + + Patches a Managed Environment using JSON Merge Patch. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Environment. Required. + :type environment_name: str + :param environment_envelope: Configuration details of the Environment. Required. + :type environment_envelope: ~azure.mgmt.appcontainers.models.ManagedEnvironment + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for + this operation to not poll, or pass in your own initialized polling object for a personal + polling strategy. + :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no + Retry-After header is present. + :return: An instance of AsyncLROPoller that returns either None or the result of cls(response) + :rtype: ~azure.core.polling.AsyncLROPoller[None] + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + async def begin_update( + self, + resource_group_name: str, + environment_name: str, + environment_envelope: IO, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> AsyncLROPoller[None]: + """Update Managed Environment's properties. + + Patches a Managed Environment using JSON Merge Patch. + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Environment. Required. + :type environment_name: str + :param environment_envelope: Configuration details of the Environment. Required. + :type environment_envelope: IO + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for + this operation to not poll, or pass in your own initialized polling object for a personal + polling strategy. + :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no + Retry-After header is present. + :return: An instance of AsyncLROPoller that returns either None or the result of cls(response) + :rtype: ~azure.core.polling.AsyncLROPoller[None] + :raises ~azure.core.exceptions.HttpResponseError: + """ @distributed_trace_async - async def begin_update( # pylint: disable=inconsistent-return-statements + async def begin_update( self, resource_group_name: str, environment_name: str, - environment_envelope: "_models.ManagedEnvironment", + environment_envelope: Union[_models.ManagedEnvironment, IO], **kwargs: Any ) -> AsyncLROPoller[None]: """Update Managed Environment's properties. @@ -560,11 +768,16 @@ async def begin_update( # pylint: disable=inconsistent-return-statements Patches a Managed Environment using JSON Merge Patch. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Environment. + :param environment_name: Name of the Environment. Required. :type environment_name: str - :param environment_envelope: Configuration details of the Environment. - :type environment_envelope: ~azure.mgmt.appcontainers.models.ManagedEnvironment + :param environment_envelope: Configuration details of the Environment. Is either a model type + or a IO type. Required. + :type environment_envelope: ~azure.mgmt.appcontainers.models.ManagedEnvironment or IO + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for @@ -575,44 +788,48 @@ async def begin_update( # pylint: disable=inconsistent-return-statements Retry-After header is present. :return: An instance of AsyncLROPoller that returns either None or the result of cls(response) :rtype: ~azure.core.polling.AsyncLROPoller[None] - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - polling = kwargs.pop('polling', True) # type: Union[bool, AsyncPollingMethod] - cls = kwargs.pop('cls', None) # type: ClsType[None] - lro_delay = kwargs.pop( - 'polling_interval', - self._config.polling_interval - ) - cont_token = kwargs.pop('continuation_token', None) # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[None] + polling = kwargs.pop("polling", True) # type: Union[bool, AsyncPollingMethod] + lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) + cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] if cont_token is None: - raw_result = await self._update_initial( + raw_result = await self._update_initial( # type: ignore resource_group_name=resource_group_name, environment_name=environment_name, environment_envelope=environment_envelope, api_version=api_version, content_type=content_type, - cls=lambda x,y,z: x, + cls=lambda x, y, z: x, + headers=_headers, + params=_params, **kwargs ) - kwargs.pop('error_map', None) + kwargs.pop("error_map", None) - def get_long_running_output(pipeline_response): + def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, {}) - - if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs) - elif polling is False: polling_method = AsyncNoPolling() - else: polling_method = polling + if polling is True: + polling_method = cast(AsyncPollingMethod, AsyncARMPolling(lro_delay, **kwargs)) # type: AsyncPollingMethod + elif polling is False: + polling_method = cast(AsyncPollingMethod, AsyncNoPolling()) + else: + polling_method = polling if cont_token: return AsyncLROPoller.from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, - deserialization_callback=get_long_running_output + deserialization_callback=get_long_running_output, ) return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore + begin_update.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_managed_environments_storages_operations.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_managed_environments_storages_operations.py index 5a62d101684a..5be261412618 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_managed_environments_storages_operations.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_managed_environments_storages_operations.py @@ -6,87 +6,103 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, Callable, Dict, Optional, TypeVar - -from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload + +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import AsyncHttpResponse from azure.core.rest import HttpRequest from azure.core.tracing.decorator_async import distributed_trace_async +from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from ... import models as _models from ..._vendor import _convert_request -from ...operations._managed_environments_storages_operations import build_create_or_update_request, build_delete_request, build_get_request, build_list_request -T = TypeVar('T') +from ...operations._managed_environments_storages_operations import ( + build_create_or_update_request, + build_delete_request, + build_get_request, + build_list_request, +) + +T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] -class ManagedEnvironmentsStoragesOperations: - """ManagedEnvironmentsStoragesOperations async operations. - You should not instantiate this class directly. Instead, you should create a Client instance that - instantiates it for you and attaches it as an attribute. +class ManagedEnvironmentsStoragesOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. - :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.appcontainers.models - :param client: Client for service requests. - :param config: Configuration of service client. - :param serializer: An object model serializer. - :param deserializer: An object model deserializer. + Instead, you should access the following operations through + :class:`~azure.mgmt.appcontainers.aio.ContainerAppsAPIClient`'s + :attr:`managed_environments_storages` attribute. """ models = _models - def __init__(self, client, config, serializer, deserializer) -> None: - self._client = client - self._serialize = serializer - self._deserialize = deserializer - self._config = config + def __init__(self, *args, **kwargs) -> None: + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async async def list( - self, - resource_group_name: str, - environment_name: str, - **kwargs: Any - ) -> "_models.ManagedEnvironmentStoragesCollection": + self, resource_group_name: str, environment_name: str, **kwargs: Any + ) -> _models.ManagedEnvironmentStoragesCollection: """Get all storages for a managedEnvironment. Get all storages for a managedEnvironment. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Environment. + :param environment_name: Name of the Environment. Required. :type environment_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: ManagedEnvironmentStoragesCollection, or the result of cls(response) + :return: ManagedEnvironmentStoragesCollection or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.ManagedEnvironmentStoragesCollection - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironmentStoragesCollection"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.ManagedEnvironmentStoragesCollection] - request = build_list_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list.metadata['url'], + template_url=self.list.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -94,64 +110,66 @@ async def list( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('ManagedEnvironmentStoragesCollection', pipeline_response) + deserialized = self._deserialize("ManagedEnvironmentStoragesCollection", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/storages"} # type: ignore - + list.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/storages"} # type: ignore @distributed_trace_async async def get( - self, - resource_group_name: str, - environment_name: str, - storage_name: str, - **kwargs: Any - ) -> "_models.ManagedEnvironmentStorage": + self, resource_group_name: str, environment_name: str, storage_name: str, **kwargs: Any + ) -> _models.ManagedEnvironmentStorage: """Get storage for a managedEnvironment. Get storage for a managedEnvironment. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Environment. + :param environment_name: Name of the Environment. Required. :type environment_name: str - :param storage_name: Name of the storage. + :param storage_name: Name of the storage. Required. :type storage_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: ManagedEnvironmentStorage, or the result of cls(response) + :return: ManagedEnvironmentStorage or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.ManagedEnvironmentStorage - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironmentStorage"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.ManagedEnvironmentStorage] - request = build_get_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, storage_name=storage_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get.metadata['url'], + template_url=self.get.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -159,15 +177,80 @@ async def get( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('ManagedEnvironmentStorage', pipeline_response) + deserialized = self._deserialize("ManagedEnvironmentStorage", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/storages/{storageName}"} # type: ignore + get.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/storages/{storageName}"} # type: ignore + + @overload + async def create_or_update( + self, + resource_group_name: str, + environment_name: str, + storage_name: str, + storage_envelope: _models.ManagedEnvironmentStorage, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> _models.ManagedEnvironmentStorage: + """Create or update storage for a managedEnvironment. + + Create or update storage for a managedEnvironment. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Environment. Required. + :type environment_name: str + :param storage_name: Name of the storage. Required. + :type storage_name: str + :param storage_envelope: Configuration details of storage. Required. + :type storage_envelope: ~azure.mgmt.appcontainers.models.ManagedEnvironmentStorage + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: ManagedEnvironmentStorage or the result of cls(response) + :rtype: ~azure.mgmt.appcontainers.models.ManagedEnvironmentStorage + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + async def create_or_update( + self, + resource_group_name: str, + environment_name: str, + storage_name: str, + storage_envelope: IO, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> _models.ManagedEnvironmentStorage: + """Create or update storage for a managedEnvironment. + Create or update storage for a managedEnvironment. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Environment. Required. + :type environment_name: str + :param storage_name: Name of the storage. Required. + :type storage_name: str + :param storage_envelope: Configuration details of storage. Required. + :type storage_envelope: IO + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: ManagedEnvironmentStorage or the result of cls(response) + :rtype: ~azure.mgmt.appcontainers.models.ManagedEnvironmentStorage + :raises ~azure.core.exceptions.HttpResponseError: + """ @distributed_trace_async async def create_or_update( @@ -175,55 +258,74 @@ async def create_or_update( resource_group_name: str, environment_name: str, storage_name: str, - storage_envelope: "_models.ManagedEnvironmentStorage", + storage_envelope: Union[_models.ManagedEnvironmentStorage, IO], **kwargs: Any - ) -> "_models.ManagedEnvironmentStorage": + ) -> _models.ManagedEnvironmentStorage: """Create or update storage for a managedEnvironment. Create or update storage for a managedEnvironment. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Environment. + :param environment_name: Name of the Environment. Required. :type environment_name: str - :param storage_name: Name of the storage. + :param storage_name: Name of the storage. Required. :type storage_name: str - :param storage_envelope: Configuration details of storage. - :type storage_envelope: ~azure.mgmt.appcontainers.models.ManagedEnvironmentStorage + :param storage_envelope: Configuration details of storage. Is either a model type or a IO type. + Required. + :type storage_envelope: ~azure.mgmt.appcontainers.models.ManagedEnvironmentStorage or IO + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: ManagedEnvironmentStorage, or the result of cls(response) + :return: ManagedEnvironmentStorage or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.ManagedEnvironmentStorage - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironmentStorage"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - _json = self._serialize.body(storage_envelope, 'ManagedEnvironmentStorage') + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ManagedEnvironmentStorage] + + content_type = content_type or "application/json" + _json = None + _content = None + if isinstance(storage_envelope, (IO, bytes)): + _content = storage_envelope + else: + _json = self._serialize.body(storage_envelope, "ManagedEnvironmentStorage") request = build_create_or_update_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, storage_name=storage_name, + subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, - template_url=self.create_or_update.metadata['url'], + content=_content, + template_url=self.create_or_update.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -231,64 +333,66 @@ async def create_or_update( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('ManagedEnvironmentStorage', pipeline_response) + deserialized = self._deserialize("ManagedEnvironmentStorage", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/storages/{storageName}"} # type: ignore - + create_or_update.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/storages/{storageName}"} # type: ignore @distributed_trace_async async def delete( # pylint: disable=inconsistent-return-statements - self, - resource_group_name: str, - environment_name: str, - storage_name: str, - **kwargs: Any + self, resource_group_name: str, environment_name: str, storage_name: str, **kwargs: Any ) -> None: """Delete storage for a managedEnvironment. Delete storage for a managedEnvironment. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Environment. + :param environment_name: Name of the Environment. Required. :type environment_name: str - :param storage_name: Name of the storage. + :param storage_name: Name of the storage. Required. :type storage_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: None, or the result of cls(response) + :return: None or the result of cls(response) :rtype: None - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] - request = build_delete_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, storage_name=storage_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.delete.metadata['url'], + template_url=self.delete.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200, 204]: @@ -299,5 +403,4 @@ async def delete( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, {}) - delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/storages/{storageName}"} # type: ignore - + delete.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/storages/{storageName}"} # type: ignore diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_namespaces_operations.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_namespaces_operations.py index bf9e9706e7bc..e33552674ac1 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_namespaces_operations.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_namespaces_operations.py @@ -6,95 +6,182 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, Callable, Dict, Optional, TypeVar - -from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload + +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import AsyncHttpResponse from azure.core.rest import HttpRequest from azure.core.tracing.decorator_async import distributed_trace_async +from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from ... import models as _models from ..._vendor import _convert_request from ...operations._namespaces_operations import build_check_name_availability_request -T = TypeVar('T') + +T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] -class NamespacesOperations: - """NamespacesOperations async operations. - You should not instantiate this class directly. Instead, you should create a Client instance that - instantiates it for you and attaches it as an attribute. +class NamespacesOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. - :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.appcontainers.models - :param client: Client for service requests. - :param config: Configuration of service client. - :param serializer: An object model serializer. - :param deserializer: An object model deserializer. + Instead, you should access the following operations through + :class:`~azure.mgmt.appcontainers.aio.ContainerAppsAPIClient`'s + :attr:`namespaces` attribute. """ models = _models - def __init__(self, client, config, serializer, deserializer) -> None: - self._client = client - self._serialize = serializer - self._deserialize = deserializer - self._config = config + def __init__(self, *args, **kwargs) -> None: + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") - @distributed_trace_async + @overload async def check_name_availability( self, resource_group_name: str, environment_name: str, - check_name_availability_request: "_models.CheckNameAvailabilityRequest", + check_name_availability_request: _models.CheckNameAvailabilityRequest, + *, + content_type: str = "application/json", **kwargs: Any - ) -> "_models.CheckNameAvailabilityResponse": + ) -> _models.CheckNameAvailabilityResponse: """Checks the resource name availability. Checks if resource name is available. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Managed Environment. + :param environment_name: Name of the Managed Environment. Required. :type environment_name: str - :param check_name_availability_request: The check name availability request. + :param check_name_availability_request: The check name availability request. Required. :type check_name_availability_request: ~azure.mgmt.appcontainers.models.CheckNameAvailabilityRequest + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: CheckNameAvailabilityResponse, or the result of cls(response) + :return: CheckNameAvailabilityResponse or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.CheckNameAvailabilityResponse - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + async def check_name_availability( + self, + resource_group_name: str, + environment_name: str, + check_name_availability_request: IO, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> _models.CheckNameAvailabilityResponse: + """Checks the resource name availability. + + Checks if resource name is available. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Managed Environment. Required. + :type environment_name: str + :param check_name_availability_request: The check name availability request. Required. + :type check_name_availability_request: IO + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: CheckNameAvailabilityResponse or the result of cls(response) + :rtype: ~azure.mgmt.appcontainers.models.CheckNameAvailabilityResponse + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @distributed_trace_async + async def check_name_availability( + self, + resource_group_name: str, + environment_name: str, + check_name_availability_request: Union[_models.CheckNameAvailabilityRequest, IO], + **kwargs: Any + ) -> _models.CheckNameAvailabilityResponse: + """Checks the resource name availability. + + Checks if resource name is available. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Managed Environment. Required. + :type environment_name: str + :param check_name_availability_request: The check name availability request. Is either a model + type or a IO type. Required. + :type check_name_availability_request: + ~azure.mgmt.appcontainers.models.CheckNameAvailabilityRequest or IO + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: CheckNameAvailabilityResponse or the result of cls(response) + :rtype: ~azure.mgmt.appcontainers.models.CheckNameAvailabilityResponse + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.CheckNameAvailabilityResponse"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - _json = self._serialize.body(check_name_availability_request, 'CheckNameAvailabilityRequest') + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[_models.CheckNameAvailabilityResponse] + + content_type = content_type or "application/json" + _json = None + _content = None + if isinstance(check_name_availability_request, (IO, bytes)): + _content = check_name_availability_request + else: + _json = self._serialize.body(check_name_availability_request, "CheckNameAvailabilityRequest") request = build_check_name_availability_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, + subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, - template_url=self.check_name_availability.metadata['url'], + content=_content, + template_url=self.check_name_availability.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -102,12 +189,11 @@ async def check_name_availability( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('CheckNameAvailabilityResponse', pipeline_response) + deserialized = self._deserialize("CheckNameAvailabilityResponse", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - check_name_availability.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/checkNameAvailability"} # type: ignore - + check_name_availability.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/checkNameAvailability"} # type: ignore diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_operations.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_operations.py index a2773cdaf1ab..f755d3294598 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_operations.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_operations.py @@ -7,81 +7,95 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar +from urllib.parse import parse_qs, urljoin, urlparse from azure.core.async_paging import AsyncItemPaged, AsyncList -from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import AsyncHttpResponse from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace +from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from ... import models as _models from ..._vendor import _convert_request from ...operations._operations import build_list_request -T = TypeVar('T') + +T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] -class Operations: - """Operations async operations. - You should not instantiate this class directly. Instead, you should create a Client instance that - instantiates it for you and attaches it as an attribute. +class Operations: + """ + .. warning:: + **DO NOT** instantiate this class directly. - :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.appcontainers.models - :param client: Client for service requests. - :param config: Configuration of service client. - :param serializer: An object model serializer. - :param deserializer: An object model deserializer. + Instead, you should access the following operations through + :class:`~azure.mgmt.appcontainers.aio.ContainerAppsAPIClient`'s + :attr:`operations` attribute. """ models = _models - def __init__(self, client, config, serializer, deserializer) -> None: - self._client = client - self._serialize = serializer - self._deserialize = deserializer - self._config = config + def __init__(self, *args, **kwargs) -> None: + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def list( - self, - **kwargs: Any - ) -> AsyncIterable["_models.AvailableOperations"]: + def list(self, **kwargs: Any) -> AsyncIterable["_models.OperationDetail"]: """Lists all of the available RP operations. :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of either AvailableOperations or the result of cls(response) + :return: An iterator like instance of either OperationDetail or the result of cls(response) :rtype: - ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.appcontainers.models.AvailableOperations] - :raises: ~azure.core.exceptions.HttpResponseError + ~azure.core.async_paging.AsyncItemPaged[~azure.mgmt.appcontainers.models.OperationDetail] + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.AvailableOperations] - cls = kwargs.pop('cls', None) # type: ClsType["_models.AvailableOperations"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + def prepare_request(next_link=None): if not next_link: - + request = build_list_request( api_version=api_version, - template_url=self.list.metadata['url'], + template_url=self.list.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore else: - - request = build_list_request( - api_version=api_version, - template_url=next_link, - ) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore request.method = "GET" return request @@ -95,10 +109,8 @@ async def extract_data(pipeline_response): async def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = await self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) response = pipeline_response.http_response @@ -109,8 +121,6 @@ async def get_next(next_link=None): return pipeline_response + return AsyncItemPaged(get_next, extract_data) - return AsyncItemPaged( - get_next, extract_data - ) - list.metadata = {'url': "/providers/Microsoft.App/operations"} # type: ignore + list.metadata = {"url": "/providers/Microsoft.App/operations"} # type: ignore diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_patch.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_patch.py new file mode 100644 index 000000000000..f7dd32510333 --- /dev/null +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/operations/_patch.py @@ -0,0 +1,20 @@ +# ------------------------------------ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT License. +# ------------------------------------ +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/models/__init__.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/models/__init__.py index 1948f779e92c..4380555bda30 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/models/__init__.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/models/__init__.py @@ -44,6 +44,8 @@ from ._models_py3 import CookieExpiration from ._models_py3 import CustomDomain from ._models_py3 import CustomHostnameAnalysisResult +from ._models_py3 import CustomHostnameAnalysisResultCustomDomainVerificationFailureInfo +from ._models_py3 import CustomHostnameAnalysisResultCustomDomainVerificationFailureInfoDetailsItem from ._models_py3 import CustomOpenIdConnectProvider from ._models_py3 import CustomScaleRule from ._models_py3 import Dapr @@ -113,157 +115,161 @@ from ._models_py3 import Volume from ._models_py3 import VolumeMount - -from ._container_apps_api_client_enums import ( - AccessMode, - ActiveRevisionsMode, - AppProtocol, - BindingType, - CertificateProvisioningState, - CheckNameAvailabilityReason, - ContainerAppProvisioningState, - CookieExpirationConvention, - CreatedByType, - DnsVerificationTestResult, - EnvironmentProvisioningState, - ForwardProxyConvention, - IngressTransportMethod, - ManagedServiceIdentityType, - RevisionHealthState, - RevisionProvisioningState, - Scheme, - SourceControlOperationState, - StorageType, - Type, - UnauthenticatedClientActionV2, -) +from ._container_apps_api_client_enums import AccessMode +from ._container_apps_api_client_enums import ActiveRevisionsMode +from ._container_apps_api_client_enums import AppProtocol +from ._container_apps_api_client_enums import BindingType +from ._container_apps_api_client_enums import CertificateProvisioningState +from ._container_apps_api_client_enums import CheckNameAvailabilityReason +from ._container_apps_api_client_enums import ContainerAppProvisioningState +from ._container_apps_api_client_enums import CookieExpirationConvention +from ._container_apps_api_client_enums import CreatedByType +from ._container_apps_api_client_enums import DnsVerificationTestResult +from ._container_apps_api_client_enums import EnvironmentProvisioningState +from ._container_apps_api_client_enums import ForwardProxyConvention +from ._container_apps_api_client_enums import IngressTransportMethod +from ._container_apps_api_client_enums import ManagedServiceIdentityType +from ._container_apps_api_client_enums import RevisionHealthState +from ._container_apps_api_client_enums import RevisionProvisioningState +from ._container_apps_api_client_enums import Scheme +from ._container_apps_api_client_enums import SourceControlOperationState +from ._container_apps_api_client_enums import StorageType +from ._container_apps_api_client_enums import Type +from ._container_apps_api_client_enums import UnauthenticatedClientActionV2 +from ._patch import __all__ as _patch_all +from ._patch import * # type: ignore # pylint: disable=unused-wildcard-import +from ._patch import patch_sdk as _patch_sdk __all__ = [ - 'AllowedAudiencesValidation', - 'AllowedPrincipals', - 'AppLogsConfiguration', - 'AppRegistration', - 'Apple', - 'AppleRegistration', - 'AuthConfig', - 'AuthConfigCollection', - 'AuthPlatform', - 'AvailableOperations', - 'AzureActiveDirectory', - 'AzureActiveDirectoryLogin', - 'AzureActiveDirectoryRegistration', - 'AzureActiveDirectoryValidation', - 'AzureCredentials', - 'AzureFileProperties', - 'AzureStaticWebApps', - 'AzureStaticWebAppsRegistration', - 'Certificate', - 'CertificateCollection', - 'CertificatePatch', - 'CertificateProperties', - 'CheckNameAvailabilityRequest', - 'CheckNameAvailabilityResponse', - 'ClientRegistration', - 'Configuration', - 'Container', - 'ContainerApp', - 'ContainerAppCollection', - 'ContainerAppProbe', - 'ContainerAppProbeHttpGet', - 'ContainerAppProbeHttpGetHttpHeadersItem', - 'ContainerAppProbeTcpSocket', - 'ContainerAppSecret', - 'ContainerResources', - 'CookieExpiration', - 'CustomDomain', - 'CustomHostnameAnalysisResult', - 'CustomOpenIdConnectProvider', - 'CustomScaleRule', - 'Dapr', - 'DaprComponent', - 'DaprComponentsCollection', - 'DaprMetadata', - 'DaprSecretsCollection', - 'DefaultAuthorizationPolicy', - 'DefaultErrorResponse', - 'DefaultErrorResponseError', - 'DefaultErrorResponseErrorDetailsItem', - 'EnvironmentVar', - 'Facebook', - 'ForwardProxy', - 'GitHub', - 'GithubActionConfiguration', - 'GlobalValidation', - 'Google', - 'HttpScaleRule', - 'HttpSettings', - 'HttpSettingsRoutes', - 'IdentityProviders', - 'Ingress', - 'JwtClaimChecks', - 'LogAnalyticsConfiguration', - 'Login', - 'LoginRoutes', - 'LoginScopes', - 'ManagedEnvironment', - 'ManagedEnvironmentStorage', - 'ManagedEnvironmentStorageProperties', - 'ManagedEnvironmentStoragesCollection', - 'ManagedEnvironmentsCollection', - 'ManagedServiceIdentity', - 'Nonce', - 'OpenIdConnectClientCredential', - 'OpenIdConnectConfig', - 'OpenIdConnectLogin', - 'OpenIdConnectRegistration', - 'OperationDetail', - 'OperationDisplay', - 'ProxyResource', - 'QueueScaleRule', - 'RegistryCredentials', - 'RegistryInfo', - 'Replica', - 'ReplicaCollection', - 'ReplicaContainer', - 'Resource', - 'Revision', - 'RevisionCollection', - 'Scale', - 'ScaleRule', - 'ScaleRuleAuth', - 'Secret', - 'SecretsCollection', - 'SourceControl', - 'SourceControlCollection', - 'SystemData', - 'Template', - 'TrackedResource', - 'TrafficWeight', - 'Twitter', - 'TwitterRegistration', - 'UserAssignedIdentity', - 'VnetConfiguration', - 'Volume', - 'VolumeMount', - 'AccessMode', - 'ActiveRevisionsMode', - 'AppProtocol', - 'BindingType', - 'CertificateProvisioningState', - 'CheckNameAvailabilityReason', - 'ContainerAppProvisioningState', - 'CookieExpirationConvention', - 'CreatedByType', - 'DnsVerificationTestResult', - 'EnvironmentProvisioningState', - 'ForwardProxyConvention', - 'IngressTransportMethod', - 'ManagedServiceIdentityType', - 'RevisionHealthState', - 'RevisionProvisioningState', - 'Scheme', - 'SourceControlOperationState', - 'StorageType', - 'Type', - 'UnauthenticatedClientActionV2', + "AllowedAudiencesValidation", + "AllowedPrincipals", + "AppLogsConfiguration", + "AppRegistration", + "Apple", + "AppleRegistration", + "AuthConfig", + "AuthConfigCollection", + "AuthPlatform", + "AvailableOperations", + "AzureActiveDirectory", + "AzureActiveDirectoryLogin", + "AzureActiveDirectoryRegistration", + "AzureActiveDirectoryValidation", + "AzureCredentials", + "AzureFileProperties", + "AzureStaticWebApps", + "AzureStaticWebAppsRegistration", + "Certificate", + "CertificateCollection", + "CertificatePatch", + "CertificateProperties", + "CheckNameAvailabilityRequest", + "CheckNameAvailabilityResponse", + "ClientRegistration", + "Configuration", + "Container", + "ContainerApp", + "ContainerAppCollection", + "ContainerAppProbe", + "ContainerAppProbeHttpGet", + "ContainerAppProbeHttpGetHttpHeadersItem", + "ContainerAppProbeTcpSocket", + "ContainerAppSecret", + "ContainerResources", + "CookieExpiration", + "CustomDomain", + "CustomHostnameAnalysisResult", + "CustomHostnameAnalysisResultCustomDomainVerificationFailureInfo", + "CustomHostnameAnalysisResultCustomDomainVerificationFailureInfoDetailsItem", + "CustomOpenIdConnectProvider", + "CustomScaleRule", + "Dapr", + "DaprComponent", + "DaprComponentsCollection", + "DaprMetadata", + "DaprSecretsCollection", + "DefaultAuthorizationPolicy", + "DefaultErrorResponse", + "DefaultErrorResponseError", + "DefaultErrorResponseErrorDetailsItem", + "EnvironmentVar", + "Facebook", + "ForwardProxy", + "GitHub", + "GithubActionConfiguration", + "GlobalValidation", + "Google", + "HttpScaleRule", + "HttpSettings", + "HttpSettingsRoutes", + "IdentityProviders", + "Ingress", + "JwtClaimChecks", + "LogAnalyticsConfiguration", + "Login", + "LoginRoutes", + "LoginScopes", + "ManagedEnvironment", + "ManagedEnvironmentStorage", + "ManagedEnvironmentStorageProperties", + "ManagedEnvironmentStoragesCollection", + "ManagedEnvironmentsCollection", + "ManagedServiceIdentity", + "Nonce", + "OpenIdConnectClientCredential", + "OpenIdConnectConfig", + "OpenIdConnectLogin", + "OpenIdConnectRegistration", + "OperationDetail", + "OperationDisplay", + "ProxyResource", + "QueueScaleRule", + "RegistryCredentials", + "RegistryInfo", + "Replica", + "ReplicaCollection", + "ReplicaContainer", + "Resource", + "Revision", + "RevisionCollection", + "Scale", + "ScaleRule", + "ScaleRuleAuth", + "Secret", + "SecretsCollection", + "SourceControl", + "SourceControlCollection", + "SystemData", + "Template", + "TrackedResource", + "TrafficWeight", + "Twitter", + "TwitterRegistration", + "UserAssignedIdentity", + "VnetConfiguration", + "Volume", + "VolumeMount", + "AccessMode", + "ActiveRevisionsMode", + "AppProtocol", + "BindingType", + "CertificateProvisioningState", + "CheckNameAvailabilityReason", + "ContainerAppProvisioningState", + "CookieExpirationConvention", + "CreatedByType", + "DnsVerificationTestResult", + "EnvironmentProvisioningState", + "ForwardProxyConvention", + "IngressTransportMethod", + "ManagedServiceIdentityType", + "RevisionHealthState", + "RevisionProvisioningState", + "Scheme", + "SourceControlOperationState", + "StorageType", + "Type", + "UnauthenticatedClientActionV2", ] +__all__.extend([p for p in _patch_all if p not in __all__]) +_patch_sdk() diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/models/_container_apps_api_client_enums.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/models/_container_apps_api_client_enums.py index 942689302057..9c3681fb6460 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/models/_container_apps_api_client_enums.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/models/_container_apps_api_client_enums.py @@ -7,49 +7,49 @@ # -------------------------------------------------------------------------- from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class AccessMode(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): - """Access mode for storage - """ +class AccessMode(str, Enum, metaclass=CaseInsensitiveEnumMeta): + """Access mode for storage.""" READ_ONLY = "ReadOnly" READ_WRITE = "ReadWrite" -class ActiveRevisionsMode(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): + +class ActiveRevisionsMode(str, Enum, metaclass=CaseInsensitiveEnumMeta): """ActiveRevisionsMode controls how active revisions are handled for the Container app: - - + + .. raw:: html - + Multiple: multiple revisions can be active.Single: Only one revision can be active at a time. Revision weights can not be used in this mode. If no value if - provided, this is the default. + provided, this is the default.. """ MULTIPLE = "Multiple" SINGLE = "Single" -class AppProtocol(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): + +class AppProtocol(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Tells Dapr which protocol your application is using. Valid options are http and grpc. Default - is http + is http. """ HTTP = "http" GRPC = "grpc" -class BindingType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): - """Custom Domain binding type. - """ + +class BindingType(str, Enum, metaclass=CaseInsensitiveEnumMeta): + """Custom Domain binding type.""" DISABLED = "Disabled" SNI_ENABLED = "SniEnabled" -class CertificateProvisioningState(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): - """Provisioning state of the certificate. - """ + +class CertificateProvisioningState(str, Enum, metaclass=CaseInsensitiveEnumMeta): + """Provisioning state of the certificate.""" SUCCEEDED = "Succeeded" FAILED = "Failed" @@ -57,49 +57,50 @@ class CertificateProvisioningState(with_metaclass(CaseInsensitiveEnumMeta, str, DELETE_FAILED = "DeleteFailed" PENDING = "Pending" -class CheckNameAvailabilityReason(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): - """The reason why the given name is not available. - """ + +class CheckNameAvailabilityReason(str, Enum, metaclass=CaseInsensitiveEnumMeta): + """The reason why the given name is not available.""" INVALID = "Invalid" ALREADY_EXISTS = "AlreadyExists" -class ContainerAppProvisioningState(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): - """Provisioning state of the Container App. - """ + +class ContainerAppProvisioningState(str, Enum, metaclass=CaseInsensitiveEnumMeta): + """Provisioning state of the Container App.""" IN_PROGRESS = "InProgress" SUCCEEDED = "Succeeded" FAILED = "Failed" CANCELED = "Canceled" + DELETING = "Deleting" -class CookieExpirationConvention(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): - """The convention used when determining the session cookie's expiration. - """ + +class CookieExpirationConvention(str, Enum, metaclass=CaseInsensitiveEnumMeta): + """The convention used when determining the session cookie's expiration.""" FIXED_TIME = "FixedTime" IDENTITY_PROVIDER_DERIVED = "IdentityProviderDerived" -class CreatedByType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): - """The type of identity that created the resource. - """ + +class CreatedByType(str, Enum, metaclass=CaseInsensitiveEnumMeta): + """The type of identity that created the resource.""" USER = "User" APPLICATION = "Application" MANAGED_IDENTITY = "ManagedIdentity" KEY = "Key" -class DnsVerificationTestResult(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): - """DNS verification test result. - """ + +class DnsVerificationTestResult(str, Enum, metaclass=CaseInsensitiveEnumMeta): + """DNS verification test result.""" PASSED = "Passed" FAILED = "Failed" SKIPPED = "Skipped" -class EnvironmentProvisioningState(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): - """Provisioning state of the Environment. - """ + +class EnvironmentProvisioningState(str, Enum, metaclass=CaseInsensitiveEnumMeta): + """Provisioning state of the Environment.""" SUCCEEDED = "Succeeded" FAILED = "Failed" @@ -112,23 +113,24 @@ class EnvironmentProvisioningState(with_metaclass(CaseInsensitiveEnumMeta, str, UPGRADE_REQUESTED = "UpgradeRequested" UPGRADE_FAILED = "UpgradeFailed" -class ForwardProxyConvention(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): - """The convention used to determine the url of the request made. - """ + +class ForwardProxyConvention(str, Enum, metaclass=CaseInsensitiveEnumMeta): + """The convention used to determine the url of the request made.""" NO_PROXY = "NoProxy" STANDARD = "Standard" CUSTOM = "Custom" -class IngressTransportMethod(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): - """Ingress transport protocol - """ + +class IngressTransportMethod(str, Enum, metaclass=CaseInsensitiveEnumMeta): + """Ingress transport protocol.""" AUTO = "auto" HTTP = "http" HTTP2 = "http2" -class ManagedServiceIdentityType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): + +class ManagedServiceIdentityType(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Type of managed service identity (where both SystemAssigned and UserAssigned types are allowed). """ @@ -138,17 +140,17 @@ class ManagedServiceIdentityType(with_metaclass(CaseInsensitiveEnumMeta, str, En USER_ASSIGNED = "UserAssigned" SYSTEM_ASSIGNED_USER_ASSIGNED = "SystemAssigned,UserAssigned" -class RevisionHealthState(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): - """Current health State of the revision - """ + +class RevisionHealthState(str, Enum, metaclass=CaseInsensitiveEnumMeta): + """Current health State of the revision.""" HEALTHY = "Healthy" UNHEALTHY = "Unhealthy" NONE = "None" -class RevisionProvisioningState(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): - """Current provisioning State of the revision - """ + +class RevisionProvisioningState(str, Enum, metaclass=CaseInsensitiveEnumMeta): + """Current provisioning State of the revision.""" PROVISIONING = "Provisioning" PROVISIONED = "Provisioned" @@ -156,40 +158,40 @@ class RevisionProvisioningState(with_metaclass(CaseInsensitiveEnumMeta, str, Enu DEPROVISIONING = "Deprovisioning" DEPROVISIONED = "Deprovisioned" -class Scheme(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): - """Scheme to use for connecting to the host. Defaults to HTTP. - """ + +class Scheme(str, Enum, metaclass=CaseInsensitiveEnumMeta): + """Scheme to use for connecting to the host. Defaults to HTTP.""" HTTP = "HTTP" HTTPS = "HTTPS" -class SourceControlOperationState(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): - """Current provisioning State of the operation - """ + +class SourceControlOperationState(str, Enum, metaclass=CaseInsensitiveEnumMeta): + """Current provisioning State of the operation.""" IN_PROGRESS = "InProgress" SUCCEEDED = "Succeeded" FAILED = "Failed" CANCELED = "Canceled" -class StorageType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): - """Storage type for the volume. If not provided, use EmptyDir. - """ + +class StorageType(str, Enum, metaclass=CaseInsensitiveEnumMeta): + """Storage type for the volume. If not provided, use EmptyDir.""" AZURE_FILE = "AzureFile" EMPTY_DIR = "EmptyDir" -class Type(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): - """The type of probe. - """ + +class Type(str, Enum, metaclass=CaseInsensitiveEnumMeta): + """The type of probe.""" LIVENESS = "Liveness" READINESS = "Readiness" STARTUP = "Startup" -class UnauthenticatedClientActionV2(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): - """The action to take when an unauthenticated client attempts to access the app. - """ + +class UnauthenticatedClientActionV2(str, Enum, metaclass=CaseInsensitiveEnumMeta): + """The action to take when an unauthenticated client attempts to access the app.""" REDIRECT_TO_LOGIN_PAGE = "RedirectToLoginPage" ALLOW_ANONYMOUS = "AllowAnonymous" diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/models/_models_py3.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/models/_models_py3.py index 0767b061c0d2..a19a5e3f4752 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/models/_models_py3.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/models/_models_py3.py @@ -1,4 +1,5 @@ # coding=utf-8 +# pylint: disable=too-many-lines # -------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. @@ -7,15 +8,16 @@ # -------------------------------------------------------------------------- import datetime -from typing import Dict, List, Optional, Union +from typing import Dict, List, Optional, TYPE_CHECKING, Union -from azure.core.exceptions import HttpResponseError -import msrest.serialization +from .. import _serialization -from ._container_apps_api_client_enums import * +if TYPE_CHECKING: + # pylint: disable=unused-import,ungrouped-imports + from .. import models as _models -class AllowedAudiencesValidation(msrest.serialization.Model): +class AllowedAudiencesValidation(_serialization.Model): """The configuration settings of the Allowed Audiences validation flow. :ivar allowed_audiences: The configuration settings of the allowed list of audiences from which @@ -24,25 +26,20 @@ class AllowedAudiencesValidation(msrest.serialization.Model): """ _attribute_map = { - 'allowed_audiences': {'key': 'allowedAudiences', 'type': '[str]'}, + "allowed_audiences": {"key": "allowedAudiences", "type": "[str]"}, } - def __init__( - self, - *, - allowed_audiences: Optional[List[str]] = None, - **kwargs - ): + def __init__(self, *, allowed_audiences: Optional[List[str]] = None, **kwargs): """ :keyword allowed_audiences: The configuration settings of the allowed list of audiences from which to validate the JWT token. :paramtype allowed_audiences: list[str] """ - super(AllowedAudiencesValidation, self).__init__(**kwargs) + super().__init__(**kwargs) self.allowed_audiences = allowed_audiences -class AllowedPrincipals(msrest.serialization.Model): +class AllowedPrincipals(_serialization.Model): """The configuration settings of the Azure Active Directory allowed principals. :ivar groups: The list of the allowed groups. @@ -52,29 +49,23 @@ class AllowedPrincipals(msrest.serialization.Model): """ _attribute_map = { - 'groups': {'key': 'groups', 'type': '[str]'}, - 'identities': {'key': 'identities', 'type': '[str]'}, + "groups": {"key": "groups", "type": "[str]"}, + "identities": {"key": "identities", "type": "[str]"}, } - def __init__( - self, - *, - groups: Optional[List[str]] = None, - identities: Optional[List[str]] = None, - **kwargs - ): + def __init__(self, *, groups: Optional[List[str]] = None, identities: Optional[List[str]] = None, **kwargs): """ :keyword groups: The list of the allowed groups. :paramtype groups: list[str] :keyword identities: The list of the allowed identities. :paramtype identities: list[str] """ - super(AllowedPrincipals, self).__init__(**kwargs) + super().__init__(**kwargs) self.groups = groups self.identities = identities -class Apple(msrest.serialization.Model): +class Apple(_serialization.Model): """The configuration settings of the Apple provider. :ivar enabled: :code:`false` if the Apple provider should not be enabled despite @@ -87,17 +78,17 @@ class Apple(msrest.serialization.Model): """ _attribute_map = { - 'enabled': {'key': 'enabled', 'type': 'bool'}, - 'registration': {'key': 'registration', 'type': 'AppleRegistration'}, - 'login': {'key': 'login', 'type': 'LoginScopes'}, + "enabled": {"key": "enabled", "type": "bool"}, + "registration": {"key": "registration", "type": "AppleRegistration"}, + "login": {"key": "login", "type": "LoginScopes"}, } def __init__( self, *, enabled: Optional[bool] = None, - registration: Optional["AppleRegistration"] = None, - login: Optional["LoginScopes"] = None, + registration: Optional["_models.AppleRegistration"] = None, + login: Optional["_models.LoginScopes"] = None, **kwargs ): """ @@ -109,13 +100,13 @@ def __init__( :keyword login: The configuration settings of the login flow. :paramtype login: ~azure.mgmt.appcontainers.models.LoginScopes """ - super(Apple, self).__init__(**kwargs) + super().__init__(**kwargs) self.enabled = enabled self.registration = registration self.login = login -class AppleRegistration(msrest.serialization.Model): +class AppleRegistration(_serialization.Model): """The configuration settings of the registration for the Apple provider. :ivar client_id: The Client ID of the app used for login. @@ -125,29 +116,23 @@ class AppleRegistration(msrest.serialization.Model): """ _attribute_map = { - 'client_id': {'key': 'clientId', 'type': 'str'}, - 'client_secret_setting_name': {'key': 'clientSecretSettingName', 'type': 'str'}, + "client_id": {"key": "clientId", "type": "str"}, + "client_secret_setting_name": {"key": "clientSecretSettingName", "type": "str"}, } - def __init__( - self, - *, - client_id: Optional[str] = None, - client_secret_setting_name: Optional[str] = None, - **kwargs - ): + def __init__(self, *, client_id: Optional[str] = None, client_secret_setting_name: Optional[str] = None, **kwargs): """ :keyword client_id: The Client ID of the app used for login. :paramtype client_id: str :keyword client_secret_setting_name: The app setting name that contains the client secret. :paramtype client_secret_setting_name: str """ - super(AppleRegistration, self).__init__(**kwargs) + super().__init__(**kwargs) self.client_id = client_id self.client_secret_setting_name = client_secret_setting_name -class AppLogsConfiguration(msrest.serialization.Model): +class AppLogsConfiguration(_serialization.Model): """Configuration of application logs. :ivar destination: Logs destination. @@ -158,15 +143,15 @@ class AppLogsConfiguration(msrest.serialization.Model): """ _attribute_map = { - 'destination': {'key': 'destination', 'type': 'str'}, - 'log_analytics_configuration': {'key': 'logAnalyticsConfiguration', 'type': 'LogAnalyticsConfiguration'}, + "destination": {"key": "destination", "type": "str"}, + "log_analytics_configuration": {"key": "logAnalyticsConfiguration", "type": "LogAnalyticsConfiguration"}, } def __init__( self, *, destination: Optional[str] = None, - log_analytics_configuration: Optional["LogAnalyticsConfiguration"] = None, + log_analytics_configuration: Optional["_models.LogAnalyticsConfiguration"] = None, **kwargs ): """ @@ -176,12 +161,12 @@ def __init__( :paramtype log_analytics_configuration: ~azure.mgmt.appcontainers.models.LogAnalyticsConfiguration """ - super(AppLogsConfiguration, self).__init__(**kwargs) + super().__init__(**kwargs) self.destination = destination self.log_analytics_configuration = log_analytics_configuration -class AppRegistration(msrest.serialization.Model): +class AppRegistration(_serialization.Model): """The configuration settings of the app registration for providers that have app ids and app secrets. :ivar app_id: The App ID of the app used for login. @@ -191,29 +176,23 @@ class AppRegistration(msrest.serialization.Model): """ _attribute_map = { - 'app_id': {'key': 'appId', 'type': 'str'}, - 'app_secret_setting_name': {'key': 'appSecretSettingName', 'type': 'str'}, + "app_id": {"key": "appId", "type": "str"}, + "app_secret_setting_name": {"key": "appSecretSettingName", "type": "str"}, } - def __init__( - self, - *, - app_id: Optional[str] = None, - app_secret_setting_name: Optional[str] = None, - **kwargs - ): + def __init__(self, *, app_id: Optional[str] = None, app_secret_setting_name: Optional[str] = None, **kwargs): """ :keyword app_id: The App ID of the app used for login. :paramtype app_id: str :keyword app_secret_setting_name: The app setting name that contains the app secret. :paramtype app_secret_setting_name: str """ - super(AppRegistration, self).__init__(**kwargs) + super().__init__(**kwargs) self.app_id = app_id self.app_secret_setting_name = app_secret_setting_name -class Resource(msrest.serialization.Model): +class Resource(_serialization.Model): """Common fields that are returned in the response for all Azure Resource Manager resources. Variables are only populated by the server, and will be ignored when sending a request. @@ -232,26 +211,22 @@ class Resource(msrest.serialization.Model): """ _validation = { - 'id': {'readonly': True}, - 'name': {'readonly': True}, - 'type': {'readonly': True}, - 'system_data': {'readonly': True}, + "id": {"readonly": True}, + "name": {"readonly": True}, + "type": {"readonly": True}, + "system_data": {"readonly": True}, } _attribute_map = { - 'id': {'key': 'id', 'type': 'str'}, - 'name': {'key': 'name', 'type': 'str'}, - 'type': {'key': 'type', 'type': 'str'}, - 'system_data': {'key': 'systemData', 'type': 'SystemData'}, + "id": {"key": "id", "type": "str"}, + "name": {"key": "name", "type": "str"}, + "type": {"key": "type", "type": "str"}, + "system_data": {"key": "systemData", "type": "SystemData"}, } - def __init__( - self, - **kwargs - ): - """ - """ - super(Resource, self).__init__(**kwargs) + def __init__(self, **kwargs): + """ """ + super().__init__(**kwargs) self.id = None self.name = None self.type = None @@ -277,26 +252,22 @@ class ProxyResource(Resource): """ _validation = { - 'id': {'readonly': True}, - 'name': {'readonly': True}, - 'type': {'readonly': True}, - 'system_data': {'readonly': True}, + "id": {"readonly": True}, + "name": {"readonly": True}, + "type": {"readonly": True}, + "system_data": {"readonly": True}, } _attribute_map = { - 'id': {'key': 'id', 'type': 'str'}, - 'name': {'key': 'name', 'type': 'str'}, - 'type': {'key': 'type', 'type': 'str'}, - 'system_data': {'key': 'systemData', 'type': 'SystemData'}, + "id": {"key": "id", "type": "str"}, + "name": {"key": "name", "type": "str"}, + "type": {"key": "type", "type": "str"}, + "system_data": {"key": "systemData", "type": "SystemData"}, } - def __init__( - self, - **kwargs - ): - """ - """ - super(ProxyResource, self).__init__(**kwargs) + def __init__(self, **kwargs): + """ """ + super().__init__(**kwargs) class AuthConfig(ProxyResource): @@ -333,32 +304,32 @@ class AuthConfig(ProxyResource): """ _validation = { - 'id': {'readonly': True}, - 'name': {'readonly': True}, - 'type': {'readonly': True}, - 'system_data': {'readonly': True}, + "id": {"readonly": True}, + "name": {"readonly": True}, + "type": {"readonly": True}, + "system_data": {"readonly": True}, } _attribute_map = { - 'id': {'key': 'id', 'type': 'str'}, - 'name': {'key': 'name', 'type': 'str'}, - 'type': {'key': 'type', 'type': 'str'}, - 'system_data': {'key': 'systemData', 'type': 'SystemData'}, - 'platform': {'key': 'properties.platform', 'type': 'AuthPlatform'}, - 'global_validation': {'key': 'properties.globalValidation', 'type': 'GlobalValidation'}, - 'identity_providers': {'key': 'properties.identityProviders', 'type': 'IdentityProviders'}, - 'login': {'key': 'properties.login', 'type': 'Login'}, - 'http_settings': {'key': 'properties.httpSettings', 'type': 'HttpSettings'}, + "id": {"key": "id", "type": "str"}, + "name": {"key": "name", "type": "str"}, + "type": {"key": "type", "type": "str"}, + "system_data": {"key": "systemData", "type": "SystemData"}, + "platform": {"key": "properties.platform", "type": "AuthPlatform"}, + "global_validation": {"key": "properties.globalValidation", "type": "GlobalValidation"}, + "identity_providers": {"key": "properties.identityProviders", "type": "IdentityProviders"}, + "login": {"key": "properties.login", "type": "Login"}, + "http_settings": {"key": "properties.httpSettings", "type": "HttpSettings"}, } def __init__( self, *, - platform: Optional["AuthPlatform"] = None, - global_validation: Optional["GlobalValidation"] = None, - identity_providers: Optional["IdentityProviders"] = None, - login: Optional["Login"] = None, - http_settings: Optional["HttpSettings"] = None, + platform: Optional["_models.AuthPlatform"] = None, + global_validation: Optional["_models.GlobalValidation"] = None, + identity_providers: Optional["_models.IdentityProviders"] = None, + login: Optional["_models.Login"] = None, + http_settings: Optional["_models.HttpSettings"] = None, **kwargs ): """ @@ -378,7 +349,7 @@ def __init__( authorization requests made against ContainerApp Service Authentication/Authorization. :paramtype http_settings: ~azure.mgmt.appcontainers.models.HttpSettings """ - super(AuthConfig, self).__init__(**kwargs) + super().__init__(**kwargs) self.platform = platform self.global_validation = global_validation self.identity_providers = identity_providers @@ -386,45 +357,40 @@ def __init__( self.http_settings = http_settings -class AuthConfigCollection(msrest.serialization.Model): +class AuthConfigCollection(_serialization.Model): """AuthConfig collection ARM resource. Variables are only populated by the server, and will be ignored when sending a request. All required parameters must be populated in order to send to Azure. - :ivar value: Required. Collection of resources. + :ivar value: Collection of resources. Required. :vartype value: list[~azure.mgmt.appcontainers.models.AuthConfig] :ivar next_link: Link to next page of resources. :vartype next_link: str """ _validation = { - 'value': {'required': True}, - 'next_link': {'readonly': True}, + "value": {"required": True}, + "next_link": {"readonly": True}, } _attribute_map = { - 'value': {'key': 'value', 'type': '[AuthConfig]'}, - 'next_link': {'key': 'nextLink', 'type': 'str'}, + "value": {"key": "value", "type": "[AuthConfig]"}, + "next_link": {"key": "nextLink", "type": "str"}, } - def __init__( - self, - *, - value: List["AuthConfig"], - **kwargs - ): + def __init__(self, *, value: List["_models.AuthConfig"], **kwargs): """ - :keyword value: Required. Collection of resources. + :keyword value: Collection of resources. Required. :paramtype value: list[~azure.mgmt.appcontainers.models.AuthConfig] """ - super(AuthConfigCollection, self).__init__(**kwargs) + super().__init__(**kwargs) self.value = value self.next_link = None -class AuthPlatform(msrest.serialization.Model): +class AuthPlatform(_serialization.Model): """The configuration settings of the platform of ContainerApp Service Authentication/Authorization. :ivar enabled: :code:`true` if the Authentication / Authorization feature is @@ -438,17 +404,11 @@ class AuthPlatform(msrest.serialization.Model): """ _attribute_map = { - 'enabled': {'key': 'enabled', 'type': 'bool'}, - 'runtime_version': {'key': 'runtimeVersion', 'type': 'str'}, + "enabled": {"key": "enabled", "type": "bool"}, + "runtime_version": {"key": "runtimeVersion", "type": "str"}, } - def __init__( - self, - *, - enabled: Optional[bool] = None, - runtime_version: Optional[str] = None, - **kwargs - ): + def __init__(self, *, enabled: Optional[bool] = None, runtime_version: Optional[str] = None, **kwargs): """ :keyword enabled: :code:`true` if the Authentication / Authorization feature is enabled for the current app; otherwise, :code:`false`. @@ -459,12 +419,12 @@ def __init__( Authorization module. :paramtype runtime_version: str """ - super(AuthPlatform, self).__init__(**kwargs) + super().__init__(**kwargs) self.enabled = enabled self.runtime_version = runtime_version -class AvailableOperations(msrest.serialization.Model): +class AvailableOperations(_serialization.Model): """Available operations of the service. :ivar value: Collection of available operation details. @@ -475,16 +435,12 @@ class AvailableOperations(msrest.serialization.Model): """ _attribute_map = { - 'value': {'key': 'value', 'type': '[OperationDetail]'}, - 'next_link': {'key': 'nextLink', 'type': 'str'}, + "value": {"key": "value", "type": "[OperationDetail]"}, + "next_link": {"key": "nextLink", "type": "str"}, } def __init__( - self, - *, - value: Optional[List["OperationDetail"]] = None, - next_link: Optional[str] = None, - **kwargs + self, *, value: Optional[List["_models.OperationDetail"]] = None, next_link: Optional[str] = None, **kwargs ): """ :keyword value: Collection of available operation details. @@ -493,12 +449,12 @@ def __init__( It's null for now, added for future use. :paramtype next_link: str """ - super(AvailableOperations, self).__init__(**kwargs) + super().__init__(**kwargs) self.value = value self.next_link = next_link -class AzureActiveDirectory(msrest.serialization.Model): +class AzureActiveDirectory(_serialization.Model): """The configuration settings of the Azure Active directory provider. :ivar enabled: :code:`false` if the Azure Active Directory provider should not be @@ -520,20 +476,20 @@ class AzureActiveDirectory(msrest.serialization.Model): """ _attribute_map = { - 'enabled': {'key': 'enabled', 'type': 'bool'}, - 'registration': {'key': 'registration', 'type': 'AzureActiveDirectoryRegistration'}, - 'login': {'key': 'login', 'type': 'AzureActiveDirectoryLogin'}, - 'validation': {'key': 'validation', 'type': 'AzureActiveDirectoryValidation'}, - 'is_auto_provisioned': {'key': 'isAutoProvisioned', 'type': 'bool'}, + "enabled": {"key": "enabled", "type": "bool"}, + "registration": {"key": "registration", "type": "AzureActiveDirectoryRegistration"}, + "login": {"key": "login", "type": "AzureActiveDirectoryLogin"}, + "validation": {"key": "validation", "type": "AzureActiveDirectoryValidation"}, + "is_auto_provisioned": {"key": "isAutoProvisioned", "type": "bool"}, } def __init__( self, *, enabled: Optional[bool] = None, - registration: Optional["AzureActiveDirectoryRegistration"] = None, - login: Optional["AzureActiveDirectoryLogin"] = None, - validation: Optional["AzureActiveDirectoryValidation"] = None, + registration: Optional["_models.AzureActiveDirectoryRegistration"] = None, + login: Optional["_models.AzureActiveDirectoryLogin"] = None, + validation: Optional["_models.AzureActiveDirectoryValidation"] = None, is_auto_provisioned: Optional[bool] = None, **kwargs ): @@ -556,7 +512,7 @@ def __init__( read or write to this property. :paramtype is_auto_provisioned: bool """ - super(AzureActiveDirectory, self).__init__(**kwargs) + super().__init__(**kwargs) self.enabled = enabled self.registration = registration self.login = login @@ -564,7 +520,7 @@ def __init__( self.is_auto_provisioned = is_auto_provisioned -class AzureActiveDirectoryLogin(msrest.serialization.Model): +class AzureActiveDirectoryLogin(_serialization.Model): """The configuration settings of the Azure Active Directory login flow. :ivar login_parameters: Login parameters to send to the OpenID Connect authorization endpoint @@ -577,16 +533,12 @@ class AzureActiveDirectoryLogin(msrest.serialization.Model): """ _attribute_map = { - 'login_parameters': {'key': 'loginParameters', 'type': '[str]'}, - 'disable_www_authenticate': {'key': 'disableWWWAuthenticate', 'type': 'bool'}, + "login_parameters": {"key": "loginParameters", "type": "[str]"}, + "disable_www_authenticate": {"key": "disableWWWAuthenticate", "type": "bool"}, } def __init__( - self, - *, - login_parameters: Optional[List[str]] = None, - disable_www_authenticate: Optional[bool] = None, - **kwargs + self, *, login_parameters: Optional[List[str]] = None, disable_www_authenticate: Optional[bool] = None, **kwargs ): """ :keyword login_parameters: Login parameters to send to the OpenID Connect authorization @@ -597,12 +549,12 @@ def __init__( should be omitted from the request; otherwise, :code:`false`. :paramtype disable_www_authenticate: bool """ - super(AzureActiveDirectoryLogin, self).__init__(**kwargs) + super().__init__(**kwargs) self.login_parameters = login_parameters self.disable_www_authenticate = disable_www_authenticate -class AzureActiveDirectoryRegistration(msrest.serialization.Model): +class AzureActiveDirectoryRegistration(_serialization.Model): """The configuration settings of the Azure Active Directory app registration. :ivar open_id_issuer: The OpenID Connect Issuer URI that represents the entity which issues @@ -638,12 +590,15 @@ class AzureActiveDirectoryRegistration(msrest.serialization.Model): """ _attribute_map = { - 'open_id_issuer': {'key': 'openIdIssuer', 'type': 'str'}, - 'client_id': {'key': 'clientId', 'type': 'str'}, - 'client_secret_setting_name': {'key': 'clientSecretSettingName', 'type': 'str'}, - 'client_secret_certificate_thumbprint': {'key': 'clientSecretCertificateThumbprint', 'type': 'str'}, - 'client_secret_certificate_subject_alternative_name': {'key': 'clientSecretCertificateSubjectAlternativeName', 'type': 'str'}, - 'client_secret_certificate_issuer': {'key': 'clientSecretCertificateIssuer', 'type': 'str'}, + "open_id_issuer": {"key": "openIdIssuer", "type": "str"}, + "client_id": {"key": "clientId", "type": "str"}, + "client_secret_setting_name": {"key": "clientSecretSettingName", "type": "str"}, + "client_secret_certificate_thumbprint": {"key": "clientSecretCertificateThumbprint", "type": "str"}, + "client_secret_certificate_subject_alternative_name": { + "key": "clientSecretCertificateSubjectAlternativeName", + "type": "str", + }, + "client_secret_certificate_issuer": {"key": "clientSecretCertificateIssuer", "type": "str"}, } def __init__( @@ -689,7 +644,7 @@ def __init__( a replacement for the Client Secret Certificate Thumbprint. It is also optional. :paramtype client_secret_certificate_issuer: str """ - super(AzureActiveDirectoryRegistration, self).__init__(**kwargs) + super().__init__(**kwargs) self.open_id_issuer = open_id_issuer self.client_id = client_id self.client_secret_setting_name = client_secret_setting_name @@ -698,7 +653,7 @@ def __init__( self.client_secret_certificate_issuer = client_secret_certificate_issuer -class AzureActiveDirectoryValidation(msrest.serialization.Model): +class AzureActiveDirectoryValidation(_serialization.Model): """The configuration settings of the Azure Active Directory token validation flow. :ivar jwt_claim_checks: The configuration settings of the checks that should be made while @@ -714,17 +669,17 @@ class AzureActiveDirectoryValidation(msrest.serialization.Model): """ _attribute_map = { - 'jwt_claim_checks': {'key': 'jwtClaimChecks', 'type': 'JwtClaimChecks'}, - 'allowed_audiences': {'key': 'allowedAudiences', 'type': '[str]'}, - 'default_authorization_policy': {'key': 'defaultAuthorizationPolicy', 'type': 'DefaultAuthorizationPolicy'}, + "jwt_claim_checks": {"key": "jwtClaimChecks", "type": "JwtClaimChecks"}, + "allowed_audiences": {"key": "allowedAudiences", "type": "[str]"}, + "default_authorization_policy": {"key": "defaultAuthorizationPolicy", "type": "DefaultAuthorizationPolicy"}, } def __init__( self, *, - jwt_claim_checks: Optional["JwtClaimChecks"] = None, + jwt_claim_checks: Optional["_models.JwtClaimChecks"] = None, allowed_audiences: Optional[List[str]] = None, - default_authorization_policy: Optional["DefaultAuthorizationPolicy"] = None, + default_authorization_policy: Optional["_models.DefaultAuthorizationPolicy"] = None, **kwargs ): """ @@ -739,13 +694,13 @@ def __init__( :paramtype default_authorization_policy: ~azure.mgmt.appcontainers.models.DefaultAuthorizationPolicy """ - super(AzureActiveDirectoryValidation, self).__init__(**kwargs) + super().__init__(**kwargs) self.jwt_claim_checks = jwt_claim_checks self.allowed_audiences = allowed_audiences self.default_authorization_policy = default_authorization_policy -class AzureCredentials(msrest.serialization.Model): +class AzureCredentials(_serialization.Model): """Container App credentials. :ivar client_id: Client Id. @@ -759,10 +714,10 @@ class AzureCredentials(msrest.serialization.Model): """ _attribute_map = { - 'client_id': {'key': 'clientId', 'type': 'str'}, - 'client_secret': {'key': 'clientSecret', 'type': 'str'}, - 'tenant_id': {'key': 'tenantId', 'type': 'str'}, - 'subscription_id': {'key': 'subscriptionId', 'type': 'str'}, + "client_id": {"key": "clientId", "type": "str"}, + "client_secret": {"key": "clientSecret", "type": "str"}, + "tenant_id": {"key": "tenantId", "type": "str"}, + "subscription_id": {"key": "subscriptionId", "type": "str"}, } def __init__( @@ -784,31 +739,31 @@ def __init__( :keyword subscription_id: Subscription Id. :paramtype subscription_id: str """ - super(AzureCredentials, self).__init__(**kwargs) + super().__init__(**kwargs) self.client_id = client_id self.client_secret = client_secret self.tenant_id = tenant_id self.subscription_id = subscription_id -class AzureFileProperties(msrest.serialization.Model): +class AzureFileProperties(_serialization.Model): """Azure File Properties. :ivar account_name: Storage account name for azure file. :vartype account_name: str :ivar account_key: Storage account key for azure file. :vartype account_key: str - :ivar access_mode: Access mode for storage. Possible values include: "ReadOnly", "ReadWrite". + :ivar access_mode: Access mode for storage. Known values are: "ReadOnly" and "ReadWrite". :vartype access_mode: str or ~azure.mgmt.appcontainers.models.AccessMode :ivar share_name: Azure file share name. :vartype share_name: str """ _attribute_map = { - 'account_name': {'key': 'accountName', 'type': 'str'}, - 'account_key': {'key': 'accountKey', 'type': 'str'}, - 'access_mode': {'key': 'accessMode', 'type': 'str'}, - 'share_name': {'key': 'shareName', 'type': 'str'}, + "account_name": {"key": "accountName", "type": "str"}, + "account_key": {"key": "accountKey", "type": "str"}, + "access_mode": {"key": "accessMode", "type": "str"}, + "share_name": {"key": "shareName", "type": "str"}, } def __init__( @@ -816,7 +771,7 @@ def __init__( *, account_name: Optional[str] = None, account_key: Optional[str] = None, - access_mode: Optional[Union[str, "AccessMode"]] = None, + access_mode: Optional[Union[str, "_models.AccessMode"]] = None, share_name: Optional[str] = None, **kwargs ): @@ -825,20 +780,19 @@ def __init__( :paramtype account_name: str :keyword account_key: Storage account key for azure file. :paramtype account_key: str - :keyword access_mode: Access mode for storage. Possible values include: "ReadOnly", - "ReadWrite". + :keyword access_mode: Access mode for storage. Known values are: "ReadOnly" and "ReadWrite". :paramtype access_mode: str or ~azure.mgmt.appcontainers.models.AccessMode :keyword share_name: Azure file share name. :paramtype share_name: str """ - super(AzureFileProperties, self).__init__(**kwargs) + super().__init__(**kwargs) self.account_name = account_name self.account_key = account_key self.access_mode = access_mode self.share_name = share_name -class AzureStaticWebApps(msrest.serialization.Model): +class AzureStaticWebApps(_serialization.Model): """The configuration settings of the Azure Static Web Apps provider. :ivar enabled: :code:`false` if the Azure Static Web Apps provider should not be @@ -849,15 +803,15 @@ class AzureStaticWebApps(msrest.serialization.Model): """ _attribute_map = { - 'enabled': {'key': 'enabled', 'type': 'bool'}, - 'registration': {'key': 'registration', 'type': 'AzureStaticWebAppsRegistration'}, + "enabled": {"key": "enabled", "type": "bool"}, + "registration": {"key": "registration", "type": "AzureStaticWebAppsRegistration"}, } def __init__( self, *, enabled: Optional[bool] = None, - registration: Optional["AzureStaticWebAppsRegistration"] = None, + registration: Optional["_models.AzureStaticWebAppsRegistration"] = None, **kwargs ): """ @@ -867,12 +821,12 @@ def __init__( :keyword registration: The configuration settings of the Azure Static Web Apps registration. :paramtype registration: ~azure.mgmt.appcontainers.models.AzureStaticWebAppsRegistration """ - super(AzureStaticWebApps, self).__init__(**kwargs) + super().__init__(**kwargs) self.enabled = enabled self.registration = registration -class AzureStaticWebAppsRegistration(msrest.serialization.Model): +class AzureStaticWebAppsRegistration(_serialization.Model): """The configuration settings of the registration for the Azure Static Web Apps provider. :ivar client_id: The Client ID of the app used for login. @@ -880,20 +834,15 @@ class AzureStaticWebAppsRegistration(msrest.serialization.Model): """ _attribute_map = { - 'client_id': {'key': 'clientId', 'type': 'str'}, + "client_id": {"key": "clientId", "type": "str"}, } - def __init__( - self, - *, - client_id: Optional[str] = None, - **kwargs - ): + def __init__(self, *, client_id: Optional[str] = None, **kwargs): """ :keyword client_id: The Client ID of the app used for login. :paramtype client_id: str """ - super(AzureStaticWebAppsRegistration, self).__init__(**kwargs) + super().__init__(**kwargs) self.client_id = client_id @@ -915,43 +864,37 @@ class TrackedResource(Resource): :ivar system_data: Azure Resource Manager metadata containing createdBy and modifiedBy information. :vartype system_data: ~azure.mgmt.appcontainers.models.SystemData - :ivar tags: A set of tags. Resource tags. + :ivar tags: Resource tags. :vartype tags: dict[str, str] - :ivar location: Required. The geo-location where the resource lives. + :ivar location: The geo-location where the resource lives. Required. :vartype location: str """ _validation = { - 'id': {'readonly': True}, - 'name': {'readonly': True}, - 'type': {'readonly': True}, - 'system_data': {'readonly': True}, - 'location': {'required': True}, + "id": {"readonly": True}, + "name": {"readonly": True}, + "type": {"readonly": True}, + "system_data": {"readonly": True}, + "location": {"required": True}, } _attribute_map = { - 'id': {'key': 'id', 'type': 'str'}, - 'name': {'key': 'name', 'type': 'str'}, - 'type': {'key': 'type', 'type': 'str'}, - 'system_data': {'key': 'systemData', 'type': 'SystemData'}, - 'tags': {'key': 'tags', 'type': '{str}'}, - 'location': {'key': 'location', 'type': 'str'}, + "id": {"key": "id", "type": "str"}, + "name": {"key": "name", "type": "str"}, + "type": {"key": "type", "type": "str"}, + "system_data": {"key": "systemData", "type": "SystemData"}, + "tags": {"key": "tags", "type": "{str}"}, + "location": {"key": "location", "type": "str"}, } - def __init__( - self, - *, - location: str, - tags: Optional[Dict[str, str]] = None, - **kwargs - ): + def __init__(self, *, location: str, tags: Optional[Dict[str, str]] = None, **kwargs): """ - :keyword tags: A set of tags. Resource tags. + :keyword tags: Resource tags. :paramtype tags: dict[str, str] - :keyword location: Required. The geo-location where the resource lives. + :keyword location: The geo-location where the resource lives. Required. :paramtype location: str """ - super(TrackedResource, self).__init__(**kwargs) + super().__init__(**kwargs) self.tags = tags self.location = location @@ -974,30 +917,30 @@ class Certificate(TrackedResource): :ivar system_data: Azure Resource Manager metadata containing createdBy and modifiedBy information. :vartype system_data: ~azure.mgmt.appcontainers.models.SystemData - :ivar tags: A set of tags. Resource tags. + :ivar tags: Resource tags. :vartype tags: dict[str, str] - :ivar location: Required. The geo-location where the resource lives. + :ivar location: The geo-location where the resource lives. Required. :vartype location: str :ivar properties: Certificate resource specific properties. :vartype properties: ~azure.mgmt.appcontainers.models.CertificateProperties """ _validation = { - 'id': {'readonly': True}, - 'name': {'readonly': True}, - 'type': {'readonly': True}, - 'system_data': {'readonly': True}, - 'location': {'required': True}, + "id": {"readonly": True}, + "name": {"readonly": True}, + "type": {"readonly": True}, + "system_data": {"readonly": True}, + "location": {"required": True}, } _attribute_map = { - 'id': {'key': 'id', 'type': 'str'}, - 'name': {'key': 'name', 'type': 'str'}, - 'type': {'key': 'type', 'type': 'str'}, - 'system_data': {'key': 'systemData', 'type': 'SystemData'}, - 'tags': {'key': 'tags', 'type': '{str}'}, - 'location': {'key': 'location', 'type': 'str'}, - 'properties': {'key': 'properties', 'type': 'CertificateProperties'}, + "id": {"key": "id", "type": "str"}, + "name": {"key": "name", "type": "str"}, + "type": {"key": "type", "type": "str"}, + "system_data": {"key": "systemData", "type": "SystemData"}, + "tags": {"key": "tags", "type": "{str}"}, + "location": {"key": "location", "type": "str"}, + "properties": {"key": "properties", "type": "CertificateProperties"}, } def __init__( @@ -1005,91 +948,81 @@ def __init__( *, location: str, tags: Optional[Dict[str, str]] = None, - properties: Optional["CertificateProperties"] = None, + properties: Optional["_models.CertificateProperties"] = None, **kwargs ): """ - :keyword tags: A set of tags. Resource tags. + :keyword tags: Resource tags. :paramtype tags: dict[str, str] - :keyword location: Required. The geo-location where the resource lives. + :keyword location: The geo-location where the resource lives. Required. :paramtype location: str :keyword properties: Certificate resource specific properties. :paramtype properties: ~azure.mgmt.appcontainers.models.CertificateProperties """ - super(Certificate, self).__init__(tags=tags, location=location, **kwargs) + super().__init__(tags=tags, location=location, **kwargs) self.properties = properties -class CertificateCollection(msrest.serialization.Model): +class CertificateCollection(_serialization.Model): """Collection of Certificates. Variables are only populated by the server, and will be ignored when sending a request. All required parameters must be populated in order to send to Azure. - :ivar value: Required. Collection of resources. + :ivar value: Collection of resources. Required. :vartype value: list[~azure.mgmt.appcontainers.models.Certificate] :ivar next_link: Link to next page of resources. :vartype next_link: str """ _validation = { - 'value': {'required': True}, - 'next_link': {'readonly': True}, + "value": {"required": True}, + "next_link": {"readonly": True}, } _attribute_map = { - 'value': {'key': 'value', 'type': '[Certificate]'}, - 'next_link': {'key': 'nextLink', 'type': 'str'}, + "value": {"key": "value", "type": "[Certificate]"}, + "next_link": {"key": "nextLink", "type": "str"}, } - def __init__( - self, - *, - value: List["Certificate"], - **kwargs - ): + def __init__(self, *, value: List["_models.Certificate"], **kwargs): """ - :keyword value: Required. Collection of resources. + :keyword value: Collection of resources. Required. :paramtype value: list[~azure.mgmt.appcontainers.models.Certificate] """ - super(CertificateCollection, self).__init__(**kwargs) + super().__init__(**kwargs) self.value = value self.next_link = None -class CertificatePatch(msrest.serialization.Model): +class CertificatePatch(_serialization.Model): """A certificate to update. - :ivar tags: A set of tags. Application-specific metadata in the form of key-value pairs. + :ivar tags: Application-specific metadata in the form of key-value pairs. :vartype tags: dict[str, str] """ _attribute_map = { - 'tags': {'key': 'tags', 'type': '{str}'}, + "tags": {"key": "tags", "type": "{str}"}, } - def __init__( - self, - *, - tags: Optional[Dict[str, str]] = None, - **kwargs - ): + def __init__(self, *, tags: Optional[Dict[str, str]] = None, **kwargs): """ - :keyword tags: A set of tags. Application-specific metadata in the form of key-value pairs. + :keyword tags: Application-specific metadata in the form of key-value pairs. :paramtype tags: dict[str, str] """ - super(CertificatePatch, self).__init__(**kwargs) + super().__init__(**kwargs) self.tags = tags -class CertificateProperties(msrest.serialization.Model): +class CertificateProperties(_serialization.Model): """Certificate resource specific properties. Variables are only populated by the server, and will be ignored when sending a request. - :ivar provisioning_state: Provisioning state of the certificate. Possible values include: - "Succeeded", "Failed", "Canceled", "DeleteFailed", "Pending". + :ivar provisioning_state: Provisioning state of the certificate. Known values are: "Succeeded", + "Failed", "Canceled", "DeleteFailed", and "Pending". :vartype provisioning_state: str or ~azure.mgmt.appcontainers.models.CertificateProvisioningState :ivar password: Certificate password. @@ -1097,7 +1030,7 @@ class CertificateProperties(msrest.serialization.Model): :ivar subject_name: Subject name of the certificate. :vartype subject_name: str :ivar value: PFX or PEM blob. - :vartype value: bytearray + :vartype value: bytes :ivar issuer: Certificate issuer. :vartype issuer: str :ivar issue_date: Certificate issue Date. @@ -1113,43 +1046,37 @@ class CertificateProperties(msrest.serialization.Model): """ _validation = { - 'provisioning_state': {'readonly': True}, - 'subject_name': {'readonly': True}, - 'issuer': {'readonly': True}, - 'issue_date': {'readonly': True}, - 'expiration_date': {'readonly': True}, - 'thumbprint': {'readonly': True}, - 'valid': {'readonly': True}, - 'public_key_hash': {'readonly': True}, + "provisioning_state": {"readonly": True}, + "subject_name": {"readonly": True}, + "issuer": {"readonly": True}, + "issue_date": {"readonly": True}, + "expiration_date": {"readonly": True}, + "thumbprint": {"readonly": True}, + "valid": {"readonly": True}, + "public_key_hash": {"readonly": True}, } _attribute_map = { - 'provisioning_state': {'key': 'provisioningState', 'type': 'str'}, - 'password': {'key': 'password', 'type': 'str'}, - 'subject_name': {'key': 'subjectName', 'type': 'str'}, - 'value': {'key': 'value', 'type': 'bytearray'}, - 'issuer': {'key': 'issuer', 'type': 'str'}, - 'issue_date': {'key': 'issueDate', 'type': 'iso-8601'}, - 'expiration_date': {'key': 'expirationDate', 'type': 'iso-8601'}, - 'thumbprint': {'key': 'thumbprint', 'type': 'str'}, - 'valid': {'key': 'valid', 'type': 'bool'}, - 'public_key_hash': {'key': 'publicKeyHash', 'type': 'str'}, + "provisioning_state": {"key": "provisioningState", "type": "str"}, + "password": {"key": "password", "type": "str"}, + "subject_name": {"key": "subjectName", "type": "str"}, + "value": {"key": "value", "type": "bytearray"}, + "issuer": {"key": "issuer", "type": "str"}, + "issue_date": {"key": "issueDate", "type": "iso-8601"}, + "expiration_date": {"key": "expirationDate", "type": "iso-8601"}, + "thumbprint": {"key": "thumbprint", "type": "str"}, + "valid": {"key": "valid", "type": "bool"}, + "public_key_hash": {"key": "publicKeyHash", "type": "str"}, } - def __init__( - self, - *, - password: Optional[str] = None, - value: Optional[bytearray] = None, - **kwargs - ): + def __init__(self, *, password: Optional[str] = None, value: Optional[bytes] = None, **kwargs): """ :keyword password: Certificate password. :paramtype password: str :keyword value: PFX or PEM blob. - :paramtype value: bytearray + :paramtype value: bytes """ - super(CertificateProperties, self).__init__(**kwargs) + super().__init__(**kwargs) self.provisioning_state = None self.password = password self.subject_name = None @@ -1162,7 +1089,7 @@ def __init__( self.public_key_hash = None -class CheckNameAvailabilityRequest(msrest.serialization.Model): +class CheckNameAvailabilityRequest(_serialization.Model): """The check availability request body. :ivar name: The name of the resource for which availability needs to be checked. @@ -1172,70 +1099,64 @@ class CheckNameAvailabilityRequest(msrest.serialization.Model): """ _attribute_map = { - 'name': {'key': 'name', 'type': 'str'}, - 'type': {'key': 'type', 'type': 'str'}, + "name": {"key": "name", "type": "str"}, + "type": {"key": "type", "type": "str"}, } - def __init__( - self, - *, - name: Optional[str] = None, - type: Optional[str] = None, - **kwargs - ): + def __init__(self, *, name: Optional[str] = None, type: Optional[str] = None, **kwargs): """ :keyword name: The name of the resource for which availability needs to be checked. :paramtype name: str :keyword type: The resource type. :paramtype type: str """ - super(CheckNameAvailabilityRequest, self).__init__(**kwargs) + super().__init__(**kwargs) self.name = name self.type = type -class CheckNameAvailabilityResponse(msrest.serialization.Model): +class CheckNameAvailabilityResponse(_serialization.Model): """The check availability result. :ivar name_available: Indicates if the resource name is available. :vartype name_available: bool - :ivar reason: The reason why the given name is not available. Possible values include: - "Invalid", "AlreadyExists". + :ivar reason: The reason why the given name is not available. Known values are: "Invalid" and + "AlreadyExists". :vartype reason: str or ~azure.mgmt.appcontainers.models.CheckNameAvailabilityReason :ivar message: Detailed reason why the given name is available. :vartype message: str """ _attribute_map = { - 'name_available': {'key': 'nameAvailable', 'type': 'bool'}, - 'reason': {'key': 'reason', 'type': 'str'}, - 'message': {'key': 'message', 'type': 'str'}, + "name_available": {"key": "nameAvailable", "type": "bool"}, + "reason": {"key": "reason", "type": "str"}, + "message": {"key": "message", "type": "str"}, } def __init__( self, *, name_available: Optional[bool] = None, - reason: Optional[Union[str, "CheckNameAvailabilityReason"]] = None, + reason: Optional[Union[str, "_models.CheckNameAvailabilityReason"]] = None, message: Optional[str] = None, **kwargs ): """ :keyword name_available: Indicates if the resource name is available. :paramtype name_available: bool - :keyword reason: The reason why the given name is not available. Possible values include: - "Invalid", "AlreadyExists". + :keyword reason: The reason why the given name is not available. Known values are: "Invalid" + and "AlreadyExists". :paramtype reason: str or ~azure.mgmt.appcontainers.models.CheckNameAvailabilityReason :keyword message: Detailed reason why the given name is available. :paramtype message: str """ - super(CheckNameAvailabilityResponse, self).__init__(**kwargs) + super().__init__(**kwargs) self.name_available = name_available self.reason = reason self.message = message -class ClientRegistration(msrest.serialization.Model): +class ClientRegistration(_serialization.Model): """The configuration settings of the app registration for providers that have client ids and client secrets. :ivar client_id: The Client ID of the app used for login. @@ -1245,42 +1166,36 @@ class ClientRegistration(msrest.serialization.Model): """ _attribute_map = { - 'client_id': {'key': 'clientId', 'type': 'str'}, - 'client_secret_setting_name': {'key': 'clientSecretSettingName', 'type': 'str'}, + "client_id": {"key": "clientId", "type": "str"}, + "client_secret_setting_name": {"key": "clientSecretSettingName", "type": "str"}, } - def __init__( - self, - *, - client_id: Optional[str] = None, - client_secret_setting_name: Optional[str] = None, - **kwargs - ): + def __init__(self, *, client_id: Optional[str] = None, client_secret_setting_name: Optional[str] = None, **kwargs): """ :keyword client_id: The Client ID of the app used for login. :paramtype client_id: str :keyword client_secret_setting_name: The app setting name that contains the client secret. :paramtype client_secret_setting_name: str """ - super(ClientRegistration, self).__init__(**kwargs) + super().__init__(**kwargs) self.client_id = client_id self.client_secret_setting_name = client_secret_setting_name -class Configuration(msrest.serialization.Model): +class Configuration(_serialization.Model): """Non versioned Container App configuration properties that define the mutable settings of a Container app. :ivar secrets: Collection of secrets used by a Container app. :vartype secrets: list[~azure.mgmt.appcontainers.models.Secret] :ivar active_revisions_mode: ActiveRevisionsMode controls how active revisions are handled for the Container app: - - + + .. raw:: html - + Multiple: multiple revisions can be active.Single: Only one revision can be active at a time. Revision weights can not be used in this mode. If no value if - provided, this is the default.. Possible values include: "Multiple", "Single". + provided, this is the default.. Known values are: "Multiple" and "Single". :vartype active_revisions_mode: str or ~azure.mgmt.appcontainers.models.ActiveRevisionsMode :ivar ingress: Ingress configurations. :vartype ingress: ~azure.mgmt.appcontainers.models.Ingress @@ -1292,21 +1207,21 @@ class Configuration(msrest.serialization.Model): """ _attribute_map = { - 'secrets': {'key': 'secrets', 'type': '[Secret]'}, - 'active_revisions_mode': {'key': 'activeRevisionsMode', 'type': 'str'}, - 'ingress': {'key': 'ingress', 'type': 'Ingress'}, - 'registries': {'key': 'registries', 'type': '[RegistryCredentials]'}, - 'dapr': {'key': 'dapr', 'type': 'Dapr'}, + "secrets": {"key": "secrets", "type": "[Secret]"}, + "active_revisions_mode": {"key": "activeRevisionsMode", "type": "str"}, + "ingress": {"key": "ingress", "type": "Ingress"}, + "registries": {"key": "registries", "type": "[RegistryCredentials]"}, + "dapr": {"key": "dapr", "type": "Dapr"}, } def __init__( self, *, - secrets: Optional[List["Secret"]] = None, - active_revisions_mode: Optional[Union[str, "ActiveRevisionsMode"]] = None, - ingress: Optional["Ingress"] = None, - registries: Optional[List["RegistryCredentials"]] = None, - dapr: Optional["Dapr"] = None, + secrets: Optional[List["_models.Secret"]] = None, + active_revisions_mode: Optional[Union[str, "_models.ActiveRevisionsMode"]] = None, + ingress: Optional["_models.Ingress"] = None, + registries: Optional[List["_models.RegistryCredentials"]] = None, + dapr: Optional["_models.Dapr"] = None, **kwargs ): """ @@ -1314,13 +1229,13 @@ def __init__( :paramtype secrets: list[~azure.mgmt.appcontainers.models.Secret] :keyword active_revisions_mode: ActiveRevisionsMode controls how active revisions are handled for the Container app: - - + + .. raw:: html - + Multiple: multiple revisions can be active.Single: Only one revision can be active at a time. Revision weights can not be used in this mode. If no value if - provided, this is the default.. Possible values include: "Multiple", "Single". + provided, this is the default.. Known values are: "Multiple" and "Single". :paramtype active_revisions_mode: str or ~azure.mgmt.appcontainers.models.ActiveRevisionsMode :keyword ingress: Ingress configurations. :paramtype ingress: ~azure.mgmt.appcontainers.models.Ingress @@ -1330,7 +1245,7 @@ def __init__( :keyword dapr: Dapr configuration for the Container App. :paramtype dapr: ~azure.mgmt.appcontainers.models.Dapr """ - super(Configuration, self).__init__(**kwargs) + super().__init__(**kwargs) self.secrets = secrets self.active_revisions_mode = active_revisions_mode self.ingress = ingress @@ -1338,7 +1253,7 @@ def __init__( self.dapr = dapr -class Container(msrest.serialization.Model): +class Container(_serialization.Model): """Container App container definition. :ivar image: Container image tag. @@ -1360,14 +1275,14 @@ class Container(msrest.serialization.Model): """ _attribute_map = { - 'image': {'key': 'image', 'type': 'str'}, - 'name': {'key': 'name', 'type': 'str'}, - 'command': {'key': 'command', 'type': '[str]'}, - 'args': {'key': 'args', 'type': '[str]'}, - 'env': {'key': 'env', 'type': '[EnvironmentVar]'}, - 'resources': {'key': 'resources', 'type': 'ContainerResources'}, - 'probes': {'key': 'probes', 'type': '[ContainerAppProbe]'}, - 'volume_mounts': {'key': 'volumeMounts', 'type': '[VolumeMount]'}, + "image": {"key": "image", "type": "str"}, + "name": {"key": "name", "type": "str"}, + "command": {"key": "command", "type": "[str]"}, + "args": {"key": "args", "type": "[str]"}, + "env": {"key": "env", "type": "[EnvironmentVar]"}, + "resources": {"key": "resources", "type": "ContainerResources"}, + "probes": {"key": "probes", "type": "[ContainerAppProbe]"}, + "volume_mounts": {"key": "volumeMounts", "type": "[VolumeMount]"}, } def __init__( @@ -1377,10 +1292,10 @@ def __init__( name: Optional[str] = None, command: Optional[List[str]] = None, args: Optional[List[str]] = None, - env: Optional[List["EnvironmentVar"]] = None, - resources: Optional["ContainerResources"] = None, - probes: Optional[List["ContainerAppProbe"]] = None, - volume_mounts: Optional[List["VolumeMount"]] = None, + env: Optional[List["_models.EnvironmentVar"]] = None, + resources: Optional["_models.ContainerResources"] = None, + probes: Optional[List["_models.ContainerAppProbe"]] = None, + volume_mounts: Optional[List["_models.VolumeMount"]] = None, **kwargs ): """ @@ -1401,7 +1316,7 @@ def __init__( :keyword volume_mounts: Container volume mounts. :paramtype volume_mounts: list[~azure.mgmt.appcontainers.models.VolumeMount] """ - super(Container, self).__init__(**kwargs) + super().__init__(**kwargs) self.image = image self.name = name self.command = command @@ -1412,7 +1327,7 @@ def __init__( self.volume_mounts = volume_mounts -class ContainerApp(TrackedResource): +class ContainerApp(TrackedResource): # pylint: disable=too-many-instance-attributes """Container App. Variables are only populated by the server, and will be ignored when sending a request. @@ -1430,15 +1345,15 @@ class ContainerApp(TrackedResource): :ivar system_data: Azure Resource Manager metadata containing createdBy and modifiedBy information. :vartype system_data: ~azure.mgmt.appcontainers.models.SystemData - :ivar tags: A set of tags. Resource tags. + :ivar tags: Resource tags. :vartype tags: dict[str, str] - :ivar location: Required. The geo-location where the resource lives. + :ivar location: The geo-location where the resource lives. Required. :vartype location: str :ivar identity: managed identities for the Container App to interact with other Azure services without maintaining any secrets or credentials in code. :vartype identity: ~azure.mgmt.appcontainers.models.ManagedServiceIdentity - :ivar provisioning_state: Provisioning state of the Container App. Possible values include: - "InProgress", "Succeeded", "Failed", "Canceled". + :ivar provisioning_state: Provisioning state of the Container App. Known values are: + "InProgress", "Succeeded", "Failed", "Canceled", and "Deleting". :vartype provisioning_state: str or ~azure.mgmt.appcontainers.models.ContainerAppProvisioningState :ivar managed_environment_id: Resource ID of the Container App's environment. @@ -1459,34 +1374,34 @@ class ContainerApp(TrackedResource): """ _validation = { - 'id': {'readonly': True}, - 'name': {'readonly': True}, - 'type': {'readonly': True}, - 'system_data': {'readonly': True}, - 'location': {'required': True}, - 'provisioning_state': {'readonly': True}, - 'latest_revision_name': {'readonly': True}, - 'latest_revision_fqdn': {'readonly': True}, - 'custom_domain_verification_id': {'readonly': True}, - 'outbound_ip_addresses': {'readonly': True}, + "id": {"readonly": True}, + "name": {"readonly": True}, + "type": {"readonly": True}, + "system_data": {"readonly": True}, + "location": {"required": True}, + "provisioning_state": {"readonly": True}, + "latest_revision_name": {"readonly": True}, + "latest_revision_fqdn": {"readonly": True}, + "custom_domain_verification_id": {"readonly": True}, + "outbound_ip_addresses": {"readonly": True}, } _attribute_map = { - 'id': {'key': 'id', 'type': 'str'}, - 'name': {'key': 'name', 'type': 'str'}, - 'type': {'key': 'type', 'type': 'str'}, - 'system_data': {'key': 'systemData', 'type': 'SystemData'}, - 'tags': {'key': 'tags', 'type': '{str}'}, - 'location': {'key': 'location', 'type': 'str'}, - 'identity': {'key': 'identity', 'type': 'ManagedServiceIdentity'}, - 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, - 'managed_environment_id': {'key': 'properties.managedEnvironmentId', 'type': 'str'}, - 'latest_revision_name': {'key': 'properties.latestRevisionName', 'type': 'str'}, - 'latest_revision_fqdn': {'key': 'properties.latestRevisionFqdn', 'type': 'str'}, - 'custom_domain_verification_id': {'key': 'properties.customDomainVerificationId', 'type': 'str'}, - 'configuration': {'key': 'properties.configuration', 'type': 'Configuration'}, - 'template': {'key': 'properties.template', 'type': 'Template'}, - 'outbound_ip_addresses': {'key': 'properties.outboundIPAddresses', 'type': '[str]'}, + "id": {"key": "id", "type": "str"}, + "name": {"key": "name", "type": "str"}, + "type": {"key": "type", "type": "str"}, + "system_data": {"key": "systemData", "type": "SystemData"}, + "tags": {"key": "tags", "type": "{str}"}, + "location": {"key": "location", "type": "str"}, + "identity": {"key": "identity", "type": "ManagedServiceIdentity"}, + "provisioning_state": {"key": "properties.provisioningState", "type": "str"}, + "managed_environment_id": {"key": "properties.managedEnvironmentId", "type": "str"}, + "latest_revision_name": {"key": "properties.latestRevisionName", "type": "str"}, + "latest_revision_fqdn": {"key": "properties.latestRevisionFqdn", "type": "str"}, + "custom_domain_verification_id": {"key": "properties.customDomainVerificationId", "type": "str"}, + "configuration": {"key": "properties.configuration", "type": "Configuration"}, + "template": {"key": "properties.template", "type": "Template"}, + "outbound_ip_addresses": {"key": "properties.outboundIPAddresses", "type": "[str]"}, } def __init__( @@ -1494,16 +1409,16 @@ def __init__( *, location: str, tags: Optional[Dict[str, str]] = None, - identity: Optional["ManagedServiceIdentity"] = None, + identity: Optional["_models.ManagedServiceIdentity"] = None, managed_environment_id: Optional[str] = None, - configuration: Optional["Configuration"] = None, - template: Optional["Template"] = None, + configuration: Optional["_models.Configuration"] = None, + template: Optional["_models.Template"] = None, **kwargs ): """ - :keyword tags: A set of tags. Resource tags. + :keyword tags: Resource tags. :paramtype tags: dict[str, str] - :keyword location: Required. The geo-location where the resource lives. + :keyword location: The geo-location where the resource lives. Required. :paramtype location: str :keyword identity: managed identities for the Container App to interact with other Azure services without maintaining any secrets or credentials in code. @@ -1515,7 +1430,7 @@ def __init__( :keyword template: Container App versioned application definition. :paramtype template: ~azure.mgmt.appcontainers.models.Template """ - super(ContainerApp, self).__init__(tags=tags, location=location, **kwargs) + super().__init__(tags=tags, location=location, **kwargs) self.identity = identity self.provisioning_state = None self.managed_environment_id = managed_environment_id @@ -1527,45 +1442,40 @@ def __init__( self.outbound_ip_addresses = None -class ContainerAppCollection(msrest.serialization.Model): +class ContainerAppCollection(_serialization.Model): """Container App collection ARM resource. Variables are only populated by the server, and will be ignored when sending a request. All required parameters must be populated in order to send to Azure. - :ivar value: Required. Collection of resources. + :ivar value: Collection of resources. Required. :vartype value: list[~azure.mgmt.appcontainers.models.ContainerApp] :ivar next_link: Link to next page of resources. :vartype next_link: str """ _validation = { - 'value': {'required': True}, - 'next_link': {'readonly': True}, + "value": {"required": True}, + "next_link": {"readonly": True}, } _attribute_map = { - 'value': {'key': 'value', 'type': '[ContainerApp]'}, - 'next_link': {'key': 'nextLink', 'type': 'str'}, + "value": {"key": "value", "type": "[ContainerApp]"}, + "next_link": {"key": "nextLink", "type": "str"}, } - def __init__( - self, - *, - value: List["ContainerApp"], - **kwargs - ): + def __init__(self, *, value: List["_models.ContainerApp"], **kwargs): """ - :keyword value: Required. Collection of resources. + :keyword value: Collection of resources. Required. :paramtype value: list[~azure.mgmt.appcontainers.models.ContainerApp] """ - super(ContainerAppCollection, self).__init__(**kwargs) + super().__init__(**kwargs) self.value = value self.next_link = None -class ContainerAppProbe(msrest.serialization.Model): +class ContainerAppProbe(_serialization.Model): """Probe describes a health check to be performed against a container to determine whether it is alive or ready to receive traffic. :ivar failure_threshold: Minimum consecutive failures for the probe to be considered failed @@ -1595,38 +1505,38 @@ class ContainerAppProbe(msrest.serialization.Model): The value zero indicates stop immediately via the kill signal (no opportunity to shut down). This is an alpha field and requires enabling ProbeTerminationGracePeriod feature gate. Maximum value is 3600 seconds (1 hour). - :vartype termination_grace_period_seconds: long + :vartype termination_grace_period_seconds: int :ivar timeout_seconds: Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. Maximum value is 240. :vartype timeout_seconds: int - :ivar type: The type of probe. Possible values include: "Liveness", "Readiness", "Startup". + :ivar type: The type of probe. Known values are: "Liveness", "Readiness", and "Startup". :vartype type: str or ~azure.mgmt.appcontainers.models.Type """ _attribute_map = { - 'failure_threshold': {'key': 'failureThreshold', 'type': 'int'}, - 'http_get': {'key': 'httpGet', 'type': 'ContainerAppProbeHttpGet'}, - 'initial_delay_seconds': {'key': 'initialDelaySeconds', 'type': 'int'}, - 'period_seconds': {'key': 'periodSeconds', 'type': 'int'}, - 'success_threshold': {'key': 'successThreshold', 'type': 'int'}, - 'tcp_socket': {'key': 'tcpSocket', 'type': 'ContainerAppProbeTcpSocket'}, - 'termination_grace_period_seconds': {'key': 'terminationGracePeriodSeconds', 'type': 'long'}, - 'timeout_seconds': {'key': 'timeoutSeconds', 'type': 'int'}, - 'type': {'key': 'type', 'type': 'str'}, + "failure_threshold": {"key": "failureThreshold", "type": "int"}, + "http_get": {"key": "httpGet", "type": "ContainerAppProbeHttpGet"}, + "initial_delay_seconds": {"key": "initialDelaySeconds", "type": "int"}, + "period_seconds": {"key": "periodSeconds", "type": "int"}, + "success_threshold": {"key": "successThreshold", "type": "int"}, + "tcp_socket": {"key": "tcpSocket", "type": "ContainerAppProbeTcpSocket"}, + "termination_grace_period_seconds": {"key": "terminationGracePeriodSeconds", "type": "int"}, + "timeout_seconds": {"key": "timeoutSeconds", "type": "int"}, + "type": {"key": "type", "type": "str"}, } def __init__( self, *, failure_threshold: Optional[int] = None, - http_get: Optional["ContainerAppProbeHttpGet"] = None, + http_get: Optional["_models.ContainerAppProbeHttpGet"] = None, initial_delay_seconds: Optional[int] = None, period_seconds: Optional[int] = None, success_threshold: Optional[int] = None, - tcp_socket: Optional["ContainerAppProbeTcpSocket"] = None, + tcp_socket: Optional["_models.ContainerAppProbeTcpSocket"] = None, termination_grace_period_seconds: Optional[int] = None, timeout_seconds: Optional[int] = None, - type: Optional[Union[str, "Type"]] = None, + type: Optional[Union[str, "_models.Type"]] = None, **kwargs ): """ @@ -1657,14 +1567,14 @@ def __init__( integer. The value zero indicates stop immediately via the kill signal (no opportunity to shut down). This is an alpha field and requires enabling ProbeTerminationGracePeriod feature gate. Maximum value is 3600 seconds (1 hour). - :paramtype termination_grace_period_seconds: long + :paramtype termination_grace_period_seconds: int :keyword timeout_seconds: Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. Maximum value is 240. :paramtype timeout_seconds: int - :keyword type: The type of probe. Possible values include: "Liveness", "Readiness", "Startup". + :keyword type: The type of probe. Known values are: "Liveness", "Readiness", and "Startup". :paramtype type: str or ~azure.mgmt.appcontainers.models.Type """ - super(ContainerAppProbe, self).__init__(**kwargs) + super().__init__(**kwargs) self.failure_threshold = failure_threshold self.http_get = http_get self.initial_delay_seconds = initial_delay_seconds @@ -1676,7 +1586,7 @@ def __init__( self.type = type -class ContainerAppProbeHttpGet(msrest.serialization.Model): +class ContainerAppProbeHttpGet(_serialization.Model): """HTTPGet specifies the http request to perform. All required parameters must be populated in order to send to Azure. @@ -1689,24 +1599,24 @@ class ContainerAppProbeHttpGet(msrest.serialization.Model): list[~azure.mgmt.appcontainers.models.ContainerAppProbeHttpGetHttpHeadersItem] :ivar path: Path to access on the HTTP server. :vartype path: str - :ivar port: Required. Name or number of the port to access on the container. Number must be in - the range 1 to 65535. Name must be an IANA_SVC_NAME. + :ivar port: Name or number of the port to access on the container. Number must be in the range + 1 to 65535. Name must be an IANA_SVC_NAME. Required. :vartype port: int - :ivar scheme: Scheme to use for connecting to the host. Defaults to HTTP. Possible values - include: "HTTP", "HTTPS". + :ivar scheme: Scheme to use for connecting to the host. Defaults to HTTP. Known values are: + "HTTP" and "HTTPS". :vartype scheme: str or ~azure.mgmt.appcontainers.models.Scheme """ _validation = { - 'port': {'required': True}, + "port": {"required": True}, } _attribute_map = { - 'host': {'key': 'host', 'type': 'str'}, - 'http_headers': {'key': 'httpHeaders', 'type': '[ContainerAppProbeHttpGetHttpHeadersItem]'}, - 'path': {'key': 'path', 'type': 'str'}, - 'port': {'key': 'port', 'type': 'int'}, - 'scheme': {'key': 'scheme', 'type': 'str'}, + "host": {"key": "host", "type": "str"}, + "http_headers": {"key": "httpHeaders", "type": "[ContainerAppProbeHttpGetHttpHeadersItem]"}, + "path": {"key": "path", "type": "str"}, + "port": {"key": "port", "type": "int"}, + "scheme": {"key": "scheme", "type": "str"}, } def __init__( @@ -1714,9 +1624,9 @@ def __init__( *, port: int, host: Optional[str] = None, - http_headers: Optional[List["ContainerAppProbeHttpGetHttpHeadersItem"]] = None, + http_headers: Optional[List["_models.ContainerAppProbeHttpGetHttpHeadersItem"]] = None, path: Optional[str] = None, - scheme: Optional[Union[str, "Scheme"]] = None, + scheme: Optional[Union[str, "_models.Scheme"]] = None, **kwargs ): """ @@ -1728,14 +1638,14 @@ def __init__( list[~azure.mgmt.appcontainers.models.ContainerAppProbeHttpGetHttpHeadersItem] :keyword path: Path to access on the HTTP server. :paramtype path: str - :keyword port: Required. Name or number of the port to access on the container. Number must be - in the range 1 to 65535. Name must be an IANA_SVC_NAME. + :keyword port: Name or number of the port to access on the container. Number must be in the + range 1 to 65535. Name must be an IANA_SVC_NAME. Required. :paramtype port: int - :keyword scheme: Scheme to use for connecting to the host. Defaults to HTTP. Possible values - include: "HTTP", "HTTPS". + :keyword scheme: Scheme to use for connecting to the host. Defaults to HTTP. Known values are: + "HTTP" and "HTTPS". :paramtype scheme: str or ~azure.mgmt.appcontainers.models.Scheme """ - super(ContainerAppProbeHttpGet, self).__init__(**kwargs) + super().__init__(**kwargs) self.host = host self.http_headers = http_headers self.path = path @@ -1743,86 +1653,74 @@ def __init__( self.scheme = scheme -class ContainerAppProbeHttpGetHttpHeadersItem(msrest.serialization.Model): +class ContainerAppProbeHttpGetHttpHeadersItem(_serialization.Model): """HTTPHeader describes a custom header to be used in HTTP probes. All required parameters must be populated in order to send to Azure. - :ivar name: Required. The header field name. + :ivar name: The header field name. Required. :vartype name: str - :ivar value: Required. The header field value. + :ivar value: The header field value. Required. :vartype value: str """ _validation = { - 'name': {'required': True}, - 'value': {'required': True}, + "name": {"required": True}, + "value": {"required": True}, } _attribute_map = { - 'name': {'key': 'name', 'type': 'str'}, - 'value': {'key': 'value', 'type': 'str'}, + "name": {"key": "name", "type": "str"}, + "value": {"key": "value", "type": "str"}, } - def __init__( - self, - *, - name: str, - value: str, - **kwargs - ): + def __init__(self, *, name: str, value: str, **kwargs): """ - :keyword name: Required. The header field name. + :keyword name: The header field name. Required. :paramtype name: str - :keyword value: Required. The header field value. + :keyword value: The header field value. Required. :paramtype value: str """ - super(ContainerAppProbeHttpGetHttpHeadersItem, self).__init__(**kwargs) + super().__init__(**kwargs) self.name = name self.value = value -class ContainerAppProbeTcpSocket(msrest.serialization.Model): +class ContainerAppProbeTcpSocket(_serialization.Model): """TCPSocket specifies an action involving a TCP port. TCP hooks not yet supported. All required parameters must be populated in order to send to Azure. :ivar host: Optional: Host name to connect to, defaults to the pod IP. :vartype host: str - :ivar port: Required. Number or name of the port to access on the container. Number must be in - the range 1 to 65535. Name must be an IANA_SVC_NAME. + :ivar port: Number or name of the port to access on the container. Number must be in the range + 1 to 65535. Name must be an IANA_SVC_NAME. Required. :vartype port: int """ _validation = { - 'port': {'required': True}, + "port": {"required": True}, } _attribute_map = { - 'host': {'key': 'host', 'type': 'str'}, - 'port': {'key': 'port', 'type': 'int'}, + "host": {"key": "host", "type": "str"}, + "port": {"key": "port", "type": "int"}, } - def __init__( - self, - *, - port: int, - host: Optional[str] = None, - **kwargs - ): + def __init__(self, *, port: int, host: Optional[str] = None, **kwargs): """ :keyword host: Optional: Host name to connect to, defaults to the pod IP. :paramtype host: str - :keyword port: Required. Number or name of the port to access on the container. Number must be - in the range 1 to 65535. Name must be an IANA_SVC_NAME. + :keyword port: Number or name of the port to access on the container. Number must be in the + range 1 to 65535. Name must be an IANA_SVC_NAME. Required. :paramtype port: int """ - super(ContainerAppProbeTcpSocket, self).__init__(**kwargs) + super().__init__(**kwargs) self.host = host self.port = port -class ContainerAppSecret(msrest.serialization.Model): +class ContainerAppSecret(_serialization.Model): """Container App Secret. Variables are only populated by the server, and will be ignored when sending a request. @@ -1834,27 +1732,23 @@ class ContainerAppSecret(msrest.serialization.Model): """ _validation = { - 'name': {'readonly': True}, - 'value': {'readonly': True}, + "name": {"readonly": True}, + "value": {"readonly": True}, } _attribute_map = { - 'name': {'key': 'name', 'type': 'str'}, - 'value': {'key': 'value', 'type': 'str'}, + "name": {"key": "name", "type": "str"}, + "value": {"key": "value", "type": "str"}, } - def __init__( - self, - **kwargs - ): - """ - """ - super(ContainerAppSecret, self).__init__(**kwargs) + def __init__(self, **kwargs): + """ """ + super().__init__(**kwargs) self.name = None self.value = None -class ContainerResources(msrest.serialization.Model): +class ContainerResources(_serialization.Model): """Container App container resource requirements. Variables are only populated by the server, and will be ignored when sending a request. @@ -1868,39 +1762,33 @@ class ContainerResources(msrest.serialization.Model): """ _validation = { - 'ephemeral_storage': {'readonly': True}, + "ephemeral_storage": {"readonly": True}, } _attribute_map = { - 'cpu': {'key': 'cpu', 'type': 'float'}, - 'memory': {'key': 'memory', 'type': 'str'}, - 'ephemeral_storage': {'key': 'ephemeralStorage', 'type': 'str'}, + "cpu": {"key": "cpu", "type": "float"}, + "memory": {"key": "memory", "type": "str"}, + "ephemeral_storage": {"key": "ephemeralStorage", "type": "str"}, } - def __init__( - self, - *, - cpu: Optional[float] = None, - memory: Optional[str] = None, - **kwargs - ): + def __init__(self, *, cpu: Optional[float] = None, memory: Optional[str] = None, **kwargs): """ :keyword cpu: Required CPU in cores, e.g. 0.5. :paramtype cpu: float :keyword memory: Required memory, e.g. "250Mb". :paramtype memory: str """ - super(ContainerResources, self).__init__(**kwargs) + super().__init__(**kwargs) self.cpu = cpu self.memory = memory self.ephemeral_storage = None -class CookieExpiration(msrest.serialization.Model): +class CookieExpiration(_serialization.Model): """The configuration settings of the session cookie's expiration. - :ivar convention: The convention used when determining the session cookie's expiration. - Possible values include: "FixedTime", "IdentityProviderDerived". + :ivar convention: The convention used when determining the session cookie's expiration. Known + values are: "FixedTime" and "IdentityProviderDerived". :vartype convention: str or ~azure.mgmt.appcontainers.models.CookieExpirationConvention :ivar time_to_expiration: The time after the request is made when the session cookie should expire. @@ -1908,54 +1796,53 @@ class CookieExpiration(msrest.serialization.Model): """ _attribute_map = { - 'convention': {'key': 'convention', 'type': 'str'}, - 'time_to_expiration': {'key': 'timeToExpiration', 'type': 'str'}, + "convention": {"key": "convention", "type": "str"}, + "time_to_expiration": {"key": "timeToExpiration", "type": "str"}, } def __init__( self, *, - convention: Optional[Union[str, "CookieExpirationConvention"]] = None, + convention: Optional[Union[str, "_models.CookieExpirationConvention"]] = None, time_to_expiration: Optional[str] = None, **kwargs ): """ :keyword convention: The convention used when determining the session cookie's expiration. - Possible values include: "FixedTime", "IdentityProviderDerived". + Known values are: "FixedTime" and "IdentityProviderDerived". :paramtype convention: str or ~azure.mgmt.appcontainers.models.CookieExpirationConvention :keyword time_to_expiration: The time after the request is made when the session cookie should expire. :paramtype time_to_expiration: str """ - super(CookieExpiration, self).__init__(**kwargs) + super().__init__(**kwargs) self.convention = convention self.time_to_expiration = time_to_expiration -class CustomDomain(msrest.serialization.Model): +class CustomDomain(_serialization.Model): """Custom Domain of a Container App. All required parameters must be populated in order to send to Azure. - :ivar name: Required. Hostname. + :ivar name: Hostname. Required. :vartype name: str - :ivar binding_type: Custom Domain binding type. Possible values include: "Disabled", - "SniEnabled". + :ivar binding_type: Custom Domain binding type. Known values are: "Disabled" and "SniEnabled". :vartype binding_type: str or ~azure.mgmt.appcontainers.models.BindingType - :ivar certificate_id: Required. Resource Id of the Certificate to be bound to this hostname. - Must exist in the Managed Environment. + :ivar certificate_id: Resource Id of the Certificate to be bound to this hostname. Must exist + in the Managed Environment. Required. :vartype certificate_id: str """ _validation = { - 'name': {'required': True}, - 'certificate_id': {'required': True}, + "name": {"required": True}, + "certificate_id": {"required": True}, } _attribute_map = { - 'name': {'key': 'name', 'type': 'str'}, - 'binding_type': {'key': 'bindingType', 'type': 'str'}, - 'certificate_id': {'key': 'certificateId', 'type': 'str'}, + "name": {"key": "name", "type": "str"}, + "binding_type": {"key": "bindingType", "type": "str"}, + "certificate_id": {"key": "certificateId", "type": "str"}, } def __init__( @@ -1963,54 +1850,43 @@ def __init__( *, name: str, certificate_id: str, - binding_type: Optional[Union[str, "BindingType"]] = None, + binding_type: Optional[Union[str, "_models.BindingType"]] = None, **kwargs ): """ - :keyword name: Required. Hostname. + :keyword name: Hostname. Required. :paramtype name: str - :keyword binding_type: Custom Domain binding type. Possible values include: "Disabled", + :keyword binding_type: Custom Domain binding type. Known values are: "Disabled" and "SniEnabled". :paramtype binding_type: str or ~azure.mgmt.appcontainers.models.BindingType - :keyword certificate_id: Required. Resource Id of the Certificate to be bound to this hostname. - Must exist in the Managed Environment. + :keyword certificate_id: Resource Id of the Certificate to be bound to this hostname. Must + exist in the Managed Environment. Required. :paramtype certificate_id: str """ - super(CustomDomain, self).__init__(**kwargs) + super().__init__(**kwargs) self.name = name self.binding_type = binding_type self.certificate_id = certificate_id -class CustomHostnameAnalysisResult(ProxyResource): +class CustomHostnameAnalysisResult(_serialization.Model): # pylint: disable=too-many-instance-attributes """Custom domain analysis. Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Fully qualified resource ID for the resource. Ex - - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. - :vartype id: str - :ivar name: The name of the resource. - :vartype name: str - :ivar type: The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or - "Microsoft.Storage/storageAccounts". - :vartype type: str - :ivar system_data: Azure Resource Manager metadata containing createdBy and modifiedBy - information. - :vartype system_data: ~azure.mgmt.appcontainers.models.SystemData :ivar host_name: Host name that was analyzed. :vartype host_name: str :ivar is_hostname_already_verified: :code:`true` if hostname is already verified; otherwise, :code:`false`. :vartype is_hostname_already_verified: bool - :ivar custom_domain_verification_test: DNS verification test result. Possible values include: - "Passed", "Failed", "Skipped". + :ivar custom_domain_verification_test: DNS verification test result. Known values are: + "Passed", "Failed", and "Skipped". :vartype custom_domain_verification_test: str or ~azure.mgmt.appcontainers.models.DnsVerificationTestResult :ivar custom_domain_verification_failure_info: Raw failure information if DNS verification fails. :vartype custom_domain_verification_failure_info: - ~azure.mgmt.appcontainers.models.DefaultErrorResponse + ~azure.mgmt.appcontainers.models.CustomHostnameAnalysisResultCustomDomainVerificationFailureInfo :ivar has_conflict_on_managed_environment: :code:`true` if there is a conflict on the Container App's managed environment; otherwise, :code:`false`. :vartype has_conflict_on_managed_environment: bool @@ -2030,34 +1906,29 @@ class CustomHostnameAnalysisResult(ProxyResource): """ _validation = { - 'id': {'readonly': True}, - 'name': {'readonly': True}, - 'type': {'readonly': True}, - 'system_data': {'readonly': True}, - 'host_name': {'readonly': True}, - 'is_hostname_already_verified': {'readonly': True}, - 'custom_domain_verification_test': {'readonly': True}, - 'custom_domain_verification_failure_info': {'readonly': True}, - 'has_conflict_on_managed_environment': {'readonly': True}, - 'conflicting_container_app_resource_id': {'readonly': True}, + "host_name": {"readonly": True}, + "is_hostname_already_verified": {"readonly": True}, + "custom_domain_verification_test": {"readonly": True}, + "custom_domain_verification_failure_info": {"readonly": True}, + "has_conflict_on_managed_environment": {"readonly": True}, + "conflicting_container_app_resource_id": {"readonly": True}, } _attribute_map = { - 'id': {'key': 'id', 'type': 'str'}, - 'name': {'key': 'name', 'type': 'str'}, - 'type': {'key': 'type', 'type': 'str'}, - 'system_data': {'key': 'systemData', 'type': 'SystemData'}, - 'host_name': {'key': 'properties.hostName', 'type': 'str'}, - 'is_hostname_already_verified': {'key': 'properties.isHostnameAlreadyVerified', 'type': 'bool'}, - 'custom_domain_verification_test': {'key': 'properties.customDomainVerificationTest', 'type': 'str'}, - 'custom_domain_verification_failure_info': {'key': 'properties.customDomainVerificationFailureInfo', 'type': 'DefaultErrorResponse'}, - 'has_conflict_on_managed_environment': {'key': 'properties.hasConflictOnManagedEnvironment', 'type': 'bool'}, - 'conflicting_container_app_resource_id': {'key': 'properties.conflictingContainerAppResourceId', 'type': 'str'}, - 'c_name_records': {'key': 'properties.cNameRecords', 'type': '[str]'}, - 'txt_records': {'key': 'properties.txtRecords', 'type': '[str]'}, - 'a_records': {'key': 'properties.aRecords', 'type': '[str]'}, - 'alternate_c_name_records': {'key': 'properties.alternateCNameRecords', 'type': '[str]'}, - 'alternate_txt_records': {'key': 'properties.alternateTxtRecords', 'type': '[str]'}, + "host_name": {"key": "hostName", "type": "str"}, + "is_hostname_already_verified": {"key": "isHostnameAlreadyVerified", "type": "bool"}, + "custom_domain_verification_test": {"key": "customDomainVerificationTest", "type": "str"}, + "custom_domain_verification_failure_info": { + "key": "customDomainVerificationFailureInfo", + "type": "CustomHostnameAnalysisResultCustomDomainVerificationFailureInfo", + }, + "has_conflict_on_managed_environment": {"key": "hasConflictOnManagedEnvironment", "type": "bool"}, + "conflicting_container_app_resource_id": {"key": "conflictingContainerAppResourceId", "type": "str"}, + "c_name_records": {"key": "cNameRecords", "type": "[str]"}, + "txt_records": {"key": "txtRecords", "type": "[str]"}, + "a_records": {"key": "aRecords", "type": "[str]"}, + "alternate_c_name_records": {"key": "alternateCNameRecords", "type": "[str]"}, + "alternate_txt_records": {"key": "alternateTxtRecords", "type": "[str]"}, } def __init__( @@ -2082,7 +1953,7 @@ def __init__( :keyword alternate_txt_records: Alternate TXT records visible for this hostname. :paramtype alternate_txt_records: list[str] """ - super(CustomHostnameAnalysisResult, self).__init__(**kwargs) + super().__init__(**kwargs) self.host_name = None self.is_hostname_already_verified = None self.custom_domain_verification_test = None @@ -2096,7 +1967,92 @@ def __init__( self.alternate_txt_records = alternate_txt_records -class CustomOpenIdConnectProvider(msrest.serialization.Model): +class CustomHostnameAnalysisResultCustomDomainVerificationFailureInfo(_serialization.Model): + """Raw failure information if DNS verification fails. + + Variables are only populated by the server, and will be ignored when sending a request. + + :ivar code: Standardized string to programmatically identify the error. + :vartype code: str + :ivar message: Detailed error description and debugging information. + :vartype message: str + :ivar target: Detailed error description and debugging information. + :vartype target: str + :ivar details: Details or the error. + :vartype details: + list[~azure.mgmt.appcontainers.models.CustomHostnameAnalysisResultCustomDomainVerificationFailureInfoDetailsItem] + """ + + _validation = { + "code": {"readonly": True}, + "message": {"readonly": True}, + "target": {"readonly": True}, + } + + _attribute_map = { + "code": {"key": "code", "type": "str"}, + "message": {"key": "message", "type": "str"}, + "target": {"key": "target", "type": "str"}, + "details": { + "key": "details", + "type": "[CustomHostnameAnalysisResultCustomDomainVerificationFailureInfoDetailsItem]", + }, + } + + def __init__( + self, + *, + details: Optional[ + List["_models.CustomHostnameAnalysisResultCustomDomainVerificationFailureInfoDetailsItem"] + ] = None, + **kwargs + ): + """ + :keyword details: Details or the error. + :paramtype details: + list[~azure.mgmt.appcontainers.models.CustomHostnameAnalysisResultCustomDomainVerificationFailureInfoDetailsItem] + """ + super().__init__(**kwargs) + self.code = None + self.message = None + self.target = None + self.details = details + + +class CustomHostnameAnalysisResultCustomDomainVerificationFailureInfoDetailsItem(_serialization.Model): + """Detailed errors. + + Variables are only populated by the server, and will be ignored when sending a request. + + :ivar code: Standardized string to programmatically identify the error. + :vartype code: str + :ivar message: Detailed error description and debugging information. + :vartype message: str + :ivar target: Detailed error description and debugging information. + :vartype target: str + """ + + _validation = { + "code": {"readonly": True}, + "message": {"readonly": True}, + "target": {"readonly": True}, + } + + _attribute_map = { + "code": {"key": "code", "type": "str"}, + "message": {"key": "message", "type": "str"}, + "target": {"key": "target", "type": "str"}, + } + + def __init__(self, **kwargs): + """ """ + super().__init__(**kwargs) + self.code = None + self.message = None + self.target = None + + +class CustomOpenIdConnectProvider(_serialization.Model): """The configuration settings of the custom Open ID Connect provider. :ivar enabled: :code:`false` if the custom Open ID provider provider should not be @@ -2111,17 +2067,17 @@ class CustomOpenIdConnectProvider(msrest.serialization.Model): """ _attribute_map = { - 'enabled': {'key': 'enabled', 'type': 'bool'}, - 'registration': {'key': 'registration', 'type': 'OpenIdConnectRegistration'}, - 'login': {'key': 'login', 'type': 'OpenIdConnectLogin'}, + "enabled": {"key": "enabled", "type": "bool"}, + "registration": {"key": "registration", "type": "OpenIdConnectRegistration"}, + "login": {"key": "login", "type": "OpenIdConnectLogin"}, } def __init__( self, *, enabled: Optional[bool] = None, - registration: Optional["OpenIdConnectRegistration"] = None, - login: Optional["OpenIdConnectLogin"] = None, + registration: Optional["_models.OpenIdConnectRegistration"] = None, + login: Optional["_models.OpenIdConnectLogin"] = None, **kwargs ): """ @@ -2135,13 +2091,13 @@ def __init__( provider. :paramtype login: ~azure.mgmt.appcontainers.models.OpenIdConnectLogin """ - super(CustomOpenIdConnectProvider, self).__init__(**kwargs) + super().__init__(**kwargs) self.enabled = enabled self.registration = registration self.login = login -class CustomScaleRule(msrest.serialization.Model): +class CustomScaleRule(_serialization.Model): """Container App container Custom scaling rule. :ivar type: Type of the custom scale rule @@ -2154,9 +2110,9 @@ class CustomScaleRule(msrest.serialization.Model): """ _attribute_map = { - 'type': {'key': 'type', 'type': 'str'}, - 'metadata': {'key': 'metadata', 'type': '{str}'}, - 'auth': {'key': 'auth', 'type': '[ScaleRuleAuth]'}, + "type": {"key": "type", "type": "str"}, + "metadata": {"key": "metadata", "type": "{str}"}, + "auth": {"key": "auth", "type": "[ScaleRuleAuth]"}, } def __init__( @@ -2164,7 +2120,7 @@ def __init__( *, type: Optional[str] = None, metadata: Optional[Dict[str, str]] = None, - auth: Optional[List["ScaleRuleAuth"]] = None, + auth: Optional[List["_models.ScaleRuleAuth"]] = None, **kwargs ): """ @@ -2176,13 +2132,13 @@ def __init__( :keyword auth: Authentication secrets for the custom scale rule. :paramtype auth: list[~azure.mgmt.appcontainers.models.ScaleRuleAuth] """ - super(CustomScaleRule, self).__init__(**kwargs) + super().__init__(**kwargs) self.type = type self.metadata = metadata self.auth = auth -class Dapr(msrest.serialization.Model): +class Dapr(_serialization.Model): """Container App Dapr configuration. :ivar enabled: Boolean indicating if the Dapr side car is enabled. @@ -2190,17 +2146,17 @@ class Dapr(msrest.serialization.Model): :ivar app_id: Dapr application identifier. :vartype app_id: str :ivar app_protocol: Tells Dapr which protocol your application is using. Valid options are http - and grpc. Default is http. Possible values include: "http", "grpc". + and grpc. Default is http. Known values are: "http" and "grpc". :vartype app_protocol: str or ~azure.mgmt.appcontainers.models.AppProtocol :ivar app_port: Tells Dapr which port your application is listening on. :vartype app_port: int """ _attribute_map = { - 'enabled': {'key': 'enabled', 'type': 'bool'}, - 'app_id': {'key': 'appId', 'type': 'str'}, - 'app_protocol': {'key': 'appProtocol', 'type': 'str'}, - 'app_port': {'key': 'appPort', 'type': 'int'}, + "enabled": {"key": "enabled", "type": "bool"}, + "app_id": {"key": "appId", "type": "str"}, + "app_protocol": {"key": "appProtocol", "type": "str"}, + "app_port": {"key": "appPort", "type": "int"}, } def __init__( @@ -2208,7 +2164,7 @@ def __init__( *, enabled: Optional[bool] = None, app_id: Optional[str] = None, - app_protocol: Optional[Union[str, "AppProtocol"]] = None, + app_protocol: Optional[Union[str, "_models.AppProtocol"]] = None, app_port: Optional[int] = None, **kwargs ): @@ -2218,19 +2174,19 @@ def __init__( :keyword app_id: Dapr application identifier. :paramtype app_id: str :keyword app_protocol: Tells Dapr which protocol your application is using. Valid options are - http and grpc. Default is http. Possible values include: "http", "grpc". + http and grpc. Default is http. Known values are: "http" and "grpc". :paramtype app_protocol: str or ~azure.mgmt.appcontainers.models.AppProtocol :keyword app_port: Tells Dapr which port your application is listening on. :paramtype app_port: int """ - super(Dapr, self).__init__(**kwargs) + super().__init__(**kwargs) self.enabled = enabled self.app_id = app_id self.app_protocol = app_protocol self.app_port = app_port -class DaprComponent(ProxyResource): +class DaprComponent(ProxyResource): # pylint: disable=too-many-instance-attributes """Dapr Component. Variables are only populated by the server, and will be ignored when sending a request. @@ -2263,24 +2219,24 @@ class DaprComponent(ProxyResource): """ _validation = { - 'id': {'readonly': True}, - 'name': {'readonly': True}, - 'type': {'readonly': True}, - 'system_data': {'readonly': True}, + "id": {"readonly": True}, + "name": {"readonly": True}, + "type": {"readonly": True}, + "system_data": {"readonly": True}, } _attribute_map = { - 'id': {'key': 'id', 'type': 'str'}, - 'name': {'key': 'name', 'type': 'str'}, - 'type': {'key': 'type', 'type': 'str'}, - 'system_data': {'key': 'systemData', 'type': 'SystemData'}, - 'component_type': {'key': 'properties.componentType', 'type': 'str'}, - 'version': {'key': 'properties.version', 'type': 'str'}, - 'ignore_errors': {'key': 'properties.ignoreErrors', 'type': 'bool'}, - 'init_timeout': {'key': 'properties.initTimeout', 'type': 'str'}, - 'secrets': {'key': 'properties.secrets', 'type': '[Secret]'}, - 'metadata': {'key': 'properties.metadata', 'type': '[DaprMetadata]'}, - 'scopes': {'key': 'properties.scopes', 'type': '[str]'}, + "id": {"key": "id", "type": "str"}, + "name": {"key": "name", "type": "str"}, + "type": {"key": "type", "type": "str"}, + "system_data": {"key": "systemData", "type": "SystemData"}, + "component_type": {"key": "properties.componentType", "type": "str"}, + "version": {"key": "properties.version", "type": "str"}, + "ignore_errors": {"key": "properties.ignoreErrors", "type": "bool"}, + "init_timeout": {"key": "properties.initTimeout", "type": "str"}, + "secrets": {"key": "properties.secrets", "type": "[Secret]"}, + "metadata": {"key": "properties.metadata", "type": "[DaprMetadata]"}, + "scopes": {"key": "properties.scopes", "type": "[str]"}, } def __init__( @@ -2290,8 +2246,8 @@ def __init__( version: Optional[str] = None, ignore_errors: Optional[bool] = None, init_timeout: Optional[str] = None, - secrets: Optional[List["Secret"]] = None, - metadata: Optional[List["DaprMetadata"]] = None, + secrets: Optional[List["_models.Secret"]] = None, + metadata: Optional[List["_models.DaprMetadata"]] = None, scopes: Optional[List[str]] = None, **kwargs ): @@ -2311,7 +2267,7 @@ def __init__( :keyword scopes: Names of container apps that can use this Dapr component. :paramtype scopes: list[str] """ - super(DaprComponent, self).__init__(**kwargs) + super().__init__(**kwargs) self.component_type = component_type self.version = version self.ignore_errors = ignore_errors @@ -2321,45 +2277,40 @@ def __init__( self.scopes = scopes -class DaprComponentsCollection(msrest.serialization.Model): +class DaprComponentsCollection(_serialization.Model): """Dapr Components ARM resource. Variables are only populated by the server, and will be ignored when sending a request. All required parameters must be populated in order to send to Azure. - :ivar value: Required. Collection of resources. + :ivar value: Collection of resources. Required. :vartype value: list[~azure.mgmt.appcontainers.models.DaprComponent] :ivar next_link: Link to next page of resources. :vartype next_link: str """ _validation = { - 'value': {'required': True}, - 'next_link': {'readonly': True}, + "value": {"required": True}, + "next_link": {"readonly": True}, } _attribute_map = { - 'value': {'key': 'value', 'type': '[DaprComponent]'}, - 'next_link': {'key': 'nextLink', 'type': 'str'}, + "value": {"key": "value", "type": "[DaprComponent]"}, + "next_link": {"key": "nextLink", "type": "str"}, } - def __init__( - self, - *, - value: List["DaprComponent"], - **kwargs - ): + def __init__(self, *, value: List["_models.DaprComponent"], **kwargs): """ - :keyword value: Required. Collection of resources. + :keyword value: Collection of resources. Required. :paramtype value: list[~azure.mgmt.appcontainers.models.DaprComponent] """ - super(DaprComponentsCollection, self).__init__(**kwargs) + super().__init__(**kwargs) self.value = value self.next_link = None -class DaprMetadata(msrest.serialization.Model): +class DaprMetadata(_serialization.Model): """Dapr component metadata. :ivar name: Metadata property name. @@ -2372,18 +2323,13 @@ class DaprMetadata(msrest.serialization.Model): """ _attribute_map = { - 'name': {'key': 'name', 'type': 'str'}, - 'value': {'key': 'value', 'type': 'str'}, - 'secret_ref': {'key': 'secretRef', 'type': 'str'}, + "name": {"key": "name", "type": "str"}, + "value": {"key": "value", "type": "str"}, + "secret_ref": {"key": "secretRef", "type": "str"}, } def __init__( - self, - *, - name: Optional[str] = None, - value: Optional[str] = None, - secret_ref: Optional[str] = None, - **kwargs + self, *, name: Optional[str] = None, value: Optional[str] = None, secret_ref: Optional[str] = None, **kwargs ): """ :keyword name: Metadata property name. @@ -2394,44 +2340,39 @@ def __init__( value. :paramtype secret_ref: str """ - super(DaprMetadata, self).__init__(**kwargs) + super().__init__(**kwargs) self.name = name self.value = value self.secret_ref = secret_ref -class DaprSecretsCollection(msrest.serialization.Model): +class DaprSecretsCollection(_serialization.Model): """Dapr component Secrets Collection ARM resource. All required parameters must be populated in order to send to Azure. - :ivar value: Required. Collection of secrets used by a Dapr component. + :ivar value: Collection of secrets used by a Dapr component. Required. :vartype value: list[~azure.mgmt.appcontainers.models.Secret] """ _validation = { - 'value': {'required': True}, + "value": {"required": True}, } _attribute_map = { - 'value': {'key': 'value', 'type': '[Secret]'}, + "value": {"key": "value", "type": "[Secret]"}, } - def __init__( - self, - *, - value: List["Secret"], - **kwargs - ): + def __init__(self, *, value: List["_models.Secret"], **kwargs): """ - :keyword value: Required. Collection of secrets used by a Dapr component. + :keyword value: Collection of secrets used by a Dapr component. Required. :paramtype value: list[~azure.mgmt.appcontainers.models.Secret] """ - super(DaprSecretsCollection, self).__init__(**kwargs) + super().__init__(**kwargs) self.value = value -class DefaultAuthorizationPolicy(msrest.serialization.Model): +class DefaultAuthorizationPolicy(_serialization.Model): """The configuration settings of the Azure Active Directory default authorization policy. :ivar allowed_principals: The configuration settings of the Azure Active Directory allowed @@ -2443,14 +2384,14 @@ class DefaultAuthorizationPolicy(msrest.serialization.Model): """ _attribute_map = { - 'allowed_principals': {'key': 'allowedPrincipals', 'type': 'AllowedPrincipals'}, - 'allowed_applications': {'key': 'allowedApplications', 'type': '[str]'}, + "allowed_principals": {"key": "allowedPrincipals", "type": "AllowedPrincipals"}, + "allowed_applications": {"key": "allowedApplications", "type": "[str]"}, } def __init__( self, *, - allowed_principals: Optional["AllowedPrincipals"] = None, + allowed_principals: Optional["_models.AllowedPrincipals"] = None, allowed_applications: Optional[List[str]] = None, **kwargs ): @@ -2462,12 +2403,12 @@ def __init__( applications. :paramtype allowed_applications: list[str] """ - super(DefaultAuthorizationPolicy, self).__init__(**kwargs) + super().__init__(**kwargs) self.allowed_principals = allowed_principals self.allowed_applications = allowed_applications -class DefaultErrorResponse(msrest.serialization.Model): +class DefaultErrorResponse(_serialization.Model): """App Service error response. Variables are only populated by the server, and will be ignored when sending a request. @@ -2477,24 +2418,20 @@ class DefaultErrorResponse(msrest.serialization.Model): """ _validation = { - 'error': {'readonly': True}, + "error": {"readonly": True}, } _attribute_map = { - 'error': {'key': 'error', 'type': 'DefaultErrorResponseError'}, + "error": {"key": "error", "type": "DefaultErrorResponseError"}, } - def __init__( - self, - **kwargs - ): - """ - """ - super(DefaultErrorResponse, self).__init__(**kwargs) + def __init__(self, **kwargs): + """ """ + super().__init__(**kwargs) self.error = None -class DefaultErrorResponseError(msrest.serialization.Model): +class DefaultErrorResponseError(_serialization.Model): """Error model. Variables are only populated by the server, and will be ignored when sending a request. @@ -2512,31 +2449,26 @@ class DefaultErrorResponseError(msrest.serialization.Model): """ _validation = { - 'code': {'readonly': True}, - 'message': {'readonly': True}, - 'target': {'readonly': True}, - 'innererror': {'readonly': True}, + "code": {"readonly": True}, + "message": {"readonly": True}, + "target": {"readonly": True}, + "innererror": {"readonly": True}, } _attribute_map = { - 'code': {'key': 'code', 'type': 'str'}, - 'message': {'key': 'message', 'type': 'str'}, - 'target': {'key': 'target', 'type': 'str'}, - 'details': {'key': 'details', 'type': '[DefaultErrorResponseErrorDetailsItem]'}, - 'innererror': {'key': 'innererror', 'type': 'str'}, + "code": {"key": "code", "type": "str"}, + "message": {"key": "message", "type": "str"}, + "target": {"key": "target", "type": "str"}, + "details": {"key": "details", "type": "[DefaultErrorResponseErrorDetailsItem]"}, + "innererror": {"key": "innererror", "type": "str"}, } - def __init__( - self, - *, - details: Optional[List["DefaultErrorResponseErrorDetailsItem"]] = None, - **kwargs - ): + def __init__(self, *, details: Optional[List["_models.DefaultErrorResponseErrorDetailsItem"]] = None, **kwargs): """ :keyword details: Details or the error. :paramtype details: list[~azure.mgmt.appcontainers.models.DefaultErrorResponseErrorDetailsItem] """ - super(DefaultErrorResponseError, self).__init__(**kwargs) + super().__init__(**kwargs) self.code = None self.message = None self.target = None @@ -2544,7 +2476,7 @@ def __init__( self.innererror = None -class DefaultErrorResponseErrorDetailsItem(msrest.serialization.Model): +class DefaultErrorResponseErrorDetailsItem(_serialization.Model): """Detailed errors. Variables are only populated by the server, and will be ignored when sending a request. @@ -2558,30 +2490,26 @@ class DefaultErrorResponseErrorDetailsItem(msrest.serialization.Model): """ _validation = { - 'code': {'readonly': True}, - 'message': {'readonly': True}, - 'target': {'readonly': True}, + "code": {"readonly": True}, + "message": {"readonly": True}, + "target": {"readonly": True}, } _attribute_map = { - 'code': {'key': 'code', 'type': 'str'}, - 'message': {'key': 'message', 'type': 'str'}, - 'target': {'key': 'target', 'type': 'str'}, + "code": {"key": "code", "type": "str"}, + "message": {"key": "message", "type": "str"}, + "target": {"key": "target", "type": "str"}, } - def __init__( - self, - **kwargs - ): - """ - """ - super(DefaultErrorResponseErrorDetailsItem, self).__init__(**kwargs) + def __init__(self, **kwargs): + """ """ + super().__init__(**kwargs) self.code = None self.message = None self.target = None -class EnvironmentVar(msrest.serialization.Model): +class EnvironmentVar(_serialization.Model): """Container App container environment variable. :ivar name: Environment variable name. @@ -2594,18 +2522,13 @@ class EnvironmentVar(msrest.serialization.Model): """ _attribute_map = { - 'name': {'key': 'name', 'type': 'str'}, - 'value': {'key': 'value', 'type': 'str'}, - 'secret_ref': {'key': 'secretRef', 'type': 'str'}, + "name": {"key": "name", "type": "str"}, + "value": {"key": "value", "type": "str"}, + "secret_ref": {"key": "secretRef", "type": "str"}, } def __init__( - self, - *, - name: Optional[str] = None, - value: Optional[str] = None, - secret_ref: Optional[str] = None, - **kwargs + self, *, name: Optional[str] = None, value: Optional[str] = None, secret_ref: Optional[str] = None, **kwargs ): """ :keyword name: Environment variable name. @@ -2616,13 +2539,13 @@ def __init__( variable value. :paramtype secret_ref: str """ - super(EnvironmentVar, self).__init__(**kwargs) + super().__init__(**kwargs) self.name = name self.value = value self.secret_ref = secret_ref -class Facebook(msrest.serialization.Model): +class Facebook(_serialization.Model): """The configuration settings of the Facebook provider. :ivar enabled: :code:`false` if the Facebook provider should not be enabled @@ -2638,19 +2561,19 @@ class Facebook(msrest.serialization.Model): """ _attribute_map = { - 'enabled': {'key': 'enabled', 'type': 'bool'}, - 'registration': {'key': 'registration', 'type': 'AppRegistration'}, - 'graph_api_version': {'key': 'graphApiVersion', 'type': 'str'}, - 'login': {'key': 'login', 'type': 'LoginScopes'}, + "enabled": {"key": "enabled", "type": "bool"}, + "registration": {"key": "registration", "type": "AppRegistration"}, + "graph_api_version": {"key": "graphApiVersion", "type": "str"}, + "login": {"key": "login", "type": "LoginScopes"}, } def __init__( self, *, enabled: Optional[bool] = None, - registration: Optional["AppRegistration"] = None, + registration: Optional["_models.AppRegistration"] = None, graph_api_version: Optional[str] = None, - login: Optional["LoginScopes"] = None, + login: Optional["_models.LoginScopes"] = None, **kwargs ): """ @@ -2665,18 +2588,18 @@ def __init__( :keyword login: The configuration settings of the login flow. :paramtype login: ~azure.mgmt.appcontainers.models.LoginScopes """ - super(Facebook, self).__init__(**kwargs) + super().__init__(**kwargs) self.enabled = enabled self.registration = registration self.graph_api_version = graph_api_version self.login = login -class ForwardProxy(msrest.serialization.Model): +class ForwardProxy(_serialization.Model): """The configuration settings of a forward proxy used to make the requests. - :ivar convention: The convention used to determine the url of the request made. Possible values - include: "NoProxy", "Standard", "Custom". + :ivar convention: The convention used to determine the url of the request made. Known values + are: "NoProxy", "Standard", and "Custom". :vartype convention: str or ~azure.mgmt.appcontainers.models.ForwardProxyConvention :ivar custom_host_header_name: The name of the header containing the host of the request. :vartype custom_host_header_name: str @@ -2685,35 +2608,35 @@ class ForwardProxy(msrest.serialization.Model): """ _attribute_map = { - 'convention': {'key': 'convention', 'type': 'str'}, - 'custom_host_header_name': {'key': 'customHostHeaderName', 'type': 'str'}, - 'custom_proto_header_name': {'key': 'customProtoHeaderName', 'type': 'str'}, + "convention": {"key": "convention", "type": "str"}, + "custom_host_header_name": {"key": "customHostHeaderName", "type": "str"}, + "custom_proto_header_name": {"key": "customProtoHeaderName", "type": "str"}, } def __init__( self, *, - convention: Optional[Union[str, "ForwardProxyConvention"]] = None, + convention: Optional[Union[str, "_models.ForwardProxyConvention"]] = None, custom_host_header_name: Optional[str] = None, custom_proto_header_name: Optional[str] = None, **kwargs ): """ - :keyword convention: The convention used to determine the url of the request made. Possible - values include: "NoProxy", "Standard", "Custom". + :keyword convention: The convention used to determine the url of the request made. Known values + are: "NoProxy", "Standard", and "Custom". :paramtype convention: str or ~azure.mgmt.appcontainers.models.ForwardProxyConvention :keyword custom_host_header_name: The name of the header containing the host of the request. :paramtype custom_host_header_name: str :keyword custom_proto_header_name: The name of the header containing the scheme of the request. :paramtype custom_proto_header_name: str """ - super(ForwardProxy, self).__init__(**kwargs) + super().__init__(**kwargs) self.convention = convention self.custom_host_header_name = custom_host_header_name self.custom_proto_header_name = custom_proto_header_name -class GitHub(msrest.serialization.Model): +class GitHub(_serialization.Model): """The configuration settings of the GitHub provider. :ivar enabled: :code:`false` if the GitHub provider should not be enabled despite @@ -2726,17 +2649,17 @@ class GitHub(msrest.serialization.Model): """ _attribute_map = { - 'enabled': {'key': 'enabled', 'type': 'bool'}, - 'registration': {'key': 'registration', 'type': 'ClientRegistration'}, - 'login': {'key': 'login', 'type': 'LoginScopes'}, + "enabled": {"key": "enabled", "type": "bool"}, + "registration": {"key": "registration", "type": "ClientRegistration"}, + "login": {"key": "login", "type": "LoginScopes"}, } def __init__( self, *, enabled: Optional[bool] = None, - registration: Optional["ClientRegistration"] = None, - login: Optional["LoginScopes"] = None, + registration: Optional["_models.ClientRegistration"] = None, + login: Optional["_models.LoginScopes"] = None, **kwargs ): """ @@ -2749,13 +2672,13 @@ def __init__( :keyword login: The configuration settings of the login flow. :paramtype login: ~azure.mgmt.appcontainers.models.LoginScopes """ - super(GitHub, self).__init__(**kwargs) + super().__init__(**kwargs) self.enabled = enabled self.registration = registration self.login = login -class GithubActionConfiguration(msrest.serialization.Model): +class GithubActionConfiguration(_serialization.Model): """Configuration properties that define the mutable settings of a Container App SourceControl. :ivar registry_info: Registry configurations. @@ -2777,21 +2700,21 @@ class GithubActionConfiguration(msrest.serialization.Model): """ _attribute_map = { - 'registry_info': {'key': 'registryInfo', 'type': 'RegistryInfo'}, - 'azure_credentials': {'key': 'azureCredentials', 'type': 'AzureCredentials'}, - 'context_path': {'key': 'contextPath', 'type': 'str'}, - 'image': {'key': 'image', 'type': 'str'}, - 'publish_type': {'key': 'publishType', 'type': 'str'}, - 'os': {'key': 'os', 'type': 'str'}, - 'runtime_stack': {'key': 'runtimeStack', 'type': 'str'}, - 'runtime_version': {'key': 'runtimeVersion', 'type': 'str'}, + "registry_info": {"key": "registryInfo", "type": "RegistryInfo"}, + "azure_credentials": {"key": "azureCredentials", "type": "AzureCredentials"}, + "context_path": {"key": "contextPath", "type": "str"}, + "image": {"key": "image", "type": "str"}, + "publish_type": {"key": "publishType", "type": "str"}, + "os": {"key": "os", "type": "str"}, + "runtime_stack": {"key": "runtimeStack", "type": "str"}, + "runtime_version": {"key": "runtimeVersion", "type": "str"}, } def __init__( self, *, - registry_info: Optional["RegistryInfo"] = None, - azure_credentials: Optional["AzureCredentials"] = None, + registry_info: Optional["_models.RegistryInfo"] = None, + azure_credentials: Optional["_models.AzureCredentials"] = None, context_path: Optional[str] = None, image: Optional[str] = None, publish_type: Optional[str] = None, @@ -2818,7 +2741,7 @@ def __init__( :keyword runtime_version: Runtime version. :paramtype runtime_version: str """ - super(GithubActionConfiguration, self).__init__(**kwargs) + super().__init__(**kwargs) self.registry_info = registry_info self.azure_credentials = azure_credentials self.context_path = context_path @@ -2829,12 +2752,12 @@ def __init__( self.runtime_version = runtime_version -class GlobalValidation(msrest.serialization.Model): +class GlobalValidation(_serialization.Model): """The configuration settings that determines the validation flow of users using ContainerApp Service Authentication/Authorization. :ivar unauthenticated_client_action: The action to take when an unauthenticated client attempts - to access the app. Possible values include: "RedirectToLoginPage", "AllowAnonymous", - "Return401", "Return403". + to access the app. Known values are: "RedirectToLoginPage", "AllowAnonymous", "Return401", and + "Return403". :vartype unauthenticated_client_action: str or ~azure.mgmt.appcontainers.models.UnauthenticatedClientActionV2 :ivar redirect_to_provider: The default authentication provider to use when multiple providers @@ -2849,23 +2772,23 @@ class GlobalValidation(msrest.serialization.Model): """ _attribute_map = { - 'unauthenticated_client_action': {'key': 'unauthenticatedClientAction', 'type': 'str'}, - 'redirect_to_provider': {'key': 'redirectToProvider', 'type': 'str'}, - 'excluded_paths': {'key': 'excludedPaths', 'type': '[str]'}, + "unauthenticated_client_action": {"key": "unauthenticatedClientAction", "type": "str"}, + "redirect_to_provider": {"key": "redirectToProvider", "type": "str"}, + "excluded_paths": {"key": "excludedPaths", "type": "[str]"}, } def __init__( self, *, - unauthenticated_client_action: Optional[Union[str, "UnauthenticatedClientActionV2"]] = None, + unauthenticated_client_action: Optional[Union[str, "_models.UnauthenticatedClientActionV2"]] = None, redirect_to_provider: Optional[str] = None, excluded_paths: Optional[List[str]] = None, **kwargs ): """ :keyword unauthenticated_client_action: The action to take when an unauthenticated client - attempts to access the app. Possible values include: "RedirectToLoginPage", "AllowAnonymous", - "Return401", "Return403". + attempts to access the app. Known values are: "RedirectToLoginPage", "AllowAnonymous", + "Return401", and "Return403". :paramtype unauthenticated_client_action: str or ~azure.mgmt.appcontainers.models.UnauthenticatedClientActionV2 :keyword redirect_to_provider: The default authentication provider to use when multiple @@ -2878,13 +2801,13 @@ def __init__( the login page. :paramtype excluded_paths: list[str] """ - super(GlobalValidation, self).__init__(**kwargs) + super().__init__(**kwargs) self.unauthenticated_client_action = unauthenticated_client_action self.redirect_to_provider = redirect_to_provider self.excluded_paths = excluded_paths -class Google(msrest.serialization.Model): +class Google(_serialization.Model): """The configuration settings of the Google provider. :ivar enabled: :code:`false` if the Google provider should not be enabled despite @@ -2900,19 +2823,19 @@ class Google(msrest.serialization.Model): """ _attribute_map = { - 'enabled': {'key': 'enabled', 'type': 'bool'}, - 'registration': {'key': 'registration', 'type': 'ClientRegistration'}, - 'login': {'key': 'login', 'type': 'LoginScopes'}, - 'validation': {'key': 'validation', 'type': 'AllowedAudiencesValidation'}, + "enabled": {"key": "enabled", "type": "bool"}, + "registration": {"key": "registration", "type": "ClientRegistration"}, + "login": {"key": "login", "type": "LoginScopes"}, + "validation": {"key": "validation", "type": "AllowedAudiencesValidation"}, } def __init__( self, *, enabled: Optional[bool] = None, - registration: Optional["ClientRegistration"] = None, - login: Optional["LoginScopes"] = None, - validation: Optional["AllowedAudiencesValidation"] = None, + registration: Optional["_models.ClientRegistration"] = None, + login: Optional["_models.LoginScopes"] = None, + validation: Optional["_models.AllowedAudiencesValidation"] = None, **kwargs ): """ @@ -2928,14 +2851,14 @@ def __init__( flow. :paramtype validation: ~azure.mgmt.appcontainers.models.AllowedAudiencesValidation """ - super(Google, self).__init__(**kwargs) + super().__init__(**kwargs) self.enabled = enabled self.registration = registration self.login = login self.validation = validation -class HttpScaleRule(msrest.serialization.Model): +class HttpScaleRule(_serialization.Model): """Container App container Custom scaling rule. :ivar metadata: Metadata properties to describe http scale rule. @@ -2945,15 +2868,15 @@ class HttpScaleRule(msrest.serialization.Model): """ _attribute_map = { - 'metadata': {'key': 'metadata', 'type': '{str}'}, - 'auth': {'key': 'auth', 'type': '[ScaleRuleAuth]'}, + "metadata": {"key": "metadata", "type": "{str}"}, + "auth": {"key": "auth", "type": "[ScaleRuleAuth]"}, } def __init__( self, *, metadata: Optional[Dict[str, str]] = None, - auth: Optional[List["ScaleRuleAuth"]] = None, + auth: Optional[List["_models.ScaleRuleAuth"]] = None, **kwargs ): """ @@ -2962,12 +2885,12 @@ def __init__( :keyword auth: Authentication secrets for the custom scale rule. :paramtype auth: list[~azure.mgmt.appcontainers.models.ScaleRuleAuth] """ - super(HttpScaleRule, self).__init__(**kwargs) + super().__init__(**kwargs) self.metadata = metadata self.auth = auth -class HttpSettings(msrest.serialization.Model): +class HttpSettings(_serialization.Model): """The configuration settings of the HTTP requests for authentication and authorization requests made against ContainerApp Service Authentication/Authorization. :ivar require_https: :code:`false` if the authentication/authorization responses @@ -2980,17 +2903,17 @@ class HttpSettings(msrest.serialization.Model): """ _attribute_map = { - 'require_https': {'key': 'requireHttps', 'type': 'bool'}, - 'routes': {'key': 'routes', 'type': 'HttpSettingsRoutes'}, - 'forward_proxy': {'key': 'forwardProxy', 'type': 'ForwardProxy'}, + "require_https": {"key": "requireHttps", "type": "bool"}, + "routes": {"key": "routes", "type": "HttpSettingsRoutes"}, + "forward_proxy": {"key": "forwardProxy", "type": "ForwardProxy"}, } def __init__( self, *, require_https: Optional[bool] = None, - routes: Optional["HttpSettingsRoutes"] = None, - forward_proxy: Optional["ForwardProxy"] = None, + routes: Optional["_models.HttpSettingsRoutes"] = None, + forward_proxy: Optional["_models.ForwardProxy"] = None, **kwargs ): """ @@ -3003,13 +2926,13 @@ def __init__( requests. :paramtype forward_proxy: ~azure.mgmt.appcontainers.models.ForwardProxy """ - super(HttpSettings, self).__init__(**kwargs) + super().__init__(**kwargs) self.require_https = require_https self.routes = routes self.forward_proxy = forward_proxy -class HttpSettingsRoutes(msrest.serialization.Model): +class HttpSettingsRoutes(_serialization.Model): """The configuration settings of the paths HTTP requests. :ivar api_prefix: The prefix that should precede all the authentication/authorization paths. @@ -3017,24 +2940,19 @@ class HttpSettingsRoutes(msrest.serialization.Model): """ _attribute_map = { - 'api_prefix': {'key': 'apiPrefix', 'type': 'str'}, + "api_prefix": {"key": "apiPrefix", "type": "str"}, } - def __init__( - self, - *, - api_prefix: Optional[str] = None, - **kwargs - ): + def __init__(self, *, api_prefix: Optional[str] = None, **kwargs): """ :keyword api_prefix: The prefix that should precede all the authentication/authorization paths. :paramtype api_prefix: str """ - super(HttpSettingsRoutes, self).__init__(**kwargs) + super().__init__(**kwargs) self.api_prefix = api_prefix -class IdentityProviders(msrest.serialization.Model): +class IdentityProviders(_serialization.Model): """The configuration settings of each of the identity providers used to configure ContainerApp Service Authentication/Authorization. :ivar azure_active_directory: The configuration settings of the Azure Active directory @@ -3060,27 +2978,30 @@ class IdentityProviders(msrest.serialization.Model): """ _attribute_map = { - 'azure_active_directory': {'key': 'azureActiveDirectory', 'type': 'AzureActiveDirectory'}, - 'facebook': {'key': 'facebook', 'type': 'Facebook'}, - 'git_hub': {'key': 'gitHub', 'type': 'GitHub'}, - 'google': {'key': 'google', 'type': 'Google'}, - 'twitter': {'key': 'twitter', 'type': 'Twitter'}, - 'apple': {'key': 'apple', 'type': 'Apple'}, - 'azure_static_web_apps': {'key': 'azureStaticWebApps', 'type': 'AzureStaticWebApps'}, - 'custom_open_id_connect_providers': {'key': 'customOpenIdConnectProviders', 'type': '{CustomOpenIdConnectProvider}'}, + "azure_active_directory": {"key": "azureActiveDirectory", "type": "AzureActiveDirectory"}, + "facebook": {"key": "facebook", "type": "Facebook"}, + "git_hub": {"key": "gitHub", "type": "GitHub"}, + "google": {"key": "google", "type": "Google"}, + "twitter": {"key": "twitter", "type": "Twitter"}, + "apple": {"key": "apple", "type": "Apple"}, + "azure_static_web_apps": {"key": "azureStaticWebApps", "type": "AzureStaticWebApps"}, + "custom_open_id_connect_providers": { + "key": "customOpenIdConnectProviders", + "type": "{CustomOpenIdConnectProvider}", + }, } def __init__( self, *, - azure_active_directory: Optional["AzureActiveDirectory"] = None, - facebook: Optional["Facebook"] = None, - git_hub: Optional["GitHub"] = None, - google: Optional["Google"] = None, - twitter: Optional["Twitter"] = None, - apple: Optional["Apple"] = None, - azure_static_web_apps: Optional["AzureStaticWebApps"] = None, - custom_open_id_connect_providers: Optional[Dict[str, "CustomOpenIdConnectProvider"]] = None, + azure_active_directory: Optional["_models.AzureActiveDirectory"] = None, + facebook: Optional["_models.Facebook"] = None, + git_hub: Optional["_models.GitHub"] = None, + google: Optional["_models.Google"] = None, + twitter: Optional["_models.Twitter"] = None, + apple: Optional["_models.Apple"] = None, + azure_static_web_apps: Optional["_models.AzureStaticWebApps"] = None, + custom_open_id_connect_providers: Optional[Dict[str, "_models.CustomOpenIdConnectProvider"]] = None, **kwargs ): """ @@ -3106,7 +3027,7 @@ def __init__( :paramtype custom_open_id_connect_providers: dict[str, ~azure.mgmt.appcontainers.models.CustomOpenIdConnectProvider] """ - super(IdentityProviders, self).__init__(**kwargs) + super().__init__(**kwargs) self.azure_active_directory = azure_active_directory self.facebook = facebook self.git_hub = git_hub @@ -3117,7 +3038,7 @@ def __init__( self.custom_open_id_connect_providers = custom_open_id_connect_providers -class Ingress(msrest.serialization.Model): +class Ingress(_serialization.Model): """Container App Ingress configuration. Variables are only populated by the server, and will be ignored when sending a request. @@ -3128,7 +3049,7 @@ class Ingress(msrest.serialization.Model): :vartype external: bool :ivar target_port: Target Port in containers for traffic from ingress. :vartype target_port: int - :ivar transport: Ingress transport protocol. Possible values include: "auto", "http", "http2". + :ivar transport: Ingress transport protocol. Known values are: "auto", "http", and "http2". :vartype transport: str or ~azure.mgmt.appcontainers.models.IngressTransportMethod :ivar traffic: Traffic weights for app's revisions. :vartype traffic: list[~azure.mgmt.appcontainers.models.TrafficWeight] @@ -3140,27 +3061,27 @@ class Ingress(msrest.serialization.Model): """ _validation = { - 'fqdn': {'readonly': True}, + "fqdn": {"readonly": True}, } _attribute_map = { - 'fqdn': {'key': 'fqdn', 'type': 'str'}, - 'external': {'key': 'external', 'type': 'bool'}, - 'target_port': {'key': 'targetPort', 'type': 'int'}, - 'transport': {'key': 'transport', 'type': 'str'}, - 'traffic': {'key': 'traffic', 'type': '[TrafficWeight]'}, - 'custom_domains': {'key': 'customDomains', 'type': '[CustomDomain]'}, - 'allow_insecure': {'key': 'allowInsecure', 'type': 'bool'}, + "fqdn": {"key": "fqdn", "type": "str"}, + "external": {"key": "external", "type": "bool"}, + "target_port": {"key": "targetPort", "type": "int"}, + "transport": {"key": "transport", "type": "str"}, + "traffic": {"key": "traffic", "type": "[TrafficWeight]"}, + "custom_domains": {"key": "customDomains", "type": "[CustomDomain]"}, + "allow_insecure": {"key": "allowInsecure", "type": "bool"}, } def __init__( self, *, - external: Optional[bool] = False, + external: bool = False, target_port: Optional[int] = None, - transport: Optional[Union[str, "IngressTransportMethod"]] = None, - traffic: Optional[List["TrafficWeight"]] = None, - custom_domains: Optional[List["CustomDomain"]] = None, + transport: Optional[Union[str, "_models.IngressTransportMethod"]] = None, + traffic: Optional[List["_models.TrafficWeight"]] = None, + custom_domains: Optional[List["_models.CustomDomain"]] = None, allow_insecure: Optional[bool] = None, **kwargs ): @@ -3169,8 +3090,7 @@ def __init__( :paramtype external: bool :keyword target_port: Target Port in containers for traffic from ingress. :paramtype target_port: int - :keyword transport: Ingress transport protocol. Possible values include: "auto", "http", - "http2". + :keyword transport: Ingress transport protocol. Known values are: "auto", "http", and "http2". :paramtype transport: str or ~azure.mgmt.appcontainers.models.IngressTransportMethod :keyword traffic: Traffic weights for app's revisions. :paramtype traffic: list[~azure.mgmt.appcontainers.models.TrafficWeight] @@ -3180,7 +3100,7 @@ def __init__( HTTP connections are automatically redirected to HTTPS connections. :paramtype allow_insecure: bool """ - super(Ingress, self).__init__(**kwargs) + super().__init__(**kwargs) self.fqdn = None self.external = external self.target_port = target_port @@ -3190,7 +3110,7 @@ def __init__( self.allow_insecure = allow_insecure -class JwtClaimChecks(msrest.serialization.Model): +class JwtClaimChecks(_serialization.Model): """The configuration settings of the checks that should be made while validating the JWT Claims. :ivar allowed_groups: The list of the allowed groups. @@ -3200,8 +3120,8 @@ class JwtClaimChecks(msrest.serialization.Model): """ _attribute_map = { - 'allowed_groups': {'key': 'allowedGroups', 'type': '[str]'}, - 'allowed_client_applications': {'key': 'allowedClientApplications', 'type': '[str]'}, + "allowed_groups": {"key": "allowedGroups", "type": "[str]"}, + "allowed_client_applications": {"key": "allowedClientApplications", "type": "[str]"}, } def __init__( @@ -3217,12 +3137,12 @@ def __init__( :keyword allowed_client_applications: The list of the allowed client applications. :paramtype allowed_client_applications: list[str] """ - super(JwtClaimChecks, self).__init__(**kwargs) + super().__init__(**kwargs) self.allowed_groups = allowed_groups self.allowed_client_applications = allowed_client_applications -class LogAnalyticsConfiguration(msrest.serialization.Model): +class LogAnalyticsConfiguration(_serialization.Model): """Log analytics configuration. :ivar customer_id: Log analytics customer id. @@ -3232,29 +3152,23 @@ class LogAnalyticsConfiguration(msrest.serialization.Model): """ _attribute_map = { - 'customer_id': {'key': 'customerId', 'type': 'str'}, - 'shared_key': {'key': 'sharedKey', 'type': 'str'}, + "customer_id": {"key": "customerId", "type": "str"}, + "shared_key": {"key": "sharedKey", "type": "str"}, } - def __init__( - self, - *, - customer_id: Optional[str] = None, - shared_key: Optional[str] = None, - **kwargs - ): + def __init__(self, *, customer_id: Optional[str] = None, shared_key: Optional[str] = None, **kwargs): """ :keyword customer_id: Log analytics customer id. :paramtype customer_id: str :keyword shared_key: Log analytics customer key. :paramtype shared_key: str """ - super(LogAnalyticsConfiguration, self).__init__(**kwargs) + super().__init__(**kwargs) self.customer_id = customer_id self.shared_key = shared_key -class Login(msrest.serialization.Model): +class Login(_serialization.Model): """The configuration settings of the login flow of users using ContainerApp Service Authentication/Authorization. :ivar routes: The routes that specify the endpoints used for login and logout requests. @@ -3274,21 +3188,21 @@ class Login(msrest.serialization.Model): """ _attribute_map = { - 'routes': {'key': 'routes', 'type': 'LoginRoutes'}, - 'preserve_url_fragments_for_logins': {'key': 'preserveUrlFragmentsForLogins', 'type': 'bool'}, - 'allowed_external_redirect_urls': {'key': 'allowedExternalRedirectUrls', 'type': '[str]'}, - 'cookie_expiration': {'key': 'cookieExpiration', 'type': 'CookieExpiration'}, - 'nonce': {'key': 'nonce', 'type': 'Nonce'}, + "routes": {"key": "routes", "type": "LoginRoutes"}, + "preserve_url_fragments_for_logins": {"key": "preserveUrlFragmentsForLogins", "type": "bool"}, + "allowed_external_redirect_urls": {"key": "allowedExternalRedirectUrls", "type": "[str]"}, + "cookie_expiration": {"key": "cookieExpiration", "type": "CookieExpiration"}, + "nonce": {"key": "nonce", "type": "Nonce"}, } def __init__( self, *, - routes: Optional["LoginRoutes"] = None, + routes: Optional["_models.LoginRoutes"] = None, preserve_url_fragments_for_logins: Optional[bool] = None, allowed_external_redirect_urls: Optional[List[str]] = None, - cookie_expiration: Optional["CookieExpiration"] = None, - nonce: Optional["Nonce"] = None, + cookie_expiration: Optional["_models.CookieExpiration"] = None, + nonce: Optional["_models.Nonce"] = None, **kwargs ): """ @@ -3307,7 +3221,7 @@ def __init__( :keyword nonce: The configuration settings of the nonce used in the login flow. :paramtype nonce: ~azure.mgmt.appcontainers.models.Nonce """ - super(Login, self).__init__(**kwargs) + super().__init__(**kwargs) self.routes = routes self.preserve_url_fragments_for_logins = preserve_url_fragments_for_logins self.allowed_external_redirect_urls = allowed_external_redirect_urls @@ -3315,7 +3229,7 @@ def __init__( self.nonce = nonce -class LoginRoutes(msrest.serialization.Model): +class LoginRoutes(_serialization.Model): """The routes that specify the endpoints used for login and logout requests. :ivar logout_endpoint: The endpoint at which a logout request should be made. @@ -3323,24 +3237,19 @@ class LoginRoutes(msrest.serialization.Model): """ _attribute_map = { - 'logout_endpoint': {'key': 'logoutEndpoint', 'type': 'str'}, + "logout_endpoint": {"key": "logoutEndpoint", "type": "str"}, } - def __init__( - self, - *, - logout_endpoint: Optional[str] = None, - **kwargs - ): + def __init__(self, *, logout_endpoint: Optional[str] = None, **kwargs): """ :keyword logout_endpoint: The endpoint at which a logout request should be made. :paramtype logout_endpoint: str """ - super(LoginRoutes, self).__init__(**kwargs) + super().__init__(**kwargs) self.logout_endpoint = logout_endpoint -class LoginScopes(msrest.serialization.Model): +class LoginScopes(_serialization.Model): """The configuration settings of the login flow, including the scopes that should be requested. :ivar scopes: A list of the scopes that should be requested while authenticating. @@ -3348,24 +3257,19 @@ class LoginScopes(msrest.serialization.Model): """ _attribute_map = { - 'scopes': {'key': 'scopes', 'type': '[str]'}, + "scopes": {"key": "scopes", "type": "[str]"}, } - def __init__( - self, - *, - scopes: Optional[List[str]] = None, - **kwargs - ): + def __init__(self, *, scopes: Optional[List[str]] = None, **kwargs): """ :keyword scopes: A list of the scopes that should be requested while authenticating. :paramtype scopes: list[str] """ - super(LoginScopes, self).__init__(**kwargs) + super().__init__(**kwargs) self.scopes = scopes -class ManagedEnvironment(TrackedResource): +class ManagedEnvironment(TrackedResource): # pylint: disable=too-many-instance-attributes """An environment for hosting container apps. Variables are only populated by the server, and will be ignored when sending a request. @@ -3383,14 +3287,13 @@ class ManagedEnvironment(TrackedResource): :ivar system_data: Azure Resource Manager metadata containing createdBy and modifiedBy information. :vartype system_data: ~azure.mgmt.appcontainers.models.SystemData - :ivar tags: A set of tags. Resource tags. + :ivar tags: Resource tags. :vartype tags: dict[str, str] - :ivar location: Required. The geo-location where the resource lives. + :ivar location: The geo-location where the resource lives. Required. :vartype location: str - :ivar provisioning_state: Provisioning state of the Environment. Possible values include: - "Succeeded", "Failed", "Canceled", "Waiting", "InitializationInProgress", - "InfrastructureSetupInProgress", "InfrastructureSetupComplete", "ScheduledForDelete", - "UpgradeRequested", "UpgradeFailed". + :ivar provisioning_state: Provisioning state of the Environment. Known values are: "Succeeded", + "Failed", "Canceled", "Waiting", "InitializationInProgress", "InfrastructureSetupInProgress", + "InfrastructureSetupComplete", "ScheduledForDelete", "UpgradeRequested", and "UpgradeFailed". :vartype provisioning_state: str or ~azure.mgmt.appcontainers.models.EnvironmentProvisioningState :ivar dapr_ai_instrumentation_key: Azure Monitor instrumentation key used by Dapr to export @@ -3416,33 +3319,33 @@ class ManagedEnvironment(TrackedResource): """ _validation = { - 'id': {'readonly': True}, - 'name': {'readonly': True}, - 'type': {'readonly': True}, - 'system_data': {'readonly': True}, - 'location': {'required': True}, - 'provisioning_state': {'readonly': True}, - 'deployment_errors': {'readonly': True}, - 'default_domain': {'readonly': True}, - 'static_ip': {'readonly': True}, + "id": {"readonly": True}, + "name": {"readonly": True}, + "type": {"readonly": True}, + "system_data": {"readonly": True}, + "location": {"required": True}, + "provisioning_state": {"readonly": True}, + "deployment_errors": {"readonly": True}, + "default_domain": {"readonly": True}, + "static_ip": {"readonly": True}, } _attribute_map = { - 'id': {'key': 'id', 'type': 'str'}, - 'name': {'key': 'name', 'type': 'str'}, - 'type': {'key': 'type', 'type': 'str'}, - 'system_data': {'key': 'systemData', 'type': 'SystemData'}, - 'tags': {'key': 'tags', 'type': '{str}'}, - 'location': {'key': 'location', 'type': 'str'}, - 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, - 'dapr_ai_instrumentation_key': {'key': 'properties.daprAIInstrumentationKey', 'type': 'str'}, - 'dapr_ai_connection_string': {'key': 'properties.daprAIConnectionString', 'type': 'str'}, - 'vnet_configuration': {'key': 'properties.vnetConfiguration', 'type': 'VnetConfiguration'}, - 'deployment_errors': {'key': 'properties.deploymentErrors', 'type': 'str'}, - 'default_domain': {'key': 'properties.defaultDomain', 'type': 'str'}, - 'static_ip': {'key': 'properties.staticIp', 'type': 'str'}, - 'app_logs_configuration': {'key': 'properties.appLogsConfiguration', 'type': 'AppLogsConfiguration'}, - 'zone_redundant': {'key': 'properties.zoneRedundant', 'type': 'bool'}, + "id": {"key": "id", "type": "str"}, + "name": {"key": "name", "type": "str"}, + "type": {"key": "type", "type": "str"}, + "system_data": {"key": "systemData", "type": "SystemData"}, + "tags": {"key": "tags", "type": "{str}"}, + "location": {"key": "location", "type": "str"}, + "provisioning_state": {"key": "properties.provisioningState", "type": "str"}, + "dapr_ai_instrumentation_key": {"key": "properties.daprAIInstrumentationKey", "type": "str"}, + "dapr_ai_connection_string": {"key": "properties.daprAIConnectionString", "type": "str"}, + "vnet_configuration": {"key": "properties.vnetConfiguration", "type": "VnetConfiguration"}, + "deployment_errors": {"key": "properties.deploymentErrors", "type": "str"}, + "default_domain": {"key": "properties.defaultDomain", "type": "str"}, + "static_ip": {"key": "properties.staticIp", "type": "str"}, + "app_logs_configuration": {"key": "properties.appLogsConfiguration", "type": "AppLogsConfiguration"}, + "zone_redundant": {"key": "properties.zoneRedundant", "type": "bool"}, } def __init__( @@ -3452,15 +3355,15 @@ def __init__( tags: Optional[Dict[str, str]] = None, dapr_ai_instrumentation_key: Optional[str] = None, dapr_ai_connection_string: Optional[str] = None, - vnet_configuration: Optional["VnetConfiguration"] = None, - app_logs_configuration: Optional["AppLogsConfiguration"] = None, + vnet_configuration: Optional["_models.VnetConfiguration"] = None, + app_logs_configuration: Optional["_models.AppLogsConfiguration"] = None, zone_redundant: Optional[bool] = None, **kwargs ): """ - :keyword tags: A set of tags. Resource tags. + :keyword tags: Resource tags. :paramtype tags: dict[str, str] - :keyword location: Required. The geo-location where the resource lives. + :keyword location: The geo-location where the resource lives. Required. :paramtype location: str :keyword dapr_ai_instrumentation_key: Azure Monitor instrumentation key used by Dapr to export Service to Service communication telemetry. @@ -3477,7 +3380,7 @@ def __init__( :keyword zone_redundant: Whether or not this Managed Environment is zone-redundant. :paramtype zone_redundant: bool """ - super(ManagedEnvironment, self).__init__(tags=tags, location=location, **kwargs) + super().__init__(tags=tags, location=location, **kwargs) self.provisioning_state = None self.dapr_ai_instrumentation_key = dapr_ai_instrumentation_key self.dapr_ai_connection_string = dapr_ai_connection_string @@ -3489,40 +3392,35 @@ def __init__( self.zone_redundant = zone_redundant -class ManagedEnvironmentsCollection(msrest.serialization.Model): +class ManagedEnvironmentsCollection(_serialization.Model): """Collection of Environments. Variables are only populated by the server, and will be ignored when sending a request. All required parameters must be populated in order to send to Azure. - :ivar value: Required. Collection of resources. + :ivar value: Collection of resources. Required. :vartype value: list[~azure.mgmt.appcontainers.models.ManagedEnvironment] :ivar next_link: Link to next page of resources. :vartype next_link: str """ _validation = { - 'value': {'required': True}, - 'next_link': {'readonly': True}, + "value": {"required": True}, + "next_link": {"readonly": True}, } _attribute_map = { - 'value': {'key': 'value', 'type': '[ManagedEnvironment]'}, - 'next_link': {'key': 'nextLink', 'type': 'str'}, + "value": {"key": "value", "type": "[ManagedEnvironment]"}, + "next_link": {"key": "nextLink", "type": "str"}, } - def __init__( - self, - *, - value: List["ManagedEnvironment"], - **kwargs - ): + def __init__(self, *, value: List["_models.ManagedEnvironment"], **kwargs): """ - :keyword value: Required. Collection of resources. + :keyword value: Collection of resources. Required. :paramtype value: list[~azure.mgmt.appcontainers.models.ManagedEnvironment] """ - super(ManagedEnvironmentsCollection, self).__init__(**kwargs) + super().__init__(**kwargs) self.value = value self.next_link = None @@ -3548,35 +3446,30 @@ class ManagedEnvironmentStorage(ProxyResource): """ _validation = { - 'id': {'readonly': True}, - 'name': {'readonly': True}, - 'type': {'readonly': True}, - 'system_data': {'readonly': True}, + "id": {"readonly": True}, + "name": {"readonly": True}, + "type": {"readonly": True}, + "system_data": {"readonly": True}, } _attribute_map = { - 'id': {'key': 'id', 'type': 'str'}, - 'name': {'key': 'name', 'type': 'str'}, - 'type': {'key': 'type', 'type': 'str'}, - 'system_data': {'key': 'systemData', 'type': 'SystemData'}, - 'properties': {'key': 'properties', 'type': 'ManagedEnvironmentStorageProperties'}, + "id": {"key": "id", "type": "str"}, + "name": {"key": "name", "type": "str"}, + "type": {"key": "type", "type": "str"}, + "system_data": {"key": "systemData", "type": "SystemData"}, + "properties": {"key": "properties", "type": "ManagedEnvironmentStorageProperties"}, } - def __init__( - self, - *, - properties: Optional["ManagedEnvironmentStorageProperties"] = None, - **kwargs - ): + def __init__(self, *, properties: Optional["_models.ManagedEnvironmentStorageProperties"] = None, **kwargs): """ :keyword properties: Storage properties. :paramtype properties: ~azure.mgmt.appcontainers.models.ManagedEnvironmentStorageProperties """ - super(ManagedEnvironmentStorage, self).__init__(**kwargs) + super().__init__(**kwargs) self.properties = properties -class ManagedEnvironmentStorageProperties(msrest.serialization.Model): +class ManagedEnvironmentStorageProperties(_serialization.Model): """Storage properties. :ivar azure_file: Azure file properties. @@ -3584,55 +3477,45 @@ class ManagedEnvironmentStorageProperties(msrest.serialization.Model): """ _attribute_map = { - 'azure_file': {'key': 'azureFile', 'type': 'AzureFileProperties'}, + "azure_file": {"key": "azureFile", "type": "AzureFileProperties"}, } - def __init__( - self, - *, - azure_file: Optional["AzureFileProperties"] = None, - **kwargs - ): + def __init__(self, *, azure_file: Optional["_models.AzureFileProperties"] = None, **kwargs): """ :keyword azure_file: Azure file properties. :paramtype azure_file: ~azure.mgmt.appcontainers.models.AzureFileProperties """ - super(ManagedEnvironmentStorageProperties, self).__init__(**kwargs) + super().__init__(**kwargs) self.azure_file = azure_file -class ManagedEnvironmentStoragesCollection(msrest.serialization.Model): +class ManagedEnvironmentStoragesCollection(_serialization.Model): """Collection of Storage for Environments. All required parameters must be populated in order to send to Azure. - :ivar value: Required. Collection of storage resources. + :ivar value: Collection of storage resources. Required. :vartype value: list[~azure.mgmt.appcontainers.models.ManagedEnvironmentStorage] """ _validation = { - 'value': {'required': True}, + "value": {"required": True}, } _attribute_map = { - 'value': {'key': 'value', 'type': '[ManagedEnvironmentStorage]'}, + "value": {"key": "value", "type": "[ManagedEnvironmentStorage]"}, } - def __init__( - self, - *, - value: List["ManagedEnvironmentStorage"], - **kwargs - ): + def __init__(self, *, value: List["_models.ManagedEnvironmentStorage"], **kwargs): """ - :keyword value: Required. Collection of storage resources. + :keyword value: Collection of storage resources. Required. :paramtype value: list[~azure.mgmt.appcontainers.models.ManagedEnvironmentStorage] """ - super(ManagedEnvironmentStoragesCollection, self).__init__(**kwargs) + super().__init__(**kwargs) self.value = value -class ManagedServiceIdentity(msrest.serialization.Model): +class ManagedServiceIdentity(_serialization.Model): """Managed service identity (system assigned and/or user assigned identities). Variables are only populated by the server, and will be ignored when sending a request. @@ -3645,9 +3528,9 @@ class ManagedServiceIdentity(msrest.serialization.Model): :ivar tenant_id: The tenant ID of the system assigned identity. This property will only be provided for a system assigned identity. :vartype tenant_id: str - :ivar type: Required. Type of managed service identity (where both SystemAssigned and - UserAssigned types are allowed). Possible values include: "None", "SystemAssigned", - "UserAssigned", "SystemAssigned,UserAssigned". + :ivar type: Type of managed service identity (where both SystemAssigned and UserAssigned types + are allowed). Required. Known values are: "None", "SystemAssigned", "UserAssigned", and + "SystemAssigned,UserAssigned". :vartype type: str or ~azure.mgmt.appcontainers.models.ManagedServiceIdentityType :ivar user_assigned_identities: The set of user assigned identities associated with the resource. The userAssignedIdentities dictionary keys will be ARM resource ids in the form: @@ -3658,29 +3541,29 @@ class ManagedServiceIdentity(msrest.serialization.Model): """ _validation = { - 'principal_id': {'readonly': True}, - 'tenant_id': {'readonly': True}, - 'type': {'required': True}, + "principal_id": {"readonly": True}, + "tenant_id": {"readonly": True}, + "type": {"required": True}, } _attribute_map = { - 'principal_id': {'key': 'principalId', 'type': 'str'}, - 'tenant_id': {'key': 'tenantId', 'type': 'str'}, - 'type': {'key': 'type', 'type': 'str'}, - 'user_assigned_identities': {'key': 'userAssignedIdentities', 'type': '{UserAssignedIdentity}'}, + "principal_id": {"key": "principalId", "type": "str"}, + "tenant_id": {"key": "tenantId", "type": "str"}, + "type": {"key": "type", "type": "str"}, + "user_assigned_identities": {"key": "userAssignedIdentities", "type": "{UserAssignedIdentity}"}, } def __init__( self, *, - type: Union[str, "ManagedServiceIdentityType"], - user_assigned_identities: Optional[Dict[str, "UserAssignedIdentity"]] = None, + type: Union[str, "_models.ManagedServiceIdentityType"], + user_assigned_identities: Optional[Dict[str, "_models.UserAssignedIdentity"]] = None, **kwargs ): """ - :keyword type: Required. Type of managed service identity (where both SystemAssigned and - UserAssigned types are allowed). Possible values include: "None", "SystemAssigned", - "UserAssigned", "SystemAssigned,UserAssigned". + :keyword type: Type of managed service identity (where both SystemAssigned and UserAssigned + types are allowed). Required. Known values are: "None", "SystemAssigned", "UserAssigned", and + "SystemAssigned,UserAssigned". :paramtype type: str or ~azure.mgmt.appcontainers.models.ManagedServiceIdentityType :keyword user_assigned_identities: The set of user assigned identities associated with the resource. The userAssignedIdentities dictionary keys will be ARM resource ids in the form: @@ -3689,14 +3572,14 @@ def __init__( :paramtype user_assigned_identities: dict[str, ~azure.mgmt.appcontainers.models.UserAssignedIdentity] """ - super(ManagedServiceIdentity, self).__init__(**kwargs) + super().__init__(**kwargs) self.principal_id = None self.tenant_id = None self.type = type self.user_assigned_identities = user_assigned_identities -class Nonce(msrest.serialization.Model): +class Nonce(_serialization.Model): """The configuration settings of the nonce used in the login flow. :ivar validate_nonce: :code:`false` if the nonce should not be validated while @@ -3708,16 +3591,12 @@ class Nonce(msrest.serialization.Model): """ _attribute_map = { - 'validate_nonce': {'key': 'validateNonce', 'type': 'bool'}, - 'nonce_expiration_interval': {'key': 'nonceExpirationInterval', 'type': 'str'}, + "validate_nonce": {"key": "validateNonce", "type": "bool"}, + "nonce_expiration_interval": {"key": "nonceExpirationInterval", "type": "str"}, } def __init__( - self, - *, - validate_nonce: Optional[bool] = None, - nonce_expiration_interval: Optional[str] = None, - **kwargs + self, *, validate_nonce: Optional[bool] = None, nonce_expiration_interval: Optional[str] = None, **kwargs ): """ :keyword validate_nonce: :code:`false` if the nonce should not be validated while @@ -3727,16 +3606,16 @@ def __init__( expire. :paramtype nonce_expiration_interval: str """ - super(Nonce, self).__init__(**kwargs) + super().__init__(**kwargs) self.validate_nonce = validate_nonce self.nonce_expiration_interval = nonce_expiration_interval -class OpenIdConnectClientCredential(msrest.serialization.Model): +class OpenIdConnectClientCredential(_serialization.Model): """The authentication client credentials of the custom Open ID Connect provider. - :ivar method: The method that should be used to authenticate the user. The only acceptable - values to pass in are None and "ClientSecretPost". The default value is None. + :ivar method: The method that should be used to authenticate the user. Default value is + "ClientSecretPost". :vartype method: str :ivar client_secret_setting_name: The app setting that contains the client secret for the custom Open ID Connect provider. @@ -3744,31 +3623,25 @@ class OpenIdConnectClientCredential(msrest.serialization.Model): """ _attribute_map = { - 'method': {'key': 'method', 'type': 'str'}, - 'client_secret_setting_name': {'key': 'clientSecretSettingName', 'type': 'str'}, + "method": {"key": "method", "type": "str"}, + "client_secret_setting_name": {"key": "clientSecretSettingName", "type": "str"}, } - def __init__( - self, - *, - method: Optional[str] = None, - client_secret_setting_name: Optional[str] = None, - **kwargs - ): + def __init__(self, *, method: Optional[str] = None, client_secret_setting_name: Optional[str] = None, **kwargs): """ - :keyword method: The method that should be used to authenticate the user. The only acceptable - values to pass in are None and "ClientSecretPost". The default value is None. + :keyword method: The method that should be used to authenticate the user. Default value is + "ClientSecretPost". :paramtype method: str :keyword client_secret_setting_name: The app setting that contains the client secret for the custom Open ID Connect provider. :paramtype client_secret_setting_name: str """ - super(OpenIdConnectClientCredential, self).__init__(**kwargs) + super().__init__(**kwargs) self.method = method self.client_secret_setting_name = client_secret_setting_name -class OpenIdConnectConfig(msrest.serialization.Model): +class OpenIdConnectConfig(_serialization.Model): """The configuration settings of the endpoints used for the custom Open ID Connect provider. :ivar authorization_endpoint: The endpoint to be used to make an authorization request. @@ -3785,11 +3658,11 @@ class OpenIdConnectConfig(msrest.serialization.Model): """ _attribute_map = { - 'authorization_endpoint': {'key': 'authorizationEndpoint', 'type': 'str'}, - 'token_endpoint': {'key': 'tokenEndpoint', 'type': 'str'}, - 'issuer': {'key': 'issuer', 'type': 'str'}, - 'certification_uri': {'key': 'certificationUri', 'type': 'str'}, - 'well_known_open_id_configuration': {'key': 'wellKnownOpenIdConfiguration', 'type': 'str'}, + "authorization_endpoint": {"key": "authorizationEndpoint", "type": "str"}, + "token_endpoint": {"key": "tokenEndpoint", "type": "str"}, + "issuer": {"key": "issuer", "type": "str"}, + "certification_uri": {"key": "certificationUri", "type": "str"}, + "well_known_open_id_configuration": {"key": "wellKnownOpenIdConfiguration", "type": "str"}, } def __init__( @@ -3816,7 +3689,7 @@ def __init__( endpoints for the provider. :paramtype well_known_open_id_configuration: str """ - super(OpenIdConnectConfig, self).__init__(**kwargs) + super().__init__(**kwargs) self.authorization_endpoint = authorization_endpoint self.token_endpoint = token_endpoint self.issuer = issuer @@ -3824,7 +3697,7 @@ def __init__( self.well_known_open_id_configuration = well_known_open_id_configuration -class OpenIdConnectLogin(msrest.serialization.Model): +class OpenIdConnectLogin(_serialization.Model): """The configuration settings of the login flow of the custom Open ID Connect provider. :ivar name_claim_type: The name of the claim that contains the users name. @@ -3834,29 +3707,23 @@ class OpenIdConnectLogin(msrest.serialization.Model): """ _attribute_map = { - 'name_claim_type': {'key': 'nameClaimType', 'type': 'str'}, - 'scopes': {'key': 'scopes', 'type': '[str]'}, + "name_claim_type": {"key": "nameClaimType", "type": "str"}, + "scopes": {"key": "scopes", "type": "[str]"}, } - def __init__( - self, - *, - name_claim_type: Optional[str] = None, - scopes: Optional[List[str]] = None, - **kwargs - ): + def __init__(self, *, name_claim_type: Optional[str] = None, scopes: Optional[List[str]] = None, **kwargs): """ :keyword name_claim_type: The name of the claim that contains the users name. :paramtype name_claim_type: str :keyword scopes: A list of the scopes that should be requested while authenticating. :paramtype scopes: list[str] """ - super(OpenIdConnectLogin, self).__init__(**kwargs) + super().__init__(**kwargs) self.name_claim_type = name_claim_type self.scopes = scopes -class OpenIdConnectRegistration(msrest.serialization.Model): +class OpenIdConnectRegistration(_serialization.Model): """The configuration settings of the app registration for the custom Open ID Connect provider. :ivar client_id: The client id of the custom Open ID Connect provider. @@ -3869,17 +3736,17 @@ class OpenIdConnectRegistration(msrest.serialization.Model): """ _attribute_map = { - 'client_id': {'key': 'clientId', 'type': 'str'}, - 'client_credential': {'key': 'clientCredential', 'type': 'OpenIdConnectClientCredential'}, - 'open_id_connect_configuration': {'key': 'openIdConnectConfiguration', 'type': 'OpenIdConnectConfig'}, + "client_id": {"key": "clientId", "type": "str"}, + "client_credential": {"key": "clientCredential", "type": "OpenIdConnectClientCredential"}, + "open_id_connect_configuration": {"key": "openIdConnectConfiguration", "type": "OpenIdConnectConfig"}, } def __init__( self, *, client_id: Optional[str] = None, - client_credential: Optional["OpenIdConnectClientCredential"] = None, - open_id_connect_configuration: Optional["OpenIdConnectConfig"] = None, + client_credential: Optional["_models.OpenIdConnectClientCredential"] = None, + open_id_connect_configuration: Optional["_models.OpenIdConnectConfig"] = None, **kwargs ): """ @@ -3892,13 +3759,13 @@ def __init__( the custom Open ID Connect provider. :paramtype open_id_connect_configuration: ~azure.mgmt.appcontainers.models.OpenIdConnectConfig """ - super(OpenIdConnectRegistration, self).__init__(**kwargs) + super().__init__(**kwargs) self.client_id = client_id self.client_credential = client_credential self.open_id_connect_configuration = open_id_connect_configuration -class OperationDetail(msrest.serialization.Model): +class OperationDetail(_serialization.Model): """Operation detail payload. :ivar name: Name of the operation. @@ -3912,10 +3779,10 @@ class OperationDetail(msrest.serialization.Model): """ _attribute_map = { - 'name': {'key': 'name', 'type': 'str'}, - 'is_data_action': {'key': 'isDataAction', 'type': 'bool'}, - 'display': {'key': 'display', 'type': 'OperationDisplay'}, - 'origin': {'key': 'origin', 'type': 'str'}, + "name": {"key": "name", "type": "str"}, + "is_data_action": {"key": "isDataAction", "type": "bool"}, + "display": {"key": "display", "type": "OperationDisplay"}, + "origin": {"key": "origin", "type": "str"}, } def __init__( @@ -3923,7 +3790,7 @@ def __init__( *, name: Optional[str] = None, is_data_action: Optional[bool] = None, - display: Optional["OperationDisplay"] = None, + display: Optional["_models.OperationDisplay"] = None, origin: Optional[str] = None, **kwargs ): @@ -3937,14 +3804,14 @@ def __init__( :keyword origin: Origin of the operation. :paramtype origin: str """ - super(OperationDetail, self).__init__(**kwargs) + super().__init__(**kwargs) self.name = name self.is_data_action = is_data_action self.display = display self.origin = origin -class OperationDisplay(msrest.serialization.Model): +class OperationDisplay(_serialization.Model): """Operation display payload. :ivar provider: Resource provider of the operation. @@ -3958,10 +3825,10 @@ class OperationDisplay(msrest.serialization.Model): """ _attribute_map = { - 'provider': {'key': 'provider', 'type': 'str'}, - 'resource': {'key': 'resource', 'type': 'str'}, - 'operation': {'key': 'operation', 'type': 'str'}, - 'description': {'key': 'description', 'type': 'str'}, + "provider": {"key": "provider", "type": "str"}, + "resource": {"key": "resource", "type": "str"}, + "operation": {"key": "operation", "type": "str"}, + "description": {"key": "description", "type": "str"}, } def __init__( @@ -3983,14 +3850,14 @@ def __init__( :keyword description: Localized friendly description for the operation. :paramtype description: str """ - super(OperationDisplay, self).__init__(**kwargs) + super().__init__(**kwargs) self.provider = provider self.resource = resource self.operation = operation self.description = description -class QueueScaleRule(msrest.serialization.Model): +class QueueScaleRule(_serialization.Model): """Container App container Azure Queue based scaling rule. :ivar queue_name: Queue name. @@ -4002,9 +3869,9 @@ class QueueScaleRule(msrest.serialization.Model): """ _attribute_map = { - 'queue_name': {'key': 'queueName', 'type': 'str'}, - 'queue_length': {'key': 'queueLength', 'type': 'int'}, - 'auth': {'key': 'auth', 'type': '[ScaleRuleAuth]'}, + "queue_name": {"key": "queueName", "type": "str"}, + "queue_length": {"key": "queueLength", "type": "int"}, + "auth": {"key": "auth", "type": "[ScaleRuleAuth]"}, } def __init__( @@ -4012,7 +3879,7 @@ def __init__( *, queue_name: Optional[str] = None, queue_length: Optional[int] = None, - auth: Optional[List["ScaleRuleAuth"]] = None, + auth: Optional[List["_models.ScaleRuleAuth"]] = None, **kwargs ): """ @@ -4023,13 +3890,13 @@ def __init__( :keyword auth: Authentication secrets for the queue scale rule. :paramtype auth: list[~azure.mgmt.appcontainers.models.ScaleRuleAuth] """ - super(QueueScaleRule, self).__init__(**kwargs) + super().__init__(**kwargs) self.queue_name = queue_name self.queue_length = queue_length self.auth = auth -class RegistryCredentials(msrest.serialization.Model): +class RegistryCredentials(_serialization.Model): """Container App Private Registry. :ivar server: Container Registry Server. @@ -4045,10 +3912,10 @@ class RegistryCredentials(msrest.serialization.Model): """ _attribute_map = { - 'server': {'key': 'server', 'type': 'str'}, - 'username': {'key': 'username', 'type': 'str'}, - 'password_secret_ref': {'key': 'passwordSecretRef', 'type': 'str'}, - 'identity': {'key': 'identity', 'type': 'str'}, + "server": {"key": "server", "type": "str"}, + "username": {"key": "username", "type": "str"}, + "password_secret_ref": {"key": "passwordSecretRef", "type": "str"}, + "identity": {"key": "identity", "type": "str"}, } def __init__( @@ -4072,14 +3939,14 @@ def __init__( identities, use 'system'. :paramtype identity: str """ - super(RegistryCredentials, self).__init__(**kwargs) + super().__init__(**kwargs) self.server = server self.username = username self.password_secret_ref = password_secret_ref self.identity = identity -class RegistryInfo(msrest.serialization.Model): +class RegistryInfo(_serialization.Model): """Container App registry information. :ivar registry_url: registry server Url. @@ -4091,9 +3958,9 @@ class RegistryInfo(msrest.serialization.Model): """ _attribute_map = { - 'registry_url': {'key': 'registryUrl', 'type': 'str'}, - 'registry_user_name': {'key': 'registryUserName', 'type': 'str'}, - 'registry_password': {'key': 'registryPassword', 'type': 'str'}, + "registry_url": {"key": "registryUrl", "type": "str"}, + "registry_user_name": {"key": "registryUserName", "type": "str"}, + "registry_password": {"key": "registryPassword", "type": "str"}, } def __init__( @@ -4112,7 +3979,7 @@ def __init__( :keyword registry_password: registry secret. :paramtype registry_password: str """ - super(RegistryInfo, self).__init__(**kwargs) + super().__init__(**kwargs) self.registry_url = registry_url self.registry_user_name = registry_user_name self.registry_password = registry_password @@ -4141,69 +4008,59 @@ class Replica(ProxyResource): """ _validation = { - 'id': {'readonly': True}, - 'name': {'readonly': True}, - 'type': {'readonly': True}, - 'system_data': {'readonly': True}, - 'created_time': {'readonly': True}, + "id": {"readonly": True}, + "name": {"readonly": True}, + "type": {"readonly": True}, + "system_data": {"readonly": True}, + "created_time": {"readonly": True}, } _attribute_map = { - 'id': {'key': 'id', 'type': 'str'}, - 'name': {'key': 'name', 'type': 'str'}, - 'type': {'key': 'type', 'type': 'str'}, - 'system_data': {'key': 'systemData', 'type': 'SystemData'}, - 'created_time': {'key': 'properties.createdTime', 'type': 'iso-8601'}, - 'containers': {'key': 'properties.containers', 'type': '[ReplicaContainer]'}, + "id": {"key": "id", "type": "str"}, + "name": {"key": "name", "type": "str"}, + "type": {"key": "type", "type": "str"}, + "system_data": {"key": "systemData", "type": "SystemData"}, + "created_time": {"key": "properties.createdTime", "type": "iso-8601"}, + "containers": {"key": "properties.containers", "type": "[ReplicaContainer]"}, } - def __init__( - self, - *, - containers: Optional[List["ReplicaContainer"]] = None, - **kwargs - ): + def __init__(self, *, containers: Optional[List["_models.ReplicaContainer"]] = None, **kwargs): """ :keyword containers: The containers collection under a replica. :paramtype containers: list[~azure.mgmt.appcontainers.models.ReplicaContainer] """ - super(Replica, self).__init__(**kwargs) + super().__init__(**kwargs) self.created_time = None self.containers = containers -class ReplicaCollection(msrest.serialization.Model): +class ReplicaCollection(_serialization.Model): """Container App Revision Replicas collection ARM resource. All required parameters must be populated in order to send to Azure. - :ivar value: Required. Collection of resources. + :ivar value: Collection of resources. Required. :vartype value: list[~azure.mgmt.appcontainers.models.Replica] """ _validation = { - 'value': {'required': True}, + "value": {"required": True}, } _attribute_map = { - 'value': {'key': 'value', 'type': '[Replica]'}, + "value": {"key": "value", "type": "[Replica]"}, } - def __init__( - self, - *, - value: List["Replica"], - **kwargs - ): + def __init__(self, *, value: List["_models.Replica"], **kwargs): """ - :keyword value: Required. Collection of resources. + :keyword value: Collection of resources. Required. :paramtype value: list[~azure.mgmt.appcontainers.models.Replica] """ - super(ReplicaCollection, self).__init__(**kwargs) + super().__init__(**kwargs) self.value = value -class ReplicaContainer(msrest.serialization.Model): +class ReplicaContainer(_serialization.Model): """Container object under Container App Revision Replica. :ivar name: The Name of the Container. @@ -4219,11 +4076,11 @@ class ReplicaContainer(msrest.serialization.Model): """ _attribute_map = { - 'name': {'key': 'name', 'type': 'str'}, - 'container_id': {'key': 'containerId', 'type': 'str'}, - 'ready': {'key': 'ready', 'type': 'bool'}, - 'started': {'key': 'started', 'type': 'bool'}, - 'restart_count': {'key': 'restartCount', 'type': 'int'}, + "name": {"key": "name", "type": "str"}, + "container_id": {"key": "containerId", "type": "str"}, + "ready": {"key": "ready", "type": "bool"}, + "started": {"key": "started", "type": "bool"}, + "restart_count": {"key": "restartCount", "type": "int"}, } def __init__( @@ -4248,7 +4105,7 @@ def __init__( :keyword restart_count: The container restart count. :paramtype restart_count: int """ - super(ReplicaContainer, self).__init__(**kwargs) + super().__init__(**kwargs) self.name = name self.container_id = container_id self.ready = ready @@ -4256,7 +4113,7 @@ def __init__( self.restart_count = restart_count -class Revision(ProxyResource): +class Revision(ProxyResource): # pylint: disable=too-many-instance-attributes """Container App Revision. Variables are only populated by the server, and will be ignored when sending a request. @@ -4289,53 +4146,49 @@ class Revision(ProxyResource): :vartype traffic_weight: int :ivar provisioning_error: Optional Field - Platform Error Message. :vartype provisioning_error: str - :ivar health_state: Current health State of the revision. Possible values include: "Healthy", - "Unhealthy", "None". + :ivar health_state: Current health State of the revision. Known values are: "Healthy", + "Unhealthy", and "None". :vartype health_state: str or ~azure.mgmt.appcontainers.models.RevisionHealthState - :ivar provisioning_state: Current provisioning State of the revision. Possible values include: - "Provisioning", "Provisioned", "Failed", "Deprovisioning", "Deprovisioned". + :ivar provisioning_state: Current provisioning State of the revision. Known values are: + "Provisioning", "Provisioned", "Failed", "Deprovisioning", and "Deprovisioned". :vartype provisioning_state: str or ~azure.mgmt.appcontainers.models.RevisionProvisioningState """ _validation = { - 'id': {'readonly': True}, - 'name': {'readonly': True}, - 'type': {'readonly': True}, - 'system_data': {'readonly': True}, - 'created_time': {'readonly': True}, - 'fqdn': {'readonly': True}, - 'template': {'readonly': True}, - 'active': {'readonly': True}, - 'replicas': {'readonly': True}, - 'traffic_weight': {'readonly': True}, - 'provisioning_error': {'readonly': True}, - 'health_state': {'readonly': True}, - 'provisioning_state': {'readonly': True}, + "id": {"readonly": True}, + "name": {"readonly": True}, + "type": {"readonly": True}, + "system_data": {"readonly": True}, + "created_time": {"readonly": True}, + "fqdn": {"readonly": True}, + "template": {"readonly": True}, + "active": {"readonly": True}, + "replicas": {"readonly": True}, + "traffic_weight": {"readonly": True}, + "provisioning_error": {"readonly": True}, + "health_state": {"readonly": True}, + "provisioning_state": {"readonly": True}, } _attribute_map = { - 'id': {'key': 'id', 'type': 'str'}, - 'name': {'key': 'name', 'type': 'str'}, - 'type': {'key': 'type', 'type': 'str'}, - 'system_data': {'key': 'systemData', 'type': 'SystemData'}, - 'created_time': {'key': 'properties.createdTime', 'type': 'iso-8601'}, - 'fqdn': {'key': 'properties.fqdn', 'type': 'str'}, - 'template': {'key': 'properties.template', 'type': 'Template'}, - 'active': {'key': 'properties.active', 'type': 'bool'}, - 'replicas': {'key': 'properties.replicas', 'type': 'int'}, - 'traffic_weight': {'key': 'properties.trafficWeight', 'type': 'int'}, - 'provisioning_error': {'key': 'properties.provisioningError', 'type': 'str'}, - 'health_state': {'key': 'properties.healthState', 'type': 'str'}, - 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, - } - - def __init__( - self, - **kwargs - ): - """ - """ - super(Revision, self).__init__(**kwargs) + "id": {"key": "id", "type": "str"}, + "name": {"key": "name", "type": "str"}, + "type": {"key": "type", "type": "str"}, + "system_data": {"key": "systemData", "type": "SystemData"}, + "created_time": {"key": "properties.createdTime", "type": "iso-8601"}, + "fqdn": {"key": "properties.fqdn", "type": "str"}, + "template": {"key": "properties.template", "type": "Template"}, + "active": {"key": "properties.active", "type": "bool"}, + "replicas": {"key": "properties.replicas", "type": "int"}, + "traffic_weight": {"key": "properties.trafficWeight", "type": "int"}, + "provisioning_error": {"key": "properties.provisioningError", "type": "str"}, + "health_state": {"key": "properties.healthState", "type": "str"}, + "provisioning_state": {"key": "properties.provisioningState", "type": "str"}, + } + + def __init__(self, **kwargs): + """ """ + super().__init__(**kwargs) self.created_time = None self.fqdn = None self.template = None @@ -4347,45 +4200,40 @@ def __init__( self.provisioning_state = None -class RevisionCollection(msrest.serialization.Model): +class RevisionCollection(_serialization.Model): """Container App Revisions collection ARM resource. Variables are only populated by the server, and will be ignored when sending a request. All required parameters must be populated in order to send to Azure. - :ivar value: Required. Collection of resources. + :ivar value: Collection of resources. Required. :vartype value: list[~azure.mgmt.appcontainers.models.Revision] :ivar next_link: Link to next page of resources. :vartype next_link: str """ _validation = { - 'value': {'required': True}, - 'next_link': {'readonly': True}, + "value": {"required": True}, + "next_link": {"readonly": True}, } _attribute_map = { - 'value': {'key': 'value', 'type': '[Revision]'}, - 'next_link': {'key': 'nextLink', 'type': 'str'}, + "value": {"key": "value", "type": "[Revision]"}, + "next_link": {"key": "nextLink", "type": "str"}, } - def __init__( - self, - *, - value: List["Revision"], - **kwargs - ): + def __init__(self, *, value: List["_models.Revision"], **kwargs): """ - :keyword value: Required. Collection of resources. + :keyword value: Collection of resources. Required. :paramtype value: list[~azure.mgmt.appcontainers.models.Revision] """ - super(RevisionCollection, self).__init__(**kwargs) + super().__init__(**kwargs) self.value = value self.next_link = None -class Scale(msrest.serialization.Model): +class Scale(_serialization.Model): """Container App scaling configurations. :ivar min_replicas: Optional. Minimum number of container replicas. @@ -4397,9 +4245,9 @@ class Scale(msrest.serialization.Model): """ _attribute_map = { - 'min_replicas': {'key': 'minReplicas', 'type': 'int'}, - 'max_replicas': {'key': 'maxReplicas', 'type': 'int'}, - 'rules': {'key': 'rules', 'type': '[ScaleRule]'}, + "min_replicas": {"key": "minReplicas", "type": "int"}, + "max_replicas": {"key": "maxReplicas", "type": "int"}, + "rules": {"key": "rules", "type": "[ScaleRule]"}, } def __init__( @@ -4407,7 +4255,7 @@ def __init__( *, min_replicas: Optional[int] = None, max_replicas: Optional[int] = None, - rules: Optional[List["ScaleRule"]] = None, + rules: Optional[List["_models.ScaleRule"]] = None, **kwargs ): """ @@ -4419,13 +4267,13 @@ def __init__( :keyword rules: Scaling rules. :paramtype rules: list[~azure.mgmt.appcontainers.models.ScaleRule] """ - super(Scale, self).__init__(**kwargs) + super().__init__(**kwargs) self.min_replicas = min_replicas self.max_replicas = max_replicas self.rules = rules -class ScaleRule(msrest.serialization.Model): +class ScaleRule(_serialization.Model): """Container App container scaling rule. :ivar name: Scale Rule Name. @@ -4439,19 +4287,19 @@ class ScaleRule(msrest.serialization.Model): """ _attribute_map = { - 'name': {'key': 'name', 'type': 'str'}, - 'azure_queue': {'key': 'azureQueue', 'type': 'QueueScaleRule'}, - 'custom': {'key': 'custom', 'type': 'CustomScaleRule'}, - 'http': {'key': 'http', 'type': 'HttpScaleRule'}, + "name": {"key": "name", "type": "str"}, + "azure_queue": {"key": "azureQueue", "type": "QueueScaleRule"}, + "custom": {"key": "custom", "type": "CustomScaleRule"}, + "http": {"key": "http", "type": "HttpScaleRule"}, } def __init__( self, *, name: Optional[str] = None, - azure_queue: Optional["QueueScaleRule"] = None, - custom: Optional["CustomScaleRule"] = None, - http: Optional["HttpScaleRule"] = None, + azure_queue: Optional["_models.QueueScaleRule"] = None, + custom: Optional["_models.CustomScaleRule"] = None, + http: Optional["_models.HttpScaleRule"] = None, **kwargs ): """ @@ -4464,14 +4312,14 @@ def __init__( :keyword http: HTTP requests based scaling. :paramtype http: ~azure.mgmt.appcontainers.models.HttpScaleRule """ - super(ScaleRule, self).__init__(**kwargs) + super().__init__(**kwargs) self.name = name self.azure_queue = azure_queue self.custom = custom self.http = http -class ScaleRuleAuth(msrest.serialization.Model): +class ScaleRuleAuth(_serialization.Model): """Auth Secrets for Container App Scale Rule. :ivar secret_ref: Name of the Container App secret from which to pull the auth params. @@ -4481,29 +4329,23 @@ class ScaleRuleAuth(msrest.serialization.Model): """ _attribute_map = { - 'secret_ref': {'key': 'secretRef', 'type': 'str'}, - 'trigger_parameter': {'key': 'triggerParameter', 'type': 'str'}, + "secret_ref": {"key": "secretRef", "type": "str"}, + "trigger_parameter": {"key": "triggerParameter", "type": "str"}, } - def __init__( - self, - *, - secret_ref: Optional[str] = None, - trigger_parameter: Optional[str] = None, - **kwargs - ): + def __init__(self, *, secret_ref: Optional[str] = None, trigger_parameter: Optional[str] = None, **kwargs): """ :keyword secret_ref: Name of the Container App secret from which to pull the auth params. :paramtype secret_ref: str :keyword trigger_parameter: Trigger Parameter that uses the secret. :paramtype trigger_parameter: str """ - super(ScaleRuleAuth, self).__init__(**kwargs) + super().__init__(**kwargs) self.secret_ref = secret_ref self.trigger_parameter = trigger_parameter -class Secret(msrest.serialization.Model): +class Secret(_serialization.Model): """Secret definition. :ivar name: Secret Name. @@ -4513,56 +4355,45 @@ class Secret(msrest.serialization.Model): """ _attribute_map = { - 'name': {'key': 'name', 'type': 'str'}, - 'value': {'key': 'value', 'type': 'str'}, + "name": {"key": "name", "type": "str"}, + "value": {"key": "value", "type": "str"}, } - def __init__( - self, - *, - name: Optional[str] = None, - value: Optional[str] = None, - **kwargs - ): + def __init__(self, *, name: Optional[str] = None, value: Optional[str] = None, **kwargs): """ :keyword name: Secret Name. :paramtype name: str :keyword value: Secret Value. :paramtype value: str """ - super(Secret, self).__init__(**kwargs) + super().__init__(**kwargs) self.name = name self.value = value -class SecretsCollection(msrest.serialization.Model): +class SecretsCollection(_serialization.Model): """Container App Secrets Collection ARM resource. All required parameters must be populated in order to send to Azure. - :ivar value: Required. Collection of resources. + :ivar value: Collection of resources. Required. :vartype value: list[~azure.mgmt.appcontainers.models.ContainerAppSecret] """ _validation = { - 'value': {'required': True}, + "value": {"required": True}, } _attribute_map = { - 'value': {'key': 'value', 'type': '[ContainerAppSecret]'}, + "value": {"key": "value", "type": "[ContainerAppSecret]"}, } - def __init__( - self, - *, - value: List["ContainerAppSecret"], - **kwargs - ): + def __init__(self, *, value: List["_models.ContainerAppSecret"], **kwargs): """ - :keyword value: Required. Collection of resources. + :keyword value: Collection of resources. Required. :paramtype value: list[~azure.mgmt.appcontainers.models.ContainerAppSecret] """ - super(SecretsCollection, self).__init__(**kwargs) + super().__init__(**kwargs) self.value = value @@ -4582,8 +4413,8 @@ class SourceControl(ProxyResource): :ivar system_data: Azure Resource Manager metadata containing createdBy and modifiedBy information. :vartype system_data: ~azure.mgmt.appcontainers.models.SystemData - :ivar operation_state: Current provisioning State of the operation. Possible values include: - "InProgress", "Succeeded", "Failed", "Canceled". + :ivar operation_state: Current provisioning State of the operation. Known values are: + "InProgress", "Succeeded", "Failed", and "Canceled". :vartype operation_state: str or ~azure.mgmt.appcontainers.models.SourceControlOperationState :ivar repo_url: The repo url which will be integrated to ContainerApp. :vartype repo_url: str @@ -4598,22 +4429,25 @@ class SourceControl(ProxyResource): """ _validation = { - 'id': {'readonly': True}, - 'name': {'readonly': True}, - 'type': {'readonly': True}, - 'system_data': {'readonly': True}, - 'operation_state': {'readonly': True}, + "id": {"readonly": True}, + "name": {"readonly": True}, + "type": {"readonly": True}, + "system_data": {"readonly": True}, + "operation_state": {"readonly": True}, } _attribute_map = { - 'id': {'key': 'id', 'type': 'str'}, - 'name': {'key': 'name', 'type': 'str'}, - 'type': {'key': 'type', 'type': 'str'}, - 'system_data': {'key': 'systemData', 'type': 'SystemData'}, - 'operation_state': {'key': 'properties.operationState', 'type': 'str'}, - 'repo_url': {'key': 'properties.repoUrl', 'type': 'str'}, - 'branch': {'key': 'properties.branch', 'type': 'str'}, - 'github_action_configuration': {'key': 'properties.githubActionConfiguration', 'type': 'GithubActionConfiguration'}, + "id": {"key": "id", "type": "str"}, + "name": {"key": "name", "type": "str"}, + "type": {"key": "type", "type": "str"}, + "system_data": {"key": "systemData", "type": "SystemData"}, + "operation_state": {"key": "properties.operationState", "type": "str"}, + "repo_url": {"key": "properties.repoUrl", "type": "str"}, + "branch": {"key": "properties.branch", "type": "str"}, + "github_action_configuration": { + "key": "properties.githubActionConfiguration", + "type": "GithubActionConfiguration", + }, } def __init__( @@ -4621,7 +4455,7 @@ def __init__( *, repo_url: Optional[str] = None, branch: Optional[str] = None, - github_action_configuration: Optional["GithubActionConfiguration"] = None, + github_action_configuration: Optional["_models.GithubActionConfiguration"] = None, **kwargs ): """ @@ -4636,107 +4470,102 @@ def __init__( :paramtype github_action_configuration: ~azure.mgmt.appcontainers.models.GithubActionConfiguration """ - super(SourceControl, self).__init__(**kwargs) + super().__init__(**kwargs) self.operation_state = None self.repo_url = repo_url self.branch = branch self.github_action_configuration = github_action_configuration -class SourceControlCollection(msrest.serialization.Model): +class SourceControlCollection(_serialization.Model): """SourceControl collection ARM resource. Variables are only populated by the server, and will be ignored when sending a request. All required parameters must be populated in order to send to Azure. - :ivar value: Required. Collection of resources. + :ivar value: Collection of resources. Required. :vartype value: list[~azure.mgmt.appcontainers.models.SourceControl] :ivar next_link: Link to next page of resources. :vartype next_link: str """ _validation = { - 'value': {'required': True}, - 'next_link': {'readonly': True}, + "value": {"required": True}, + "next_link": {"readonly": True}, } _attribute_map = { - 'value': {'key': 'value', 'type': '[SourceControl]'}, - 'next_link': {'key': 'nextLink', 'type': 'str'}, + "value": {"key": "value", "type": "[SourceControl]"}, + "next_link": {"key": "nextLink", "type": "str"}, } - def __init__( - self, - *, - value: List["SourceControl"], - **kwargs - ): + def __init__(self, *, value: List["_models.SourceControl"], **kwargs): """ - :keyword value: Required. Collection of resources. + :keyword value: Collection of resources. Required. :paramtype value: list[~azure.mgmt.appcontainers.models.SourceControl] """ - super(SourceControlCollection, self).__init__(**kwargs) + super().__init__(**kwargs) self.value = value self.next_link = None -class SystemData(msrest.serialization.Model): +class SystemData(_serialization.Model): """Metadata pertaining to creation and last modification of the resource. :ivar created_by: The identity that created the resource. :vartype created_by: str - :ivar created_by_type: The type of identity that created the resource. Possible values include: - "User", "Application", "ManagedIdentity", "Key". + :ivar created_by_type: The type of identity that created the resource. Known values are: + "User", "Application", "ManagedIdentity", and "Key". :vartype created_by_type: str or ~azure.mgmt.appcontainers.models.CreatedByType :ivar created_at: The timestamp of resource creation (UTC). :vartype created_at: ~datetime.datetime :ivar last_modified_by: The identity that last modified the resource. :vartype last_modified_by: str - :ivar last_modified_by_type: The type of identity that last modified the resource. Possible - values include: "User", "Application", "ManagedIdentity", "Key". + :ivar last_modified_by_type: The type of identity that last modified the resource. Known values + are: "User", "Application", "ManagedIdentity", and "Key". :vartype last_modified_by_type: str or ~azure.mgmt.appcontainers.models.CreatedByType :ivar last_modified_at: The timestamp of resource last modification (UTC). :vartype last_modified_at: ~datetime.datetime """ _attribute_map = { - 'created_by': {'key': 'createdBy', 'type': 'str'}, - 'created_by_type': {'key': 'createdByType', 'type': 'str'}, - 'created_at': {'key': 'createdAt', 'type': 'iso-8601'}, - 'last_modified_by': {'key': 'lastModifiedBy', 'type': 'str'}, - 'last_modified_by_type': {'key': 'lastModifiedByType', 'type': 'str'}, - 'last_modified_at': {'key': 'lastModifiedAt', 'type': 'iso-8601'}, + "created_by": {"key": "createdBy", "type": "str"}, + "created_by_type": {"key": "createdByType", "type": "str"}, + "created_at": {"key": "createdAt", "type": "iso-8601"}, + "last_modified_by": {"key": "lastModifiedBy", "type": "str"}, + "last_modified_by_type": {"key": "lastModifiedByType", "type": "str"}, + "last_modified_at": {"key": "lastModifiedAt", "type": "iso-8601"}, } def __init__( self, *, created_by: Optional[str] = None, - created_by_type: Optional[Union[str, "CreatedByType"]] = None, + created_by_type: Optional[Union[str, "_models.CreatedByType"]] = None, created_at: Optional[datetime.datetime] = None, last_modified_by: Optional[str] = None, - last_modified_by_type: Optional[Union[str, "CreatedByType"]] = None, + last_modified_by_type: Optional[Union[str, "_models.CreatedByType"]] = None, last_modified_at: Optional[datetime.datetime] = None, **kwargs ): """ :keyword created_by: The identity that created the resource. :paramtype created_by: str - :keyword created_by_type: The type of identity that created the resource. Possible values - include: "User", "Application", "ManagedIdentity", "Key". + :keyword created_by_type: The type of identity that created the resource. Known values are: + "User", "Application", "ManagedIdentity", and "Key". :paramtype created_by_type: str or ~azure.mgmt.appcontainers.models.CreatedByType :keyword created_at: The timestamp of resource creation (UTC). :paramtype created_at: ~datetime.datetime :keyword last_modified_by: The identity that last modified the resource. :paramtype last_modified_by: str - :keyword last_modified_by_type: The type of identity that last modified the resource. Possible - values include: "User", "Application", "ManagedIdentity", "Key". + :keyword last_modified_by_type: The type of identity that last modified the resource. Known + values are: "User", "Application", "ManagedIdentity", and "Key". :paramtype last_modified_by_type: str or ~azure.mgmt.appcontainers.models.CreatedByType :keyword last_modified_at: The timestamp of resource last modification (UTC). :paramtype last_modified_at: ~datetime.datetime """ - super(SystemData, self).__init__(**kwargs) + super().__init__(**kwargs) self.created_by = created_by self.created_by_type = created_by_type self.created_at = created_at @@ -4745,35 +4574,35 @@ def __init__( self.last_modified_at = last_modified_at -class Template(msrest.serialization.Model): +class Template(_serialization.Model): """Container App versioned application definition. -Defines the desired state of an immutable revision. -Any changes to this section Will result in a new revision being created. - - :ivar revision_suffix: User friendly suffix that is appended to the revision name. - :vartype revision_suffix: str - :ivar containers: List of container definitions for the Container App. - :vartype containers: list[~azure.mgmt.appcontainers.models.Container] - :ivar scale: Scaling properties for the Container App. - :vartype scale: ~azure.mgmt.appcontainers.models.Scale - :ivar volumes: List of volume definitions for the Container App. - :vartype volumes: list[~azure.mgmt.appcontainers.models.Volume] + Defines the desired state of an immutable revision. + Any changes to this section Will result in a new revision being created. + + :ivar revision_suffix: User friendly suffix that is appended to the revision name. + :vartype revision_suffix: str + :ivar containers: List of container definitions for the Container App. + :vartype containers: list[~azure.mgmt.appcontainers.models.Container] + :ivar scale: Scaling properties for the Container App. + :vartype scale: ~azure.mgmt.appcontainers.models.Scale + :ivar volumes: List of volume definitions for the Container App. + :vartype volumes: list[~azure.mgmt.appcontainers.models.Volume] """ _attribute_map = { - 'revision_suffix': {'key': 'revisionSuffix', 'type': 'str'}, - 'containers': {'key': 'containers', 'type': '[Container]'}, - 'scale': {'key': 'scale', 'type': 'Scale'}, - 'volumes': {'key': 'volumes', 'type': '[Volume]'}, + "revision_suffix": {"key": "revisionSuffix", "type": "str"}, + "containers": {"key": "containers", "type": "[Container]"}, + "scale": {"key": "scale", "type": "Scale"}, + "volumes": {"key": "volumes", "type": "[Volume]"}, } def __init__( self, *, revision_suffix: Optional[str] = None, - containers: Optional[List["Container"]] = None, - scale: Optional["Scale"] = None, - volumes: Optional[List["Volume"]] = None, + containers: Optional[List["_models.Container"]] = None, + scale: Optional["_models.Scale"] = None, + volumes: Optional[List["_models.Volume"]] = None, **kwargs ): """ @@ -4786,14 +4615,14 @@ def __init__( :keyword volumes: List of volume definitions for the Container App. :paramtype volumes: list[~azure.mgmt.appcontainers.models.Volume] """ - super(Template, self).__init__(**kwargs) + super().__init__(**kwargs) self.revision_suffix = revision_suffix self.containers = containers self.scale = scale self.volumes = volumes -class TrafficWeight(msrest.serialization.Model): +class TrafficWeight(_serialization.Model): """Traffic weight assigned to a revision. :ivar revision_name: Name of a revision. @@ -4807,10 +4636,10 @@ class TrafficWeight(msrest.serialization.Model): """ _attribute_map = { - 'revision_name': {'key': 'revisionName', 'type': 'str'}, - 'weight': {'key': 'weight', 'type': 'int'}, - 'latest_revision': {'key': 'latestRevision', 'type': 'bool'}, - 'label': {'key': 'label', 'type': 'str'}, + "revision_name": {"key": "revisionName", "type": "str"}, + "weight": {"key": "weight", "type": "int"}, + "latest_revision": {"key": "latestRevision", "type": "bool"}, + "label": {"key": "label", "type": "str"}, } def __init__( @@ -4818,7 +4647,7 @@ def __init__( *, revision_name: Optional[str] = None, weight: Optional[int] = None, - latest_revision: Optional[bool] = False, + latest_revision: bool = False, label: Optional[str] = None, **kwargs ): @@ -4833,14 +4662,14 @@ def __init__( :keyword label: Associates a traffic label with a revision. :paramtype label: str """ - super(TrafficWeight, self).__init__(**kwargs) + super().__init__(**kwargs) self.revision_name = revision_name self.weight = weight self.latest_revision = latest_revision self.label = label -class Twitter(msrest.serialization.Model): +class Twitter(_serialization.Model): """The configuration settings of the Twitter provider. :ivar enabled: :code:`false` if the Twitter provider should not be enabled despite @@ -4852,16 +4681,12 @@ class Twitter(msrest.serialization.Model): """ _attribute_map = { - 'enabled': {'key': 'enabled', 'type': 'bool'}, - 'registration': {'key': 'registration', 'type': 'TwitterRegistration'}, + "enabled": {"key": "enabled", "type": "bool"}, + "registration": {"key": "registration", "type": "TwitterRegistration"}, } def __init__( - self, - *, - enabled: Optional[bool] = None, - registration: Optional["TwitterRegistration"] = None, - **kwargs + self, *, enabled: Optional[bool] = None, registration: Optional["_models.TwitterRegistration"] = None, **kwargs ): """ :keyword enabled: :code:`false` if the Twitter provider should not be enabled @@ -4871,12 +4696,12 @@ def __init__( provider. :paramtype registration: ~azure.mgmt.appcontainers.models.TwitterRegistration """ - super(Twitter, self).__init__(**kwargs) + super().__init__(**kwargs) self.enabled = enabled self.registration = registration -class TwitterRegistration(msrest.serialization.Model): +class TwitterRegistration(_serialization.Model): """The configuration settings of the app registration for the Twitter provider. :ivar consumer_key: The OAuth 1.0a consumer key of the Twitter application used for sign-in. @@ -4890,16 +4715,12 @@ class TwitterRegistration(msrest.serialization.Model): """ _attribute_map = { - 'consumer_key': {'key': 'consumerKey', 'type': 'str'}, - 'consumer_secret_setting_name': {'key': 'consumerSecretSettingName', 'type': 'str'}, + "consumer_key": {"key": "consumerKey", "type": "str"}, + "consumer_secret_setting_name": {"key": "consumerSecretSettingName", "type": "str"}, } def __init__( - self, - *, - consumer_key: Optional[str] = None, - consumer_secret_setting_name: Optional[str] = None, - **kwargs + self, *, consumer_key: Optional[str] = None, consumer_secret_setting_name: Optional[str] = None, **kwargs ): """ :keyword consumer_key: The OAuth 1.0a consumer key of the Twitter application used for sign-in. @@ -4911,12 +4732,12 @@ def __init__( application used for sign-in. :paramtype consumer_secret_setting_name: str """ - super(TwitterRegistration, self).__init__(**kwargs) + super().__init__(**kwargs) self.consumer_key = consumer_key self.consumer_secret_setting_name = consumer_secret_setting_name -class UserAssignedIdentity(msrest.serialization.Model): +class UserAssignedIdentity(_serialization.Model): """User assigned identity properties. Variables are only populated by the server, and will be ignored when sending a request. @@ -4928,32 +4749,28 @@ class UserAssignedIdentity(msrest.serialization.Model): """ _validation = { - 'principal_id': {'readonly': True}, - 'client_id': {'readonly': True}, + "principal_id": {"readonly": True}, + "client_id": {"readonly": True}, } _attribute_map = { - 'principal_id': {'key': 'principalId', 'type': 'str'}, - 'client_id': {'key': 'clientId', 'type': 'str'}, + "principal_id": {"key": "principalId", "type": "str"}, + "client_id": {"key": "clientId", "type": "str"}, } - def __init__( - self, - **kwargs - ): - """ - """ - super(UserAssignedIdentity, self).__init__(**kwargs) + def __init__(self, **kwargs): + """ """ + super().__init__(**kwargs) self.principal_id = None self.client_id = None -class VnetConfiguration(msrest.serialization.Model): +class VnetConfiguration(_serialization.Model): """Configuration properties for apps environment to join a Virtual Network. :ivar internal: Boolean indicating the environment only has an internal load balancer. These - environments do not have a public static IP resource, must provide ControlPlaneSubnetResourceId - and AppSubnetResourceId if enabling this property. + environments do not have a public static IP resource. They must provide runtimeSubnetId and + infrastructureSubnetId if enabling this property. :vartype internal: bool :ivar infrastructure_subnet_id: Resource ID of a subnet for infrastructure components. This subnet must be in the same VNET as the subnet defined in runtimeSubnetId. Must not overlap with @@ -4975,12 +4792,12 @@ class VnetConfiguration(msrest.serialization.Model): """ _attribute_map = { - 'internal': {'key': 'internal', 'type': 'bool'}, - 'infrastructure_subnet_id': {'key': 'infrastructureSubnetId', 'type': 'str'}, - 'runtime_subnet_id': {'key': 'runtimeSubnetId', 'type': 'str'}, - 'docker_bridge_cidr': {'key': 'dockerBridgeCidr', 'type': 'str'}, - 'platform_reserved_cidr': {'key': 'platformReservedCidr', 'type': 'str'}, - 'platform_reserved_dns_ip': {'key': 'platformReservedDnsIP', 'type': 'str'}, + "internal": {"key": "internal", "type": "bool"}, + "infrastructure_subnet_id": {"key": "infrastructureSubnetId", "type": "str"}, + "runtime_subnet_id": {"key": "runtimeSubnetId", "type": "str"}, + "docker_bridge_cidr": {"key": "dockerBridgeCidr", "type": "str"}, + "platform_reserved_cidr": {"key": "platformReservedCidr", "type": "str"}, + "platform_reserved_dns_ip": {"key": "platformReservedDnsIP", "type": "str"}, } def __init__( @@ -4996,8 +4813,8 @@ def __init__( ): """ :keyword internal: Boolean indicating the environment only has an internal load balancer. These - environments do not have a public static IP resource, must provide ControlPlaneSubnetResourceId - and AppSubnetResourceId if enabling this property. + environments do not have a public static IP resource. They must provide runtimeSubnetId and + infrastructureSubnetId if enabling this property. :paramtype internal: bool :keyword infrastructure_subnet_id: Resource ID of a subnet for infrastructure components. This subnet must be in the same VNET as the subnet defined in runtimeSubnetId. Must not overlap with @@ -5017,7 +4834,7 @@ def __init__( platformReservedCidr that will be reserved for the internal DNS server. :paramtype platform_reserved_dns_ip: str """ - super(VnetConfiguration, self).__init__(**kwargs) + super().__init__(**kwargs) self.internal = internal self.infrastructure_subnet_id = infrastructure_subnet_id self.runtime_subnet_id = runtime_subnet_id @@ -5026,48 +4843,48 @@ def __init__( self.platform_reserved_dns_ip = platform_reserved_dns_ip -class Volume(msrest.serialization.Model): +class Volume(_serialization.Model): """Volume definitions for the Container App. :ivar name: Volume name. :vartype name: str - :ivar storage_type: Storage type for the volume. If not provided, use EmptyDir. Possible values - include: "AzureFile", "EmptyDir". + :ivar storage_type: Storage type for the volume. If not provided, use EmptyDir. Known values + are: "AzureFile" and "EmptyDir". :vartype storage_type: str or ~azure.mgmt.appcontainers.models.StorageType :ivar storage_name: Name of storage resource. No need to provide for EmptyDir. :vartype storage_name: str """ _attribute_map = { - 'name': {'key': 'name', 'type': 'str'}, - 'storage_type': {'key': 'storageType', 'type': 'str'}, - 'storage_name': {'key': 'storageName', 'type': 'str'}, + "name": {"key": "name", "type": "str"}, + "storage_type": {"key": "storageType", "type": "str"}, + "storage_name": {"key": "storageName", "type": "str"}, } def __init__( self, *, name: Optional[str] = None, - storage_type: Optional[Union[str, "StorageType"]] = None, + storage_type: Optional[Union[str, "_models.StorageType"]] = None, storage_name: Optional[str] = None, **kwargs ): """ :keyword name: Volume name. :paramtype name: str - :keyword storage_type: Storage type for the volume. If not provided, use EmptyDir. Possible - values include: "AzureFile", "EmptyDir". + :keyword storage_type: Storage type for the volume. If not provided, use EmptyDir. Known values + are: "AzureFile" and "EmptyDir". :paramtype storage_type: str or ~azure.mgmt.appcontainers.models.StorageType :keyword storage_name: Name of storage resource. No need to provide for EmptyDir. :paramtype storage_name: str """ - super(Volume, self).__init__(**kwargs) + super().__init__(**kwargs) self.name = name self.storage_type = storage_type self.storage_name = storage_name -class VolumeMount(msrest.serialization.Model): +class VolumeMount(_serialization.Model): """Volume mount for the Container App. :ivar volume_name: This must match the Name of a Volume. @@ -5078,17 +4895,11 @@ class VolumeMount(msrest.serialization.Model): """ _attribute_map = { - 'volume_name': {'key': 'volumeName', 'type': 'str'}, - 'mount_path': {'key': 'mountPath', 'type': 'str'}, + "volume_name": {"key": "volumeName", "type": "str"}, + "mount_path": {"key": "mountPath", "type": "str"}, } - def __init__( - self, - *, - volume_name: Optional[str] = None, - mount_path: Optional[str] = None, - **kwargs - ): + def __init__(self, *, volume_name: Optional[str] = None, mount_path: Optional[str] = None, **kwargs): """ :keyword volume_name: This must match the Name of a Volume. :paramtype volume_name: str @@ -5096,6 +4907,6 @@ def __init__( contain ':'. :paramtype mount_path: str """ - super(VolumeMount, self).__init__(**kwargs) + super().__init__(**kwargs) self.volume_name = volume_name self.mount_path = mount_path diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/models/_patch.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/models/_patch.py new file mode 100644 index 000000000000..f7dd32510333 --- /dev/null +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/models/_patch.py @@ -0,0 +1,20 @@ +# ------------------------------------ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT License. +# ------------------------------------ +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/__init__.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/__init__.py index 505be253220b..a1e4976ca875 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/__init__.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/__init__.py @@ -18,16 +18,22 @@ from ._managed_environments_storages_operations import ManagedEnvironmentsStoragesOperations from ._container_apps_source_controls_operations import ContainerAppsSourceControlsOperations +from ._patch import __all__ as _patch_all +from ._patch import * # type: ignore # pylint: disable=unused-wildcard-import +from ._patch import patch_sdk as _patch_sdk + __all__ = [ - 'ContainerAppsAuthConfigsOperations', - 'ContainerAppsOperations', - 'ContainerAppsRevisionsOperations', - 'ContainerAppsRevisionReplicasOperations', - 'DaprComponentsOperations', - 'Operations', - 'ManagedEnvironmentsOperations', - 'CertificatesOperations', - 'NamespacesOperations', - 'ManagedEnvironmentsStoragesOperations', - 'ContainerAppsSourceControlsOperations', + "ContainerAppsAuthConfigsOperations", + "ContainerAppsOperations", + "ContainerAppsRevisionsOperations", + "ContainerAppsRevisionReplicasOperations", + "DaprComponentsOperations", + "Operations", + "ManagedEnvironmentsOperations", + "CertificatesOperations", + "NamespacesOperations", + "ManagedEnvironmentsStoragesOperations", + "ContainerAppsSourceControlsOperations", ] +__all__.extend([p for p in _patch_all if p not in __all__]) +_patch_sdk() diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_certificates_operations.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_certificates_operations.py index cb582da44c7d..e5ce52594e48 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_certificates_operations.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_certificates_operations.py @@ -6,304 +6,283 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, Callable, Dict, Iterable, Optional, TypeVar - -from msrest import Serializer - -from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload +from urllib.parse import parse_qs, urljoin, urlparse + +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) from azure.core.paging import ItemPaged from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import HttpResponse from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace +from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from .. import models as _models +from .._serialization import Serializer from .._vendor import _convert_request, _format_url_section -T = TypeVar('T') -JSONType = Any + +T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False + def build_list_request( - subscription_id: str, - resource_group_name: str, - environment_name: str, - **kwargs: Any + resource_group_name: str, environment_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "environmentName": _SERIALIZER.url("environment_name", environment_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="GET", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) def build_get_request( - subscription_id: str, - resource_group_name: str, - environment_name: str, - certificate_name: str, - **kwargs: Any + resource_group_name: str, environment_name: str, certificate_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates/{certificateName}") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates/{certificateName}", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str'), - "certificateName": _SERIALIZER.url("certificate_name", certificate_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "environmentName": _SERIALIZER.url("environment_name", environment_name, "str"), + "certificateName": _SERIALIZER.url("certificate_name", certificate_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="GET", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) def build_create_or_update_request( - subscription_id: str, - resource_group_name: str, - environment_name: str, - certificate_name: str, - *, - json: JSONType = None, - content: Any = None, - **kwargs: Any + resource_group_name: str, environment_name: str, certificate_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', None) # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates/{certificateName}") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates/{certificateName}", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str'), - "certificateName": _SERIALIZER.url("certificate_name", certificate_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "environmentName": _SERIALIZER.url("environment_name", environment_name, "str"), + "certificateName": _SERIALIZER.url("certificate_name", certificate_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] if content_type is not None: - _header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="PUT", - url=_url, - params=_query_parameters, - headers=_header_parameters, - json=json, - content=content, - **kwargs - ) + return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs) def build_delete_request( - subscription_id: str, - resource_group_name: str, - environment_name: str, - certificate_name: str, - **kwargs: Any + resource_group_name: str, environment_name: str, certificate_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates/{certificateName}") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates/{certificateName}", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str'), - "certificateName": _SERIALIZER.url("certificate_name", certificate_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "environmentName": _SERIALIZER.url("environment_name", environment_name, "str"), + "certificateName": _SERIALIZER.url("certificate_name", certificate_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="DELETE", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) + return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs) def build_update_request( - subscription_id: str, - resource_group_name: str, - environment_name: str, - certificate_name: str, - *, - json: JSONType = None, - content: Any = None, - **kwargs: Any + resource_group_name: str, environment_name: str, certificate_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', None) # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates/{certificateName}") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates/{certificateName}", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str'), - "certificateName": _SERIALIZER.url("certificate_name", certificate_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "environmentName": _SERIALIZER.url("environment_name", environment_name, "str"), + "certificateName": _SERIALIZER.url("certificate_name", certificate_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] if content_type is not None: - _header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="PATCH", - url=_url, - params=_query_parameters, - headers=_header_parameters, - json=json, - content=content, - **kwargs - ) - -class CertificatesOperations(object): - """CertificatesOperations operations. - - You should not instantiate this class directly. Instead, you should create a Client instance that - instantiates it for you and attaches it as an attribute. - - :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.appcontainers.models - :param client: Client for service requests. - :param config: Configuration of service client. - :param serializer: An object model serializer. - :param deserializer: An object model deserializer. + _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="PATCH", url=_url, params=_params, headers=_headers, **kwargs) + + +class CertificatesOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. + + Instead, you should access the following operations through + :class:`~azure.mgmt.appcontainers.ContainerAppsAPIClient`'s + :attr:`certificates` attribute. """ models = _models - def __init__(self, client, config, serializer, deserializer): - self._client = client - self._serialize = serializer - self._deserialize = deserializer - self._config = config + def __init__(self, *args, **kwargs): + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def list( - self, - resource_group_name: str, - environment_name: str, - **kwargs: Any - ) -> Iterable["_models.CertificateCollection"]: + def list(self, resource_group_name: str, environment_name: str, **kwargs: Any) -> Iterable["_models.Certificate"]: """Get the Certificates in a given managed environment. Get the Certificates in a given managed environment. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Managed Environment. + :param environment_name: Name of the Managed Environment. Required. :type environment_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of either CertificateCollection or the result of - cls(response) - :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.appcontainers.models.CertificateCollection] - :raises: ~azure.core.exceptions.HttpResponseError + :return: An iterator like instance of either Certificate or the result of cls(response) + :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.appcontainers.models.Certificate] + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.CertificateCollection] - cls = kwargs.pop('cls', None) # type: ClsType["_models.CertificateCollection"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + def prepare_request(next_link=None): if not next_link: - + request = build_list_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list.metadata['url'], + template_url=self.list.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore else: - - request = build_list_request( - subscription_id=self._config.subscription_id, - resource_group_name=resource_group_name, - environment_name=environment_name, - api_version=api_version, - template_url=next_link, - ) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore request.method = "GET" return request @@ -317,10 +296,8 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) response = pipeline_response.http_response @@ -331,60 +308,61 @@ def get_next(next_link=None): return pipeline_response + return ItemPaged(get_next, extract_data) - return ItemPaged( - get_next, extract_data - ) - list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates"} # type: ignore + list.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates"} # type: ignore @distributed_trace def get( - self, - resource_group_name: str, - environment_name: str, - certificate_name: str, - **kwargs: Any - ) -> "_models.Certificate": + self, resource_group_name: str, environment_name: str, certificate_name: str, **kwargs: Any + ) -> _models.Certificate: """Get the specified Certificate. Get the specified Certificate. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Managed Environment. + :param environment_name: Name of the Managed Environment. Required. :type environment_name: str - :param certificate_name: Name of the Certificate. + :param certificate_name: Name of the Certificate. Required. :type certificate_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: Certificate, or the result of cls(response) + :return: Certificate or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.Certificate - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.Certificate"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.Certificate] - request = build_get_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, certificate_name=certificate_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get.metadata['url'], + template_url=self.get.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -392,74 +370,158 @@ def get( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('Certificate', pipeline_response) + deserialized = self._deserialize("Certificate", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates/{certificateName}"} # type: ignore - + get.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates/{certificateName}"} # type: ignore - @distributed_trace + @overload def create_or_update( self, resource_group_name: str, environment_name: str, certificate_name: str, - certificate_envelope: Optional["_models.Certificate"] = None, + certificate_envelope: Optional[_models.Certificate] = None, + *, + content_type: str = "application/json", **kwargs: Any - ) -> "_models.Certificate": + ) -> _models.Certificate: """Create or Update a Certificate. Create or Update a Certificate. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Managed Environment. + :param environment_name: Name of the Managed Environment. Required. :type environment_name: str - :param certificate_name: Name of the Certificate. + :param certificate_name: Name of the Certificate. Required. :type certificate_name: str :param certificate_envelope: Certificate to be created or updated. Default value is None. :type certificate_envelope: ~azure.mgmt.appcontainers.models.Certificate + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: Certificate or the result of cls(response) + :rtype: ~azure.mgmt.appcontainers.models.Certificate + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + def create_or_update( + self, + resource_group_name: str, + environment_name: str, + certificate_name: str, + certificate_envelope: Optional[IO] = None, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> _models.Certificate: + """Create or Update a Certificate. + + Create or Update a Certificate. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Managed Environment. Required. + :type environment_name: str + :param certificate_name: Name of the Certificate. Required. + :type certificate_name: str + :param certificate_envelope: Certificate to be created or updated. Default value is None. + :type certificate_envelope: IO + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: Certificate, or the result of cls(response) + :return: Certificate or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.Certificate - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @distributed_trace + def create_or_update( + self, + resource_group_name: str, + environment_name: str, + certificate_name: str, + certificate_envelope: Optional[Union[_models.Certificate, IO]] = None, + **kwargs: Any + ) -> _models.Certificate: + """Create or Update a Certificate. + + Create or Update a Certificate. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Managed Environment. Required. + :type environment_name: str + :param certificate_name: Name of the Certificate. Required. + :type certificate_name: str + :param certificate_envelope: Certificate to be created or updated. Is either a model type or a + IO type. Default value is None. + :type certificate_envelope: ~azure.mgmt.appcontainers.models.Certificate or IO + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: Certificate or the result of cls(response) + :rtype: ~azure.mgmt.appcontainers.models.Certificate + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.Certificate"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Certificate] - if certificate_envelope is not None: - _json = self._serialize.body(certificate_envelope, 'Certificate') + content_type = content_type or "application/json" + _json = None + _content = None + if isinstance(certificate_envelope, (IO, bytes)): + _content = certificate_envelope else: - _json = None + if certificate_envelope is not None: + _json = self._serialize.body(certificate_envelope, "Certificate") + else: + _json = None request = build_create_or_update_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, certificate_name=certificate_name, + subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, - template_url=self.create_or_update.metadata['url'], + content=_content, + template_url=self.create_or_update.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -467,64 +529,66 @@ def create_or_update( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('Certificate', pipeline_response) + deserialized = self._deserialize("Certificate", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates/{certificateName}"} # type: ignore - + create_or_update.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates/{certificateName}"} # type: ignore @distributed_trace def delete( # pylint: disable=inconsistent-return-statements - self, - resource_group_name: str, - environment_name: str, - certificate_name: str, - **kwargs: Any + self, resource_group_name: str, environment_name: str, certificate_name: str, **kwargs: Any ) -> None: """Deletes the specified Certificate. Deletes the specified Certificate. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Managed Environment. + :param environment_name: Name of the Managed Environment. Required. :type environment_name: str - :param certificate_name: Name of the Certificate. + :param certificate_name: Name of the Certificate. Required. :type certificate_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: None, or the result of cls(response) + :return: None or the result of cls(response) :rtype: None - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] - request = build_delete_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, certificate_name=certificate_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.delete.metadata['url'], + template_url=self.delete.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200, 204]: @@ -535,8 +599,73 @@ def delete( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, {}) - delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates/{certificateName}"} # type: ignore + delete.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates/{certificateName}"} # type: ignore + + @overload + def update( + self, + resource_group_name: str, + environment_name: str, + certificate_name: str, + certificate_envelope: _models.CertificatePatch, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> _models.Certificate: + """Update properties of a certificate. + + Patches a certificate. Currently only patching of tags is supported. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Managed Environment. Required. + :type environment_name: str + :param certificate_name: Name of the Certificate. Required. + :type certificate_name: str + :param certificate_envelope: Properties of a certificate that need to be updated. Required. + :type certificate_envelope: ~azure.mgmt.appcontainers.models.CertificatePatch + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: Certificate or the result of cls(response) + :rtype: ~azure.mgmt.appcontainers.models.Certificate + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + def update( + self, + resource_group_name: str, + environment_name: str, + certificate_name: str, + certificate_envelope: IO, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> _models.Certificate: + """Update properties of a certificate. + Patches a certificate. Currently only patching of tags is supported. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Managed Environment. Required. + :type environment_name: str + :param certificate_name: Name of the Certificate. Required. + :type certificate_name: str + :param certificate_envelope: Properties of a certificate that need to be updated. Required. + :type certificate_envelope: IO + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: Certificate or the result of cls(response) + :rtype: ~azure.mgmt.appcontainers.models.Certificate + :raises ~azure.core.exceptions.HttpResponseError: + """ @distributed_trace def update( @@ -544,55 +673,74 @@ def update( resource_group_name: str, environment_name: str, certificate_name: str, - certificate_envelope: "_models.CertificatePatch", + certificate_envelope: Union[_models.CertificatePatch, IO], **kwargs: Any - ) -> "_models.Certificate": + ) -> _models.Certificate: """Update properties of a certificate. Patches a certificate. Currently only patching of tags is supported. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Managed Environment. + :param environment_name: Name of the Managed Environment. Required. :type environment_name: str - :param certificate_name: Name of the Certificate. + :param certificate_name: Name of the Certificate. Required. :type certificate_name: str - :param certificate_envelope: Properties of a certificate that need to be updated. - :type certificate_envelope: ~azure.mgmt.appcontainers.models.CertificatePatch + :param certificate_envelope: Properties of a certificate that need to be updated. Is either a + model type or a IO type. Required. + :type certificate_envelope: ~azure.mgmt.appcontainers.models.CertificatePatch or IO + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: Certificate, or the result of cls(response) + :return: Certificate or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.Certificate - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.Certificate"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - _json = self._serialize.body(certificate_envelope, 'CertificatePatch') + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[_models.Certificate] + + content_type = content_type or "application/json" + _json = None + _content = None + if isinstance(certificate_envelope, (IO, bytes)): + _content = certificate_envelope + else: + _json = self._serialize.body(certificate_envelope, "CertificatePatch") request = build_update_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, certificate_name=certificate_name, + subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, - template_url=self.update.metadata['url'], + content=_content, + template_url=self.update.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -600,12 +748,11 @@ def update( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('Certificate', pipeline_response) + deserialized = self._deserialize("Certificate", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates/{certificateName}"} # type: ignore - + update.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/certificates/{certificateName}"} # type: ignore diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_container_apps_auth_configs_operations.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_container_apps_auth_configs_operations.py index b781f9a33621..9f5967f723a2 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_container_apps_auth_configs_operations.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_container_apps_auth_configs_operations.py @@ -6,258 +6,248 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, Callable, Dict, Iterable, Optional, TypeVar - -from msrest import Serializer - -from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload +from urllib.parse import parse_qs, urljoin, urlparse + +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) from azure.core.paging import ItemPaged from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import HttpResponse from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace +from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from .. import models as _models +from .._serialization import Serializer from .._vendor import _convert_request, _format_url_section -T = TypeVar('T') -JSONType = Any + +T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False + def build_list_by_container_app_request( - subscription_id: str, - resource_group_name: str, - container_app_name: str, - **kwargs: Any + resource_group_name: str, container_app_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="GET", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) def build_get_request( - subscription_id: str, - resource_group_name: str, - container_app_name: str, - auth_config_name: str, - **kwargs: Any + resource_group_name: str, container_app_name: str, auth_config_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{authConfigName}") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{authConfigName}", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, 'str'), - "authConfigName": _SERIALIZER.url("auth_config_name", auth_config_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, "str"), + "authConfigName": _SERIALIZER.url("auth_config_name", auth_config_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="GET", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) def build_create_or_update_request( - subscription_id: str, - resource_group_name: str, - container_app_name: str, - auth_config_name: str, - *, - json: JSONType = None, - content: Any = None, - **kwargs: Any + resource_group_name: str, container_app_name: str, auth_config_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', None) # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{authConfigName}") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{authConfigName}", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, 'str'), - "authConfigName": _SERIALIZER.url("auth_config_name", auth_config_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, "str"), + "authConfigName": _SERIALIZER.url("auth_config_name", auth_config_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] if content_type is not None: - _header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="PUT", - url=_url, - params=_query_parameters, - headers=_header_parameters, - json=json, - content=content, - **kwargs - ) + return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs) def build_delete_request( - subscription_id: str, - resource_group_name: str, - container_app_name: str, - auth_config_name: str, - **kwargs: Any + resource_group_name: str, container_app_name: str, auth_config_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{authConfigName}") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{authConfigName}", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, 'str'), - "authConfigName": _SERIALIZER.url("auth_config_name", auth_config_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, "str"), + "authConfigName": _SERIALIZER.url("auth_config_name", auth_config_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="DELETE", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) - -class ContainerAppsAuthConfigsOperations(object): - """ContainerAppsAuthConfigsOperations operations. - - You should not instantiate this class directly. Instead, you should create a Client instance that - instantiates it for you and attaches it as an attribute. - - :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.appcontainers.models - :param client: Client for service requests. - :param config: Configuration of service client. - :param serializer: An object model serializer. - :param deserializer: An object model deserializer. + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs) + + +class ContainerAppsAuthConfigsOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. + + Instead, you should access the following operations through + :class:`~azure.mgmt.appcontainers.ContainerAppsAPIClient`'s + :attr:`container_apps_auth_configs` attribute. """ models = _models - def __init__(self, client, config, serializer, deserializer): - self._client = client - self._serialize = serializer - self._deserialize = deserializer - self._config = config + def __init__(self, *args, **kwargs): + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def list_by_container_app( - self, - resource_group_name: str, - container_app_name: str, - **kwargs: Any - ) -> Iterable["_models.AuthConfigCollection"]: + self, resource_group_name: str, container_app_name: str, **kwargs: Any + ) -> Iterable["_models.AuthConfig"]: """Get the Container App AuthConfigs in a given resource group. Get the Container App AuthConfigs in a given resource group. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of either AuthConfigCollection or the result of - cls(response) - :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.appcontainers.models.AuthConfigCollection] - :raises: ~azure.core.exceptions.HttpResponseError + :return: An iterator like instance of either AuthConfig or the result of cls(response) + :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.appcontainers.models.AuthConfig] + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.AuthConfigCollection] - cls = kwargs.pop('cls', None) # type: ClsType["_models.AuthConfigCollection"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + def prepare_request(next_link=None): if not next_link: - + request = build_list_by_container_app_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_by_container_app.metadata['url'], + template_url=self.list_by_container_app.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore else: - - request = build_list_by_container_app_request( - subscription_id=self._config.subscription_id, - resource_group_name=resource_group_name, - container_app_name=container_app_name, - api_version=api_version, - template_url=next_link, - ) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore request.method = "GET" return request @@ -271,10 +261,8 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) response = pipeline_response.http_response @@ -285,60 +273,61 @@ def get_next(next_link=None): return pipeline_response + return ItemPaged(get_next, extract_data) - return ItemPaged( - get_next, extract_data - ) - list_by_container_app.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs"} # type: ignore + list_by_container_app.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs"} # type: ignore @distributed_trace def get( - self, - resource_group_name: str, - container_app_name: str, - auth_config_name: str, - **kwargs: Any - ) -> "_models.AuthConfig": + self, resource_group_name: str, container_app_name: str, auth_config_name: str, **kwargs: Any + ) -> _models.AuthConfig: """Get a AuthConfig of a Container App. Get a AuthConfig of a Container App. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param auth_config_name: Name of the Container App AuthConfig. + :param auth_config_name: Name of the Container App AuthConfig. Required. :type auth_config_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: AuthConfig, or the result of cls(response) + :return: AuthConfig or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.AuthConfig - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.AuthConfig"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.AuthConfig] - request = build_get_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, auth_config_name=auth_config_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get.metadata['url'], + template_url=self.get.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -346,15 +335,80 @@ def get( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('AuthConfig', pipeline_response) + deserialized = self._deserialize("AuthConfig", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{authConfigName}"} # type: ignore + get.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{authConfigName}"} # type: ignore + + @overload + def create_or_update( + self, + resource_group_name: str, + container_app_name: str, + auth_config_name: str, + auth_config_envelope: _models.AuthConfig, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> _models.AuthConfig: + """Create or update the AuthConfig for a Container App. + + Create or update the AuthConfig for a Container App. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param container_app_name: Name of the Container App. Required. + :type container_app_name: str + :param auth_config_name: Name of the Container App AuthConfig. Required. + :type auth_config_name: str + :param auth_config_envelope: Properties used to create a Container App AuthConfig. Required. + :type auth_config_envelope: ~azure.mgmt.appcontainers.models.AuthConfig + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: AuthConfig or the result of cls(response) + :rtype: ~azure.mgmt.appcontainers.models.AuthConfig + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + def create_or_update( + self, + resource_group_name: str, + container_app_name: str, + auth_config_name: str, + auth_config_envelope: IO, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> _models.AuthConfig: + """Create or update the AuthConfig for a Container App. + Create or update the AuthConfig for a Container App. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param container_app_name: Name of the Container App. Required. + :type container_app_name: str + :param auth_config_name: Name of the Container App AuthConfig. Required. + :type auth_config_name: str + :param auth_config_envelope: Properties used to create a Container App AuthConfig. Required. + :type auth_config_envelope: IO + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: AuthConfig or the result of cls(response) + :rtype: ~azure.mgmt.appcontainers.models.AuthConfig + :raises ~azure.core.exceptions.HttpResponseError: + """ @distributed_trace def create_or_update( @@ -362,55 +416,74 @@ def create_or_update( resource_group_name: str, container_app_name: str, auth_config_name: str, - auth_config_envelope: "_models.AuthConfig", + auth_config_envelope: Union[_models.AuthConfig, IO], **kwargs: Any - ) -> "_models.AuthConfig": + ) -> _models.AuthConfig: """Create or update the AuthConfig for a Container App. - Description for Create or update the AuthConfig for a Container App. + Create or update the AuthConfig for a Container App. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param auth_config_name: Name of the Container App AuthConfig. + :param auth_config_name: Name of the Container App AuthConfig. Required. :type auth_config_name: str - :param auth_config_envelope: Properties used to create a Container App AuthConfig. - :type auth_config_envelope: ~azure.mgmt.appcontainers.models.AuthConfig + :param auth_config_envelope: Properties used to create a Container App AuthConfig. Is either a + model type or a IO type. Required. + :type auth_config_envelope: ~azure.mgmt.appcontainers.models.AuthConfig or IO + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: AuthConfig, or the result of cls(response) + :return: AuthConfig or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.AuthConfig - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.AuthConfig"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[_models.AuthConfig] - _json = self._serialize.body(auth_config_envelope, 'AuthConfig') + content_type = content_type or "application/json" + _json = None + _content = None + if isinstance(auth_config_envelope, (IO, bytes)): + _content = auth_config_envelope + else: + _json = self._serialize.body(auth_config_envelope, "AuthConfig") request = build_create_or_update_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, auth_config_name=auth_config_name, + subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, - template_url=self.create_or_update.metadata['url'], + content=_content, + template_url=self.create_or_update.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -418,64 +491,66 @@ def create_or_update( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('AuthConfig', pipeline_response) + deserialized = self._deserialize("AuthConfig", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{authConfigName}"} # type: ignore - + create_or_update.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{authConfigName}"} # type: ignore @distributed_trace def delete( # pylint: disable=inconsistent-return-statements - self, - resource_group_name: str, - container_app_name: str, - auth_config_name: str, - **kwargs: Any + self, resource_group_name: str, container_app_name: str, auth_config_name: str, **kwargs: Any ) -> None: """Delete a Container App AuthConfig. - Description for Delete a Container App AuthConfig. + Delete a Container App AuthConfig. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param auth_config_name: Name of the Container App AuthConfig. + :param auth_config_name: Name of the Container App AuthConfig. Required. :type auth_config_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: None, or the result of cls(response) + :return: None or the result of cls(response) :rtype: None - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] - request = build_delete_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, auth_config_name=auth_config_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.delete.metadata['url'], + template_url=self.delete.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200, 204]: @@ -486,5 +561,4 @@ def delete( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, {}) - delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{authConfigName}"} # type: ignore - + delete.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{authConfigName}"} # type: ignore diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_container_apps_operations.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_container_apps_operations.py index 23362edb8dd9..7035851ec408 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_container_apps_operations.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_container_apps_operations.py @@ -6,394 +6,368 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, Callable, Dict, Iterable, Optional, TypeVar, Union - -from msrest import Serializer - -from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, cast, overload +from urllib.parse import parse_qs, urljoin, urlparse + +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) from azure.core.paging import ItemPaged from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import HttpResponse from azure.core.polling import LROPoller, NoPolling, PollingMethod from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace +from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from azure.mgmt.core.polling.arm_polling import ARMPolling from .. import models as _models +from .._serialization import Serializer from .._vendor import _convert_request, _format_url_section -T = TypeVar('T') -JSONType = Any + +T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False -def build_list_by_subscription_request( - subscription_id: str, - **kwargs: Any -) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - accept = "application/json" +def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") + # Construct URL _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/providers/Microsoft.App/containerApps") path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="GET", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) -def build_list_by_resource_group_request( - subscription_id: str, - resource_group_name: str, - **kwargs: Any -) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str +def build_list_by_resource_group_request(resource_group_name: str, subscription_id: str, **kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="GET", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) def build_get_request( - subscription_id: str, - resource_group_name: str, - container_app_name: str, - **kwargs: Any + resource_group_name: str, container_app_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="GET", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) -def build_create_or_update_request_initial( - subscription_id: str, - resource_group_name: str, - container_app_name: str, - *, - json: JSONType = None, - content: Any = None, - **kwargs: Any +def build_create_or_update_request( + resource_group_name: str, container_app_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', None) # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] if content_type is not None: - _header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="PUT", - url=_url, - params=_query_parameters, - headers=_header_parameters, - json=json, - content=content, - **kwargs - ) + return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs) -def build_delete_request_initial( - subscription_id: str, - resource_group_name: str, - container_app_name: str, - **kwargs: Any +def build_delete_request( + resource_group_name: str, container_app_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="DELETE", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) + return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs) -def build_update_request_initial( - subscription_id: str, - resource_group_name: str, - container_app_name: str, - *, - json: JSONType = None, - content: Any = None, - **kwargs: Any +def build_update_request( + resource_group_name: str, container_app_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', None) # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] if content_type is not None: - _header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="PATCH", - url=_url, - params=_query_parameters, - headers=_header_parameters, - json=json, - content=content, - **kwargs - ) + return HttpRequest(method="PATCH", url=_url, params=_params, headers=_headers, **kwargs) def build_list_custom_host_name_analysis_request( - subscription_id: str, resource_group_name: str, container_app_name: str, + subscription_id: str, *, custom_hostname: Optional[str] = None, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/listCustomHostNameAnalysis") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/listCustomHostNameAnalysis", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] if custom_hostname is not None: - _query_parameters['customHostname'] = _SERIALIZER.query("custom_hostname", custom_hostname, 'str') - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["customHostname"] = _SERIALIZER.query("custom_hostname", custom_hostname, "str") + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="POST", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) + return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs) def build_list_secrets_request( - subscription_id: str, - resource_group_name: str, - container_app_name: str, - **kwargs: Any + resource_group_name: str, container_app_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/listSecrets") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/listSecrets", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="POST", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) - -class ContainerAppsOperations(object): - """ContainerAppsOperations operations. - - You should not instantiate this class directly. Instead, you should create a Client instance that - instantiates it for you and attaches it as an attribute. - - :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.appcontainers.models - :param client: Client for service requests. - :param config: Configuration of service client. - :param serializer: An object model serializer. - :param deserializer: An object model deserializer. + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs) + + +class ContainerAppsOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. + + Instead, you should access the following operations through + :class:`~azure.mgmt.appcontainers.ContainerAppsAPIClient`'s + :attr:`container_apps` attribute. """ models = _models - def __init__(self, client, config, serializer, deserializer): - self._client = client - self._serialize = serializer - self._deserialize = deserializer - self._config = config + def __init__(self, *args, **kwargs): + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def list_by_subscription( - self, - **kwargs: Any - ) -> Iterable["_models.ContainerAppCollection"]: + def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.ContainerApp"]: """Get the Container Apps in a given subscription. Get the Container Apps in a given subscription. :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of either ContainerAppCollection or the result of - cls(response) - :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.appcontainers.models.ContainerAppCollection] - :raises: ~azure.core.exceptions.HttpResponseError + :return: An iterator like instance of either ContainerApp or the result of cls(response) + :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.appcontainers.models.ContainerApp] + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.ContainerAppCollection] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ContainerAppCollection"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + def prepare_request(next_link=None): if not next_link: - + request = build_list_by_subscription_request( subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_by_subscription.metadata['url'], + template_url=self.list_by_subscription.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore else: - - request = build_list_by_subscription_request( - subscription_id=self._config.subscription_id, - api_version=api_version, - template_url=next_link, - ) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore request.method = "GET" return request @@ -407,10 +381,8 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) response = pipeline_response.http_response @@ -421,59 +393,60 @@ def get_next(next_link=None): return pipeline_response + return ItemPaged(get_next, extract_data) - return ItemPaged( - get_next, extract_data - ) - list_by_subscription.metadata = {'url': "/subscriptions/{subscriptionId}/providers/Microsoft.App/containerApps"} # type: ignore + list_by_subscription.metadata = {"url": "/subscriptions/{subscriptionId}/providers/Microsoft.App/containerApps"} # type: ignore @distributed_trace - def list_by_resource_group( - self, - resource_group_name: str, - **kwargs: Any - ) -> Iterable["_models.ContainerAppCollection"]: + def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Iterable["_models.ContainerApp"]: """Get the Container Apps in a given resource group. Get the Container Apps in a given resource group. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of either ContainerAppCollection or the result of - cls(response) - :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.appcontainers.models.ContainerAppCollection] - :raises: ~azure.core.exceptions.HttpResponseError + :return: An iterator like instance of either ContainerApp or the result of cls(response) + :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.appcontainers.models.ContainerApp] + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.ContainerAppCollection] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ContainerAppCollection"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + def prepare_request(next_link=None): if not next_link: - + request = build_list_by_resource_group_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_by_resource_group.metadata['url'], + template_url=self.list_by_resource_group.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore else: - - request = build_list_by_resource_group_request( - subscription_id=self._config.subscription_id, - resource_group_name=resource_group_name, - api_version=api_version, - template_url=next_link, - ) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore request.method = "GET" return request @@ -487,10 +460,8 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) response = pipeline_response.http_response @@ -501,56 +472,56 @@ def get_next(next_link=None): return pipeline_response + return ItemPaged(get_next, extract_data) - return ItemPaged( - get_next, extract_data - ) - list_by_resource_group.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps"} # type: ignore + list_by_resource_group.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps"} # type: ignore @distributed_trace - def get( - self, - resource_group_name: str, - container_app_name: str, - **kwargs: Any - ) -> "_models.ContainerApp": + def get(self, resource_group_name: str, container_app_name: str, **kwargs: Any) -> _models.ContainerApp: """Get the properties of a Container App. Get the properties of a Container App. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: ContainerApp, or the result of cls(response) + :return: ContainerApp or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.ContainerApp - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ContainerApp"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, + 404: lambda response: ResourceNotFoundError(response=response, error_format=ARMErrorFormat), } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.ContainerApp] - request = build_get_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get.metadata['url'], + template_url=self.get.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -558,89 +529,183 @@ def get( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('ContainerApp', pipeline_response) + deserialized = self._deserialize("ContainerApp", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore - + get.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore def _create_or_update_initial( self, resource_group_name: str, container_app_name: str, - container_app_envelope: "_models.ContainerApp", + container_app_envelope: Union[_models.ContainerApp, IO], **kwargs: Any - ) -> "_models.ContainerApp": - cls = kwargs.pop('cls', None) # type: ClsType["_models.ContainerApp"] + ) -> _models.ContainerApp: error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - _json = self._serialize.body(container_app_envelope, 'ContainerApp') + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ContainerApp] - request = build_create_or_update_request_initial( - subscription_id=self._config.subscription_id, + content_type = content_type or "application/json" + _json = None + _content = None + if isinstance(container_app_envelope, (IO, bytes)): + _content = container_app_envelope + else: + _json = self._serialize.body(container_app_envelope, "ContainerApp") + + request = build_create_or_update_request( resource_group_name=resource_group_name, container_app_name=container_app_name, + subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, - template_url=self._create_or_update_initial.metadata['url'], + content=_content, + template_url=self._create_or_update_initial.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200, 201]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if response.status_code == 200: - deserialized = self._deserialize('ContainerApp', pipeline_response) + deserialized = self._deserialize("ContainerApp", pipeline_response) if response.status_code == 201: - deserialized = self._deserialize('ContainerApp', pipeline_response) + deserialized = self._deserialize("ContainerApp", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore + _create_or_update_initial.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore + + @overload + def begin_create_or_update( + self, + resource_group_name: str, + container_app_name: str, + container_app_envelope: _models.ContainerApp, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> LROPoller[_models.ContainerApp]: + """Create or update a Container App. + + Create or update a Container App. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param container_app_name: Name of the Container App. Required. + :type container_app_name: str + :param container_app_envelope: Properties used to create a container app. Required. + :type container_app_envelope: ~azure.mgmt.appcontainers.models.ContainerApp + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this + operation to not poll, or pass in your own initialized polling object for a personal polling + strategy. + :paramtype polling: bool or ~azure.core.polling.PollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no + Retry-After header is present. + :return: An instance of LROPoller that returns either ContainerApp or the result of + cls(response) + :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.appcontainers.models.ContainerApp] + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + def begin_create_or_update( + self, + resource_group_name: str, + container_app_name: str, + container_app_envelope: IO, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> LROPoller[_models.ContainerApp]: + """Create or update a Container App. + + Create or update a Container App. + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param container_app_name: Name of the Container App. Required. + :type container_app_name: str + :param container_app_envelope: Properties used to create a container app. Required. + :type container_app_envelope: IO + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this + operation to not poll, or pass in your own initialized polling object for a personal polling + strategy. + :paramtype polling: bool or ~azure.core.polling.PollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no + Retry-After header is present. + :return: An instance of LROPoller that returns either ContainerApp or the result of + cls(response) + :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.appcontainers.models.ContainerApp] + :raises ~azure.core.exceptions.HttpResponseError: + """ @distributed_trace def begin_create_or_update( self, resource_group_name: str, container_app_name: str, - container_app_envelope: "_models.ContainerApp", + container_app_envelope: Union[_models.ContainerApp, IO], **kwargs: Any - ) -> LROPoller["_models.ContainerApp"]: + ) -> LROPoller[_models.ContainerApp]: """Create or update a Container App. - Description for Create or update a Container App. + Create or update a Container App. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param container_app_envelope: Properties used to create a container app. - :type container_app_envelope: ~azure.mgmt.appcontainers.models.ContainerApp + :param container_app_envelope: Properties used to create a container app. Is either a model + type or a IO type. Required. + :type container_app_envelope: ~azure.mgmt.appcontainers.models.ContainerApp or IO + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this @@ -652,107 +717,109 @@ def begin_create_or_update( :return: An instance of LROPoller that returns either ContainerApp or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.appcontainers.models.ContainerApp] - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - polling = kwargs.pop('polling', True) # type: Union[bool, PollingMethod] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ContainerApp"] - lro_delay = kwargs.pop( - 'polling_interval', - self._config.polling_interval - ) - cont_token = kwargs.pop('continuation_token', None) # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ContainerApp] + polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] + lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) + cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] if cont_token is None: - raw_result = self._create_or_update_initial( + raw_result = self._create_or_update_initial( # type: ignore resource_group_name=resource_group_name, container_app_name=container_app_name, container_app_envelope=container_app_envelope, api_version=api_version, content_type=content_type, - cls=lambda x,y,z: x, + cls=lambda x, y, z: x, + headers=_headers, + params=_params, **kwargs ) - kwargs.pop('error_map', None) + kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response - deserialized = self._deserialize('ContainerApp', pipeline_response) + deserialized = self._deserialize("ContainerApp", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - - if polling is True: polling_method = ARMPolling(lro_delay, **kwargs) - elif polling is False: polling_method = NoPolling() - else: polling_method = polling + if polling is True: + polling_method = cast(PollingMethod, ARMPolling(lro_delay, **kwargs)) # type: PollingMethod + elif polling is False: + polling_method = cast(PollingMethod, NoPolling()) + else: + polling_method = polling if cont_token: return LROPoller.from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, - deserialization_callback=get_long_running_output + deserialization_callback=get_long_running_output, ) return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore + begin_create_or_update.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore def _delete_initial( # pylint: disable=inconsistent-return-statements - self, - resource_group_name: str, - container_app_name: str, - **kwargs: Any + self, resource_group_name: str, container_app_name: str, **kwargs: Any ) -> None: - cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - - request = build_delete_request_initial( - subscription_id=self._config.subscription_id, + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] + + request = build_delete_request( resource_group_name=resource_group_name, container_app_name=container_app_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self._delete_initial.metadata['url'], + template_url=self._delete_initial.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200, 202, 204]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: return cls(pipeline_response, None, {}) - _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore - + _delete_initial.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore @distributed_trace - def begin_delete( # pylint: disable=inconsistent-return-statements - self, - resource_group_name: str, - container_app_name: str, - **kwargs: Any - ) -> LROPoller[None]: + def begin_delete(self, resource_group_name: str, container_app_name: str, **kwargs: Any) -> LROPoller[None]: """Delete a Container App. - Description for Delete a Container App. + Delete a Container App. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. @@ -764,98 +831,190 @@ def begin_delete( # pylint: disable=inconsistent-return-statements Retry-After header is present. :return: An instance of LROPoller that returns either None or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[None] - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - polling = kwargs.pop('polling', True) # type: Union[bool, PollingMethod] - cls = kwargs.pop('cls', None) # type: ClsType[None] - lro_delay = kwargs.pop( - 'polling_interval', - self._config.polling_interval - ) - cont_token = kwargs.pop('continuation_token', None) # type: Optional[str] + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] + polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] + lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) + cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] if cont_token is None: - raw_result = self._delete_initial( + raw_result = self._delete_initial( # type: ignore resource_group_name=resource_group_name, container_app_name=container_app_name, api_version=api_version, - cls=lambda x,y,z: x, + cls=lambda x, y, z: x, + headers=_headers, + params=_params, **kwargs ) - kwargs.pop('error_map', None) + kwargs.pop("error_map", None) - def get_long_running_output(pipeline_response): + def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, {}) - - if polling is True: polling_method = ARMPolling(lro_delay, **kwargs) - elif polling is False: polling_method = NoPolling() - else: polling_method = polling + if polling is True: + polling_method = cast(PollingMethod, ARMPolling(lro_delay, **kwargs)) # type: PollingMethod + elif polling is False: + polling_method = cast(PollingMethod, NoPolling()) + else: + polling_method = polling if cont_token: return LROPoller.from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, - deserialization_callback=get_long_running_output + deserialization_callback=get_long_running_output, ) return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore + begin_delete.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore def _update_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, container_app_name: str, - container_app_envelope: "_models.ContainerApp", + container_app_envelope: Union[_models.ContainerApp, IO], **kwargs: Any ) -> None: - cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - _json = self._serialize.body(container_app_envelope, 'ContainerApp') + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[None] - request = build_update_request_initial( - subscription_id=self._config.subscription_id, + content_type = content_type or "application/json" + _json = None + _content = None + if isinstance(container_app_envelope, (IO, bytes)): + _content = container_app_envelope + else: + _json = self._serialize.body(container_app_envelope, "ContainerApp") + + request = build_update_request( resource_group_name=resource_group_name, container_app_name=container_app_name, + subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, - template_url=self._update_initial.metadata['url'], + content=_content, + template_url=self._update_initial.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [202]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: return cls(pipeline_response, None, {}) - _update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore + _update_initial.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore + + @overload + def begin_update( + self, + resource_group_name: str, + container_app_name: str, + container_app_envelope: _models.ContainerApp, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> LROPoller[None]: + """Update properties of a Container App. + + Patches a Container App using JSON Merge Patch. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param container_app_name: Name of the Container App. Required. + :type container_app_name: str + :param container_app_envelope: Properties of a Container App that need to be updated. Required. + :type container_app_envelope: ~azure.mgmt.appcontainers.models.ContainerApp + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this + operation to not poll, or pass in your own initialized polling object for a personal polling + strategy. + :paramtype polling: bool or ~azure.core.polling.PollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no + Retry-After header is present. + :return: An instance of LROPoller that returns either None or the result of cls(response) + :rtype: ~azure.core.polling.LROPoller[None] + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + def begin_update( + self, + resource_group_name: str, + container_app_name: str, + container_app_envelope: IO, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> LROPoller[None]: + """Update properties of a Container App. + + Patches a Container App using JSON Merge Patch. + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param container_app_name: Name of the Container App. Required. + :type container_app_name: str + :param container_app_envelope: Properties of a Container App that need to be updated. Required. + :type container_app_envelope: IO + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this + operation to not poll, or pass in your own initialized polling object for a personal polling + strategy. + :paramtype polling: bool or ~azure.core.polling.PollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no + Retry-After header is present. + :return: An instance of LROPoller that returns either None or the result of cls(response) + :rtype: ~azure.core.polling.LROPoller[None] + :raises ~azure.core.exceptions.HttpResponseError: + """ @distributed_trace - def begin_update( # pylint: disable=inconsistent-return-statements + def begin_update( self, resource_group_name: str, container_app_name: str, - container_app_envelope: "_models.ContainerApp", + container_app_envelope: Union[_models.ContainerApp, IO], **kwargs: Any ) -> LROPoller[None]: """Update properties of a Container App. @@ -863,11 +1022,16 @@ def begin_update( # pylint: disable=inconsistent-return-statements Patches a Container App using JSON Merge Patch. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param container_app_envelope: Properties of a Container App that need to be updated. - :type container_app_envelope: ~azure.mgmt.appcontainers.models.ContainerApp + :param container_app_envelope: Properties of a Container App that need to be updated. Is either + a model type or a IO type. Required. + :type container_app_envelope: ~azure.mgmt.appcontainers.models.ContainerApp or IO + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this @@ -878,96 +1042,103 @@ def begin_update( # pylint: disable=inconsistent-return-statements Retry-After header is present. :return: An instance of LROPoller that returns either None or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[None] - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - polling = kwargs.pop('polling', True) # type: Union[bool, PollingMethod] - cls = kwargs.pop('cls', None) # type: ClsType[None] - lro_delay = kwargs.pop( - 'polling_interval', - self._config.polling_interval - ) - cont_token = kwargs.pop('continuation_token', None) # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[None] + polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] + lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) + cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] if cont_token is None: - raw_result = self._update_initial( + raw_result = self._update_initial( # type: ignore resource_group_name=resource_group_name, container_app_name=container_app_name, container_app_envelope=container_app_envelope, api_version=api_version, content_type=content_type, - cls=lambda x,y,z: x, + cls=lambda x, y, z: x, + headers=_headers, + params=_params, **kwargs ) - kwargs.pop('error_map', None) + kwargs.pop("error_map", None) - def get_long_running_output(pipeline_response): + def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, {}) - - if polling is True: polling_method = ARMPolling(lro_delay, **kwargs) - elif polling is False: polling_method = NoPolling() - else: polling_method = polling + if polling is True: + polling_method = cast(PollingMethod, ARMPolling(lro_delay, **kwargs)) # type: PollingMethod + elif polling is False: + polling_method = cast(PollingMethod, NoPolling()) + else: + polling_method = polling if cont_token: return LROPoller.from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, - deserialization_callback=get_long_running_output + deserialization_callback=get_long_running_output, ) return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore + begin_update.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}"} # type: ignore @distributed_trace def list_custom_host_name_analysis( - self, - resource_group_name: str, - container_app_name: str, - custom_hostname: Optional[str] = None, - **kwargs: Any - ) -> "_models.CustomHostnameAnalysisResult": + self, resource_group_name: str, container_app_name: str, custom_hostname: Optional[str] = None, **kwargs: Any + ) -> _models.CustomHostnameAnalysisResult: """Analyzes a custom hostname for a Container App. Analyzes a custom hostname for a Container App. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str :param custom_hostname: Custom hostname. Default value is None. :type custom_hostname: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: CustomHostnameAnalysisResult, or the result of cls(response) + :return: CustomHostnameAnalysisResult or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.CustomHostnameAnalysisResult - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.CustomHostnameAnalysisResult"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.CustomHostnameAnalysisResult] - request = build_list_custom_host_name_analysis_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, - api_version=api_version, + subscription_id=self._config.subscription_id, custom_hostname=custom_hostname, - template_url=self.list_custom_host_name_analysis.metadata['url'], + api_version=api_version, + template_url=self.list_custom_host_name_analysis.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -975,60 +1146,63 @@ def list_custom_host_name_analysis( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('CustomHostnameAnalysisResult', pipeline_response) + deserialized = self._deserialize("CustomHostnameAnalysisResult", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - list_custom_host_name_analysis.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/listCustomHostNameAnalysis"} # type: ignore - + list_custom_host_name_analysis.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/listCustomHostNameAnalysis"} # type: ignore @distributed_trace def list_secrets( - self, - resource_group_name: str, - container_app_name: str, - **kwargs: Any - ) -> "_models.SecretsCollection": + self, resource_group_name: str, container_app_name: str, **kwargs: Any + ) -> _models.SecretsCollection: """List secrets for a container app. List secrets for a container app. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: SecretsCollection, or the result of cls(response) + :return: SecretsCollection or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.SecretsCollection - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.SecretsCollection"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.SecretsCollection] - request = build_list_secrets_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_secrets.metadata['url'], + template_url=self.list_secrets.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -1036,12 +1210,11 @@ def list_secrets( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('SecretsCollection', pipeline_response) + deserialized = self._deserialize("SecretsCollection", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - list_secrets.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/listSecrets"} # type: ignore - + list_secrets.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/listSecrets"} # type: ignore diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_container_apps_revision_replicas_operations.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_container_apps_revision_replicas_operations.py index ea265a1598bf..6b03e80ee051 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_container_apps_revision_replicas_operations.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_container_apps_revision_replicas_operations.py @@ -8,174 +8,179 @@ # -------------------------------------------------------------------------- from typing import Any, Callable, Dict, Optional, TypeVar -from msrest import Serializer - -from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import HttpResponse from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace +from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from .. import models as _models +from .._serialization import Serializer from .._vendor import _convert_request, _format_url_section -T = TypeVar('T') + +T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False + def build_get_replica_request( - subscription_id: str, resource_group_name: str, container_app_name: str, revision_name: str, replica_name: str, + subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/replicas/{replicaName}") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/replicas/{replicaName}", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, 'str'), - "revisionName": _SERIALIZER.url("revision_name", revision_name, 'str'), - "replicaName": _SERIALIZER.url("replica_name", replica_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, "str"), + "revisionName": _SERIALIZER.url("revision_name", revision_name, "str"), + "replicaName": _SERIALIZER.url("replica_name", replica_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="GET", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) def build_list_replicas_request( - subscription_id: str, - resource_group_name: str, - container_app_name: str, - revision_name: str, - **kwargs: Any + resource_group_name: str, container_app_name: str, revision_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/replicas") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/replicas", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, 'str'), - "revisionName": _SERIALIZER.url("revision_name", revision_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, "str"), + "revisionName": _SERIALIZER.url("revision_name", revision_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="GET", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) - -class ContainerAppsRevisionReplicasOperations(object): - """ContainerAppsRevisionReplicasOperations operations. - - You should not instantiate this class directly. Instead, you should create a Client instance that - instantiates it for you and attaches it as an attribute. - - :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.appcontainers.models - :param client: Client for service requests. - :param config: Configuration of service client. - :param serializer: An object model serializer. - :param deserializer: An object model deserializer. + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) + + +class ContainerAppsRevisionReplicasOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. + + Instead, you should access the following operations through + :class:`~azure.mgmt.appcontainers.ContainerAppsAPIClient`'s + :attr:`container_apps_revision_replicas` attribute. """ models = _models - def __init__(self, client, config, serializer, deserializer): - self._client = client - self._serialize = serializer - self._deserialize = deserializer - self._config = config + def __init__(self, *args, **kwargs): + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def get_replica( - self, - resource_group_name: str, - container_app_name: str, - revision_name: str, - replica_name: str, - **kwargs: Any - ) -> "_models.Replica": + self, resource_group_name: str, container_app_name: str, revision_name: str, replica_name: str, **kwargs: Any + ) -> _models.Replica: """Get a replica for a Container App Revision. Get a replica for a Container App Revision. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param revision_name: Name of the Container App Revision. + :param revision_name: Name of the Container App Revision. Required. :type revision_name: str - :param replica_name: Name of the Container App Revision Replica. + :param replica_name: Name of the Container App Revision Replica. Required. :type replica_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: Replica, or the result of cls(response) + :return: Replica or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.Replica - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.Replica"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.Replica] - request = build_get_replica_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, revision_name=revision_name, replica_name=replica_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get_replica.metadata['url'], + template_url=self.get_replica.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -183,64 +188,66 @@ def get_replica( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('Replica', pipeline_response) + deserialized = self._deserialize("Replica", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - get_replica.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/replicas/{replicaName}"} # type: ignore - + get_replica.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/replicas/{replicaName}"} # type: ignore @distributed_trace def list_replicas( - self, - resource_group_name: str, - container_app_name: str, - revision_name: str, - **kwargs: Any - ) -> "_models.ReplicaCollection": + self, resource_group_name: str, container_app_name: str, revision_name: str, **kwargs: Any + ) -> _models.ReplicaCollection: """List replicas for a Container App Revision. List replicas for a Container App Revision. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param revision_name: Name of the Container App Revision. + :param revision_name: Name of the Container App Revision. Required. :type revision_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: ReplicaCollection, or the result of cls(response) + :return: ReplicaCollection or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.ReplicaCollection - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ReplicaCollection"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.ReplicaCollection] - request = build_list_replicas_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, revision_name=revision_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_replicas.metadata['url'], + template_url=self.list_replicas.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -248,12 +255,11 @@ def list_replicas( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('ReplicaCollection', pipeline_response) + deserialized = self._deserialize("ReplicaCollection", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - list_replicas.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/replicas"} # type: ignore - + list_replicas.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/replicas"} # type: ignore diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_container_apps_revisions_operations.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_container_apps_revisions_operations.py index 680c301f55cd..2cf92e3d7b92 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_container_apps_revisions_operations.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_container_apps_revisions_operations.py @@ -7,294 +7,288 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from typing import Any, Callable, Dict, Iterable, Optional, TypeVar - -from msrest import Serializer - -from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from urllib.parse import parse_qs, urljoin, urlparse + +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) from azure.core.paging import ItemPaged from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import HttpResponse from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace +from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from .. import models as _models +from .._serialization import Serializer from .._vendor import _convert_request, _format_url_section -T = TypeVar('T') + +T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False + def build_list_revisions_request( - subscription_id: str, resource_group_name: str, container_app_name: str, + subscription_id: str, *, filter: Optional[str] = None, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") if filter is not None: - _query_parameters['$filter'] = _SERIALIZER.query("filter", filter, 'str') + _params["$filter"] = _SERIALIZER.query("filter", filter, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="GET", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) def build_get_revision_request( - subscription_id: str, - resource_group_name: str, - container_app_name: str, - revision_name: str, - **kwargs: Any + resource_group_name: str, container_app_name: str, revision_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, 'str'), - "revisionName": _SERIALIZER.url("revision_name", revision_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, "str"), + "revisionName": _SERIALIZER.url("revision_name", revision_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="GET", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) def build_activate_revision_request( - subscription_id: str, - resource_group_name: str, - container_app_name: str, - revision_name: str, - **kwargs: Any + resource_group_name: str, container_app_name: str, revision_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/activate") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/activate", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, 'str'), - "revisionName": _SERIALIZER.url("revision_name", revision_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, "str"), + "revisionName": _SERIALIZER.url("revision_name", revision_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="POST", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) + return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs) def build_deactivate_revision_request( - subscription_id: str, - resource_group_name: str, - container_app_name: str, - revision_name: str, - **kwargs: Any + resource_group_name: str, container_app_name: str, revision_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/deactivate") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/deactivate", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, 'str'), - "revisionName": _SERIALIZER.url("revision_name", revision_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, "str"), + "revisionName": _SERIALIZER.url("revision_name", revision_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="POST", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) + return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs) def build_restart_revision_request( - subscription_id: str, - resource_group_name: str, - container_app_name: str, - revision_name: str, - **kwargs: Any + resource_group_name: str, container_app_name: str, revision_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/restart") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/restart", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, 'str'), - "revisionName": _SERIALIZER.url("revision_name", revision_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, "str"), + "revisionName": _SERIALIZER.url("revision_name", revision_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="POST", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) - -class ContainerAppsRevisionsOperations(object): - """ContainerAppsRevisionsOperations operations. - - You should not instantiate this class directly. Instead, you should create a Client instance that - instantiates it for you and attaches it as an attribute. - - :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.appcontainers.models - :param client: Client for service requests. - :param config: Configuration of service client. - :param serializer: An object model serializer. - :param deserializer: An object model deserializer. + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs) + + +class ContainerAppsRevisionsOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. + + Instead, you should access the following operations through + :class:`~azure.mgmt.appcontainers.ContainerAppsAPIClient`'s + :attr:`container_apps_revisions` attribute. """ models = _models - def __init__(self, client, config, serializer, deserializer): - self._client = client - self._serialize = serializer - self._deserialize = deserializer - self._config = config + def __init__(self, *args, **kwargs): + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def list_revisions( - self, - resource_group_name: str, - container_app_name: str, - filter: Optional[str] = None, - **kwargs: Any - ) -> Iterable["_models.RevisionCollection"]: + self, resource_group_name: str, container_app_name: str, filter: Optional[str] = None, **kwargs: Any + ) -> Iterable["_models.Revision"]: """Get the Revisions for a given Container App. Get the Revisions for a given Container App. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App for which Revisions are needed. + :param container_app_name: Name of the Container App for which Revisions are needed. Required. :type container_app_name: str :param filter: The filter to apply on the operation. Default value is None. :type filter: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of either RevisionCollection or the result of cls(response) - :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.appcontainers.models.RevisionCollection] - :raises: ~azure.core.exceptions.HttpResponseError + :return: An iterator like instance of either Revision or the result of cls(response) + :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.appcontainers.models.Revision] + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.RevisionCollection] - cls = kwargs.pop('cls', None) # type: ClsType["_models.RevisionCollection"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + def prepare_request(next_link=None): if not next_link: - + request = build_list_revisions_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, - api_version=api_version, + subscription_id=self._config.subscription_id, filter=filter, - template_url=self.list_revisions.metadata['url'], + api_version=api_version, + template_url=self.list_revisions.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore else: - - request = build_list_revisions_request( - subscription_id=self._config.subscription_id, - resource_group_name=resource_group_name, - container_app_name=container_app_name, - api_version=api_version, - filter=filter, - template_url=next_link, - ) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore request.method = "GET" return request @@ -308,10 +302,8 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) response = pipeline_response.http_response @@ -322,60 +314,61 @@ def get_next(next_link=None): return pipeline_response + return ItemPaged(get_next, extract_data) - return ItemPaged( - get_next, extract_data - ) - list_revisions.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions"} # type: ignore + list_revisions.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions"} # type: ignore @distributed_trace def get_revision( - self, - resource_group_name: str, - container_app_name: str, - revision_name: str, - **kwargs: Any - ) -> "_models.Revision": + self, resource_group_name: str, container_app_name: str, revision_name: str, **kwargs: Any + ) -> _models.Revision: """Get a revision of a Container App. Get a revision of a Container App. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param revision_name: Name of the Container App Revision. + :param revision_name: Name of the Container App Revision. Required. :type revision_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: Revision, or the result of cls(response) + :return: Revision or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.Revision - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.Revision"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.Revision] - request = build_get_revision_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, revision_name=revision_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get_revision.metadata['url'], + template_url=self.get_revision.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -383,64 +376,66 @@ def get_revision( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('Revision', pipeline_response) + deserialized = self._deserialize("Revision", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - get_revision.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}"} # type: ignore - + get_revision.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}"} # type: ignore @distributed_trace def activate_revision( # pylint: disable=inconsistent-return-statements - self, - resource_group_name: str, - container_app_name: str, - revision_name: str, - **kwargs: Any + self, resource_group_name: str, container_app_name: str, revision_name: str, **kwargs: Any ) -> None: """Activates a revision for a Container App. Activates a revision for a Container App. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param revision_name: Name of the Container App Revision. + :param revision_name: Name of the Container App Revision. Required. :type revision_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: None, or the result of cls(response) + :return: None or the result of cls(response) :rtype: None - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] - request = build_activate_revision_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, revision_name=revision_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.activate_revision.metadata['url'], + template_url=self.activate_revision.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -451,57 +446,59 @@ def activate_revision( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, {}) - activate_revision.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/activate"} # type: ignore - + activate_revision.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/activate"} # type: ignore @distributed_trace def deactivate_revision( # pylint: disable=inconsistent-return-statements - self, - resource_group_name: str, - container_app_name: str, - revision_name: str, - **kwargs: Any + self, resource_group_name: str, container_app_name: str, revision_name: str, **kwargs: Any ) -> None: """Deactivates a revision for a Container App. Deactivates a revision for a Container App. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param revision_name: Name of the Container App Revision. + :param revision_name: Name of the Container App Revision. Required. :type revision_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: None, or the result of cls(response) + :return: None or the result of cls(response) :rtype: None - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] - request = build_deactivate_revision_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, revision_name=revision_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.deactivate_revision.metadata['url'], + template_url=self.deactivate_revision.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -512,57 +509,59 @@ def deactivate_revision( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, {}) - deactivate_revision.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/deactivate"} # type: ignore - + deactivate_revision.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/deactivate"} # type: ignore @distributed_trace def restart_revision( # pylint: disable=inconsistent-return-statements - self, - resource_group_name: str, - container_app_name: str, - revision_name: str, - **kwargs: Any + self, resource_group_name: str, container_app_name: str, revision_name: str, **kwargs: Any ) -> None: """Restarts a revision for a Container App. Restarts a revision for a Container App. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param revision_name: Name of the Container App Revision. + :param revision_name: Name of the Container App Revision. Required. :type revision_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: None, or the result of cls(response) + :return: None or the result of cls(response) :rtype: None - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] - request = build_restart_revision_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, revision_name=revision_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.restart_revision.metadata['url'], + template_url=self.restart_revision.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -573,5 +572,4 @@ def restart_revision( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, {}) - restart_revision.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/restart"} # type: ignore - + restart_revision.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/restart"} # type: ignore diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_container_apps_source_controls_operations.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_container_apps_source_controls_operations.py index 8e54fbb9d51b..0abf8093ba59 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_container_apps_source_controls_operations.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_container_apps_source_controls_operations.py @@ -6,260 +6,250 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, Callable, Dict, Iterable, Optional, TypeVar, Union - -from msrest import Serializer - -from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, cast, overload +from urllib.parse import parse_qs, urljoin, urlparse + +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) from azure.core.paging import ItemPaged from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import HttpResponse from azure.core.polling import LROPoller, NoPolling, PollingMethod from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace +from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from azure.mgmt.core.polling.arm_polling import ARMPolling from .. import models as _models +from .._serialization import Serializer from .._vendor import _convert_request, _format_url_section -T = TypeVar('T') -JSONType = Any + +T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False + def build_list_by_container_app_request( - subscription_id: str, - resource_group_name: str, - container_app_name: str, - **kwargs: Any + resource_group_name: str, container_app_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="GET", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) def build_get_request( - subscription_id: str, - resource_group_name: str, - container_app_name: str, - source_control_name: str, - **kwargs: Any + resource_group_name: str, container_app_name: str, source_control_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{sourceControlName}") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{sourceControlName}", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, 'str'), - "sourceControlName": _SERIALIZER.url("source_control_name", source_control_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, "str"), + "sourceControlName": _SERIALIZER.url("source_control_name", source_control_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="GET", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) - - -def build_create_or_update_request_initial( - subscription_id: str, - resource_group_name: str, - container_app_name: str, - source_control_name: str, - *, - json: JSONType = None, - content: Any = None, - **kwargs: Any + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) + + +def build_create_or_update_request( + resource_group_name: str, container_app_name: str, source_control_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', None) # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{sourceControlName}") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{sourceControlName}", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, 'str'), - "sourceControlName": _SERIALIZER.url("source_control_name", source_control_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, "str"), + "sourceControlName": _SERIALIZER.url("source_control_name", source_control_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] if content_type is not None: - _header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="PUT", - url=_url, - params=_query_parameters, - headers=_header_parameters, - json=json, - content=content, - **kwargs - ) - - -def build_delete_request_initial( - subscription_id: str, - resource_group_name: str, - container_app_name: str, - source_control_name: str, - **kwargs: Any + _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs) + + +def build_delete_request( + resource_group_name: str, container_app_name: str, source_control_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{sourceControlName}") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{sourceControlName}", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, 'str'), - "sourceControlName": _SERIALIZER.url("source_control_name", source_control_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "containerAppName": _SERIALIZER.url("container_app_name", container_app_name, "str"), + "sourceControlName": _SERIALIZER.url("source_control_name", source_control_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="DELETE", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) - -class ContainerAppsSourceControlsOperations(object): - """ContainerAppsSourceControlsOperations operations. - - You should not instantiate this class directly. Instead, you should create a Client instance that - instantiates it for you and attaches it as an attribute. - - :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.appcontainers.models - :param client: Client for service requests. - :param config: Configuration of service client. - :param serializer: An object model serializer. - :param deserializer: An object model deserializer. + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs) + + +class ContainerAppsSourceControlsOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. + + Instead, you should access the following operations through + :class:`~azure.mgmt.appcontainers.ContainerAppsAPIClient`'s + :attr:`container_apps_source_controls` attribute. """ models = _models - def __init__(self, client, config, serializer, deserializer): - self._client = client - self._serialize = serializer - self._deserialize = deserializer - self._config = config + def __init__(self, *args, **kwargs): + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def list_by_container_app( - self, - resource_group_name: str, - container_app_name: str, - **kwargs: Any - ) -> Iterable["_models.SourceControlCollection"]: + self, resource_group_name: str, container_app_name: str, **kwargs: Any + ) -> Iterable["_models.SourceControl"]: """Get the Container App SourceControls in a given resource group. Get the Container App SourceControls in a given resource group. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of either SourceControlCollection or the result of - cls(response) - :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.appcontainers.models.SourceControlCollection] - :raises: ~azure.core.exceptions.HttpResponseError + :return: An iterator like instance of either SourceControl or the result of cls(response) + :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.appcontainers.models.SourceControl] + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.SourceControlCollection] - cls = kwargs.pop('cls', None) # type: ClsType["_models.SourceControlCollection"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + def prepare_request(next_link=None): if not next_link: - + request = build_list_by_container_app_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_by_container_app.metadata['url'], + template_url=self.list_by_container_app.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore else: - - request = build_list_by_container_app_request( - subscription_id=self._config.subscription_id, - resource_group_name=resource_group_name, - container_app_name=container_app_name, - api_version=api_version, - template_url=next_link, - ) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore request.method = "GET" return request @@ -273,10 +263,8 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) response = pipeline_response.http_response @@ -287,60 +275,61 @@ def get_next(next_link=None): return pipeline_response + return ItemPaged(get_next, extract_data) - return ItemPaged( - get_next, extract_data - ) - list_by_container_app.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols"} # type: ignore + list_by_container_app.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols"} # type: ignore @distributed_trace def get( - self, - resource_group_name: str, - container_app_name: str, - source_control_name: str, - **kwargs: Any - ) -> "_models.SourceControl": + self, resource_group_name: str, container_app_name: str, source_control_name: str, **kwargs: Any + ) -> _models.SourceControl: """Get a SourceControl of a Container App. Get a SourceControl of a Container App. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param source_control_name: Name of the Container App SourceControl. + :param source_control_name: Name of the Container App SourceControl. Required. :type source_control_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: SourceControl, or the result of cls(response) + :return: SourceControl or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.SourceControl - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.SourceControl"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.SourceControl] - request = build_get_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, container_app_name=container_app_name, source_control_name=source_control_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get.metadata['url'], + template_url=self.get.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -348,94 +337,114 @@ def get( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('SourceControl', pipeline_response) + deserialized = self._deserialize("SourceControl", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{sourceControlName}"} # type: ignore - + get.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{sourceControlName}"} # type: ignore def _create_or_update_initial( self, resource_group_name: str, container_app_name: str, source_control_name: str, - source_control_envelope: "_models.SourceControl", + source_control_envelope: Union[_models.SourceControl, IO], **kwargs: Any - ) -> "_models.SourceControl": - cls = kwargs.pop('cls', None) # type: ClsType["_models.SourceControl"] + ) -> _models.SourceControl: error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - _json = self._serialize.body(source_control_envelope, 'SourceControl') + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[_models.SourceControl] - request = build_create_or_update_request_initial( - subscription_id=self._config.subscription_id, + content_type = content_type or "application/json" + _json = None + _content = None + if isinstance(source_control_envelope, (IO, bytes)): + _content = source_control_envelope + else: + _json = self._serialize.body(source_control_envelope, "SourceControl") + + request = build_create_or_update_request( resource_group_name=resource_group_name, container_app_name=container_app_name, source_control_name=source_control_name, + subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, - template_url=self._create_or_update_initial.metadata['url'], + content=_content, + template_url=self._create_or_update_initial.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response - if response.status_code not in [200, 202]: + if response.status_code not in [200, 201]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if response.status_code == 200: - deserialized = self._deserialize('SourceControl', pipeline_response) + deserialized = self._deserialize("SourceControl", pipeline_response) - if response.status_code == 202: - deserialized = self._deserialize('SourceControl', pipeline_response) + if response.status_code == 201: + deserialized = self._deserialize("SourceControl", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{sourceControlName}"} # type: ignore - + _create_or_update_initial.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{sourceControlName}"} # type: ignore - @distributed_trace + @overload def begin_create_or_update( self, resource_group_name: str, container_app_name: str, source_control_name: str, - source_control_envelope: "_models.SourceControl", + source_control_envelope: _models.SourceControl, + *, + content_type: str = "application/json", **kwargs: Any - ) -> LROPoller["_models.SourceControl"]: + ) -> LROPoller[_models.SourceControl]: """Create or update the SourceControl for a Container App. - Description for Create or update the SourceControl for a Container App. + Create or update the SourceControl for a Container App. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param source_control_name: Name of the Container App SourceControl. + :param source_control_name: Name of the Container App SourceControl. Required. :type source_control_name: str :param source_control_envelope: Properties used to create a Container App SourceControl. + Required. :type source_control_envelope: ~azure.mgmt.appcontainers.models.SourceControl + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this @@ -447,113 +456,197 @@ def begin_create_or_update( :return: An instance of LROPoller that returns either SourceControl or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.appcontainers.models.SourceControl] - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - polling = kwargs.pop('polling', True) # type: Union[bool, PollingMethod] - cls = kwargs.pop('cls', None) # type: ClsType["_models.SourceControl"] - lro_delay = kwargs.pop( - 'polling_interval', - self._config.polling_interval - ) - cont_token = kwargs.pop('continuation_token', None) # type: Optional[str] + + @overload + def begin_create_or_update( + self, + resource_group_name: str, + container_app_name: str, + source_control_name: str, + source_control_envelope: IO, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> LROPoller[_models.SourceControl]: + """Create or update the SourceControl for a Container App. + + Create or update the SourceControl for a Container App. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param container_app_name: Name of the Container App. Required. + :type container_app_name: str + :param source_control_name: Name of the Container App SourceControl. Required. + :type source_control_name: str + :param source_control_envelope: Properties used to create a Container App SourceControl. + Required. + :type source_control_envelope: IO + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this + operation to not poll, or pass in your own initialized polling object for a personal polling + strategy. + :paramtype polling: bool or ~azure.core.polling.PollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no + Retry-After header is present. + :return: An instance of LROPoller that returns either SourceControl or the result of + cls(response) + :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.appcontainers.models.SourceControl] + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @distributed_trace + def begin_create_or_update( + self, + resource_group_name: str, + container_app_name: str, + source_control_name: str, + source_control_envelope: Union[_models.SourceControl, IO], + **kwargs: Any + ) -> LROPoller[_models.SourceControl]: + """Create or update the SourceControl for a Container App. + + Create or update the SourceControl for a Container App. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param container_app_name: Name of the Container App. Required. + :type container_app_name: str + :param source_control_name: Name of the Container App SourceControl. Required. + :type source_control_name: str + :param source_control_envelope: Properties used to create a Container App SourceControl. Is + either a model type or a IO type. Required. + :type source_control_envelope: ~azure.mgmt.appcontainers.models.SourceControl or IO + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this + operation to not poll, or pass in your own initialized polling object for a personal polling + strategy. + :paramtype polling: bool or ~azure.core.polling.PollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no + Retry-After header is present. + :return: An instance of LROPoller that returns either SourceControl or the result of + cls(response) + :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.appcontainers.models.SourceControl] + :raises ~azure.core.exceptions.HttpResponseError: + """ + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[_models.SourceControl] + polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] + lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) + cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] if cont_token is None: - raw_result = self._create_or_update_initial( + raw_result = self._create_or_update_initial( # type: ignore resource_group_name=resource_group_name, container_app_name=container_app_name, source_control_name=source_control_name, source_control_envelope=source_control_envelope, api_version=api_version, content_type=content_type, - cls=lambda x,y,z: x, + cls=lambda x, y, z: x, + headers=_headers, + params=_params, **kwargs ) - kwargs.pop('error_map', None) + kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response - deserialized = self._deserialize('SourceControl', pipeline_response) + deserialized = self._deserialize("SourceControl", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - - if polling is True: polling_method = ARMPolling(lro_delay, **kwargs) - elif polling is False: polling_method = NoPolling() - else: polling_method = polling + if polling is True: + polling_method = cast(PollingMethod, ARMPolling(lro_delay, **kwargs)) # type: PollingMethod + elif polling is False: + polling_method = cast(PollingMethod, NoPolling()) + else: + polling_method = polling if cont_token: return LROPoller.from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, - deserialization_callback=get_long_running_output + deserialization_callback=get_long_running_output, ) return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{sourceControlName}"} # type: ignore + begin_create_or_update.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{sourceControlName}"} # type: ignore def _delete_initial( # pylint: disable=inconsistent-return-statements - self, - resource_group_name: str, - container_app_name: str, - source_control_name: str, - **kwargs: Any + self, resource_group_name: str, container_app_name: str, source_control_name: str, **kwargs: Any ) -> None: - cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - - request = build_delete_request_initial( - subscription_id=self._config.subscription_id, + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] + + request = build_delete_request( resource_group_name=resource_group_name, container_app_name=container_app_name, source_control_name=source_control_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self._delete_initial.metadata['url'], + template_url=self._delete_initial.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200, 202, 204]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: return cls(pipeline_response, None, {}) - _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{sourceControlName}"} # type: ignore - + _delete_initial.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{sourceControlName}"} # type: ignore @distributed_trace - def begin_delete( # pylint: disable=inconsistent-return-statements - self, - resource_group_name: str, - container_app_name: str, - source_control_name: str, - **kwargs: Any + def begin_delete( + self, resource_group_name: str, container_app_name: str, source_control_name: str, **kwargs: Any ) -> LROPoller[None]: """Delete a Container App SourceControl. - Description for Delete a Container App SourceControl. + Delete a Container App SourceControl. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param container_app_name: Name of the Container App. + :param container_app_name: Name of the Container App. Required. :type container_app_name: str - :param source_control_name: Name of the Container App SourceControl. + :param source_control_name: Name of the Container App SourceControl. Required. :type source_control_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. @@ -565,42 +658,46 @@ def begin_delete( # pylint: disable=inconsistent-return-statements Retry-After header is present. :return: An instance of LROPoller that returns either None or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[None] - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - polling = kwargs.pop('polling', True) # type: Union[bool, PollingMethod] - cls = kwargs.pop('cls', None) # type: ClsType[None] - lro_delay = kwargs.pop( - 'polling_interval', - self._config.polling_interval - ) - cont_token = kwargs.pop('continuation_token', None) # type: Optional[str] + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] + polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] + lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) + cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] if cont_token is None: - raw_result = self._delete_initial( + raw_result = self._delete_initial( # type: ignore resource_group_name=resource_group_name, container_app_name=container_app_name, source_control_name=source_control_name, api_version=api_version, - cls=lambda x,y,z: x, + cls=lambda x, y, z: x, + headers=_headers, + params=_params, **kwargs ) - kwargs.pop('error_map', None) + kwargs.pop("error_map", None) - def get_long_running_output(pipeline_response): + def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, {}) - - if polling is True: polling_method = ARMPolling(lro_delay, **kwargs) - elif polling is False: polling_method = NoPolling() - else: polling_method = polling + if polling is True: + polling_method = cast(PollingMethod, ARMPolling(lro_delay, **kwargs)) # type: PollingMethod + elif polling is False: + polling_method = cast(PollingMethod, NoPolling()) + else: + polling_method = polling if cont_token: return LROPoller.from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, - deserialization_callback=get_long_running_output + deserialization_callback=get_long_running_output, ) return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{sourceControlName}"} # type: ignore + begin_delete.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/sourcecontrols/{sourceControlName}"} # type: ignore diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_dapr_components_operations.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_dapr_components_operations.py index 3e466039fbfb..22e0fa86c0c7 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_dapr_components_operations.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_dapr_components_operations.py @@ -6,296 +6,280 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, Callable, Dict, Iterable, Optional, TypeVar - -from msrest import Serializer - -from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload +from urllib.parse import parse_qs, urljoin, urlparse + +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) from azure.core.paging import ItemPaged from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import HttpResponse from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace +from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from .. import models as _models +from .._serialization import Serializer from .._vendor import _convert_request, _format_url_section -T = TypeVar('T') -JSONType = Any + +T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False + def build_list_request( - subscription_id: str, - resource_group_name: str, - environment_name: str, - **kwargs: Any + resource_group_name: str, environment_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "environmentName": _SERIALIZER.url("environment_name", environment_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="GET", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) def build_get_request( - subscription_id: str, - resource_group_name: str, - environment_name: str, - component_name: str, - **kwargs: Any + resource_group_name: str, environment_name: str, component_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str'), - "componentName": _SERIALIZER.url("component_name", component_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "environmentName": _SERIALIZER.url("environment_name", environment_name, "str"), + "componentName": _SERIALIZER.url("component_name", component_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="GET", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) def build_create_or_update_request( - subscription_id: str, - resource_group_name: str, - environment_name: str, - component_name: str, - *, - json: JSONType = None, - content: Any = None, - **kwargs: Any + resource_group_name: str, environment_name: str, component_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', None) # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str'), - "componentName": _SERIALIZER.url("component_name", component_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "environmentName": _SERIALIZER.url("environment_name", environment_name, "str"), + "componentName": _SERIALIZER.url("component_name", component_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] if content_type is not None: - _header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="PUT", - url=_url, - params=_query_parameters, - headers=_header_parameters, - json=json, - content=content, - **kwargs - ) + return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs) def build_delete_request( - subscription_id: str, - resource_group_name: str, - environment_name: str, - component_name: str, - **kwargs: Any + resource_group_name: str, environment_name: str, component_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str'), - "componentName": _SERIALIZER.url("component_name", component_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "environmentName": _SERIALIZER.url("environment_name", environment_name, "str"), + "componentName": _SERIALIZER.url("component_name", component_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="DELETE", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) + return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs) def build_list_secrets_request( - subscription_id: str, - resource_group_name: str, - environment_name: str, - component_name: str, - **kwargs: Any + resource_group_name: str, environment_name: str, component_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}/listSecrets") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}/listSecrets", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str'), - "componentName": _SERIALIZER.url("component_name", component_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "environmentName": _SERIALIZER.url("environment_name", environment_name, "str"), + "componentName": _SERIALIZER.url("component_name", component_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="POST", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) - -class DaprComponentsOperations(object): - """DaprComponentsOperations operations. - - You should not instantiate this class directly. Instead, you should create a Client instance that - instantiates it for you and attaches it as an attribute. - - :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.appcontainers.models - :param client: Client for service requests. - :param config: Configuration of service client. - :param serializer: An object model serializer. - :param deserializer: An object model deserializer. + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs) + + +class DaprComponentsOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. + + Instead, you should access the following operations through + :class:`~azure.mgmt.appcontainers.ContainerAppsAPIClient`'s + :attr:`dapr_components` attribute. """ models = _models - def __init__(self, client, config, serializer, deserializer): - self._client = client - self._serialize = serializer - self._deserialize = deserializer - self._config = config + def __init__(self, *args, **kwargs): + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def list( - self, - resource_group_name: str, - environment_name: str, - **kwargs: Any - ) -> Iterable["_models.DaprComponentsCollection"]: + def list(self, resource_group_name: str, environment_name: str, **kwargs: Any) -> Iterable["_models.DaprComponent"]: """Get the Dapr Components for a managed environment. Get the Dapr Components for a managed environment. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Managed Environment. + :param environment_name: Name of the Managed Environment. Required. :type environment_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of either DaprComponentsCollection or the result of - cls(response) - :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.appcontainers.models.DaprComponentsCollection] - :raises: ~azure.core.exceptions.HttpResponseError + :return: An iterator like instance of either DaprComponent or the result of cls(response) + :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.appcontainers.models.DaprComponent] + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.DaprComponentsCollection] - cls = kwargs.pop('cls', None) # type: ClsType["_models.DaprComponentsCollection"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + def prepare_request(next_link=None): if not next_link: - + request = build_list_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list.metadata['url'], + template_url=self.list.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore else: - - request = build_list_request( - subscription_id=self._config.subscription_id, - resource_group_name=resource_group_name, - environment_name=environment_name, - api_version=api_version, - template_url=next_link, - ) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore request.method = "GET" return request @@ -309,10 +293,8 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) response = pipeline_response.http_response @@ -323,60 +305,61 @@ def get_next(next_link=None): return pipeline_response + return ItemPaged(get_next, extract_data) - return ItemPaged( - get_next, extract_data - ) - list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents"} # type: ignore + list.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents"} # type: ignore @distributed_trace def get( - self, - resource_group_name: str, - environment_name: str, - component_name: str, - **kwargs: Any - ) -> "_models.DaprComponent": + self, resource_group_name: str, environment_name: str, component_name: str, **kwargs: Any + ) -> _models.DaprComponent: """Get a dapr component. Get a dapr component. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Managed Environment. + :param environment_name: Name of the Managed Environment. Required. :type environment_name: str - :param component_name: Name of the Dapr Component. + :param component_name: Name of the Dapr Component. Required. :type component_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: DaprComponent, or the result of cls(response) + :return: DaprComponent or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.DaprComponent - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.DaprComponent"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.DaprComponent] - request = build_get_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, component_name=component_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get.metadata['url'], + template_url=self.get.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -384,15 +367,80 @@ def get( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('DaprComponent', pipeline_response) + deserialized = self._deserialize("DaprComponent", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}"} # type: ignore + get.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}"} # type: ignore + @overload + def create_or_update( + self, + resource_group_name: str, + environment_name: str, + component_name: str, + dapr_component_envelope: _models.DaprComponent, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> _models.DaprComponent: + """Creates or updates a Dapr Component. + + Creates or updates a Dapr Component in a Managed Environment. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Managed Environment. Required. + :type environment_name: str + :param component_name: Name of the Dapr Component. Required. + :type component_name: str + :param dapr_component_envelope: Configuration details of the Dapr Component. Required. + :type dapr_component_envelope: ~azure.mgmt.appcontainers.models.DaprComponent + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: DaprComponent or the result of cls(response) + :rtype: ~azure.mgmt.appcontainers.models.DaprComponent + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + def create_or_update( + self, + resource_group_name: str, + environment_name: str, + component_name: str, + dapr_component_envelope: IO, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> _models.DaprComponent: + """Creates or updates a Dapr Component. + + Creates or updates a Dapr Component in a Managed Environment. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Managed Environment. Required. + :type environment_name: str + :param component_name: Name of the Dapr Component. Required. + :type component_name: str + :param dapr_component_envelope: Configuration details of the Dapr Component. Required. + :type dapr_component_envelope: IO + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: DaprComponent or the result of cls(response) + :rtype: ~azure.mgmt.appcontainers.models.DaprComponent + :raises ~azure.core.exceptions.HttpResponseError: + """ @distributed_trace def create_or_update( @@ -400,55 +448,74 @@ def create_or_update( resource_group_name: str, environment_name: str, component_name: str, - dapr_component_envelope: "_models.DaprComponent", + dapr_component_envelope: Union[_models.DaprComponent, IO], **kwargs: Any - ) -> "_models.DaprComponent": + ) -> _models.DaprComponent: """Creates or updates a Dapr Component. Creates or updates a Dapr Component in a Managed Environment. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Managed Environment. + :param environment_name: Name of the Managed Environment. Required. :type environment_name: str - :param component_name: Name of the Dapr Component. + :param component_name: Name of the Dapr Component. Required. :type component_name: str - :param dapr_component_envelope: Configuration details of the Dapr Component. - :type dapr_component_envelope: ~azure.mgmt.appcontainers.models.DaprComponent + :param dapr_component_envelope: Configuration details of the Dapr Component. Is either a model + type or a IO type. Required. + :type dapr_component_envelope: ~azure.mgmt.appcontainers.models.DaprComponent or IO + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: DaprComponent, or the result of cls(response) + :return: DaprComponent or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.DaprComponent - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.DaprComponent"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - _json = self._serialize.body(dapr_component_envelope, 'DaprComponent') + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[_models.DaprComponent] + + content_type = content_type or "application/json" + _json = None + _content = None + if isinstance(dapr_component_envelope, (IO, bytes)): + _content = dapr_component_envelope + else: + _json = self._serialize.body(dapr_component_envelope, "DaprComponent") request = build_create_or_update_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, component_name=component_name, + subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, - template_url=self.create_or_update.metadata['url'], + content=_content, + template_url=self.create_or_update.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -456,64 +523,66 @@ def create_or_update( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('DaprComponent', pipeline_response) + deserialized = self._deserialize("DaprComponent", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}"} # type: ignore - + create_or_update.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}"} # type: ignore @distributed_trace def delete( # pylint: disable=inconsistent-return-statements - self, - resource_group_name: str, - environment_name: str, - component_name: str, - **kwargs: Any + self, resource_group_name: str, environment_name: str, component_name: str, **kwargs: Any ) -> None: """Delete a Dapr Component. Delete a Dapr Component from a Managed Environment. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Managed Environment. + :param environment_name: Name of the Managed Environment. Required. :type environment_name: str - :param component_name: Name of the Dapr Component. + :param component_name: Name of the Dapr Component. Required. :type component_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: None, or the result of cls(response) + :return: None or the result of cls(response) :rtype: None - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] - request = build_delete_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, component_name=component_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.delete.metadata['url'], + template_url=self.delete.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200, 204]: @@ -524,57 +593,59 @@ def delete( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, {}) - delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}"} # type: ignore - + delete.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}"} # type: ignore @distributed_trace def list_secrets( - self, - resource_group_name: str, - environment_name: str, - component_name: str, - **kwargs: Any - ) -> "_models.DaprSecretsCollection": + self, resource_group_name: str, environment_name: str, component_name: str, **kwargs: Any + ) -> _models.DaprSecretsCollection: """List secrets for a dapr component. List secrets for a dapr component. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Managed Environment. + :param environment_name: Name of the Managed Environment. Required. :type environment_name: str - :param component_name: Name of the Dapr Component. + :param component_name: Name of the Dapr Component. Required. :type component_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: DaprSecretsCollection, or the result of cls(response) + :return: DaprSecretsCollection or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.DaprSecretsCollection - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.DaprSecretsCollection"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.DaprSecretsCollection] - request = build_list_secrets_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, component_name=component_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_secrets.metadata['url'], + template_url=self.list_secrets.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -582,12 +653,11 @@ def list_secrets( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('DaprSecretsCollection', pipeline_response) + deserialized = self._deserialize("DaprSecretsCollection", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - list_secrets.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}/listSecrets"} # type: ignore - + list_secrets.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}/listSecrets"} # type: ignore diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_managed_environments_operations.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_managed_environments_operations.py index ff89f77a6929..23c5597aa4a5 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_managed_environments_operations.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_managed_environments_operations.py @@ -6,319 +6,295 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, Callable, Dict, Iterable, Optional, TypeVar, Union - -from msrest import Serializer - -from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, cast, overload +from urllib.parse import parse_qs, urljoin, urlparse + +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) from azure.core.paging import ItemPaged from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import HttpResponse from azure.core.polling import LROPoller, NoPolling, PollingMethod from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace +from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from azure.mgmt.core.polling.arm_polling import ARMPolling from .. import models as _models +from .._serialization import Serializer from .._vendor import _convert_request, _format_url_section -T = TypeVar('T') -JSONType = Any + +T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False -def build_list_by_subscription_request( - subscription_id: str, - **kwargs: Any -) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - accept = "application/json" +def build_list_by_subscription_request(subscription_id: str, **kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") + # Construct URL _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/providers/Microsoft.App/managedEnvironments") path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="GET", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) - - -def build_list_by_resource_group_request( - subscription_id: str, - resource_group_name: str, - **kwargs: Any -) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) + + +def build_list_by_resource_group_request(resource_group_name: str, subscription_id: str, **kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="GET", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) def build_get_request( - subscription_id: str, - resource_group_name: str, - environment_name: str, - **kwargs: Any + resource_group_name: str, environment_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "environmentName": _SERIALIZER.url("environment_name", environment_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="GET", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) - - -def build_create_or_update_request_initial( - subscription_id: str, - resource_group_name: str, - environment_name: str, - *, - json: JSONType = None, - content: Any = None, - **kwargs: Any + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) + + +def build_create_or_update_request( + resource_group_name: str, environment_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', None) # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "environmentName": _SERIALIZER.url("environment_name", environment_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] if content_type is not None: - _header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="PUT", - url=_url, - params=_query_parameters, - headers=_header_parameters, - json=json, - content=content, - **kwargs - ) - - -def build_delete_request_initial( - subscription_id: str, - resource_group_name: str, - environment_name: str, - **kwargs: Any + _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs) + + +def build_delete_request( + resource_group_name: str, environment_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "environmentName": _SERIALIZER.url("environment_name", environment_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="DELETE", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) - - -def build_update_request_initial( - subscription_id: str, - resource_group_name: str, - environment_name: str, - *, - json: JSONType = None, - content: Any = None, - **kwargs: Any + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs) + + +def build_update_request( + resource_group_name: str, environment_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', None) # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "environmentName": _SERIALIZER.url("environment_name", environment_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] if content_type is not None: - _header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="PATCH", - url=_url, - params=_query_parameters, - headers=_header_parameters, - json=json, - content=content, - **kwargs - ) - -class ManagedEnvironmentsOperations(object): - """ManagedEnvironmentsOperations operations. - - You should not instantiate this class directly. Instead, you should create a Client instance that - instantiates it for you and attaches it as an attribute. - - :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.appcontainers.models - :param client: Client for service requests. - :param config: Configuration of service client. - :param serializer: An object model serializer. - :param deserializer: An object model deserializer. + _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="PATCH", url=_url, params=_params, headers=_headers, **kwargs) + + +class ManagedEnvironmentsOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. + + Instead, you should access the following operations through + :class:`~azure.mgmt.appcontainers.ContainerAppsAPIClient`'s + :attr:`managed_environments` attribute. """ models = _models - def __init__(self, client, config, serializer, deserializer): - self._client = client - self._serialize = serializer - self._deserialize = deserializer - self._config = config + def __init__(self, *args, **kwargs): + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def list_by_subscription( - self, - **kwargs: Any - ) -> Iterable["_models.ManagedEnvironmentsCollection"]: + def list_by_subscription(self, **kwargs: Any) -> Iterable["_models.ManagedEnvironment"]: """Get all Environments for a subscription. Get all Managed Environments for a subscription. :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of either ManagedEnvironmentsCollection or the result of - cls(response) - :rtype: - ~azure.core.paging.ItemPaged[~azure.mgmt.appcontainers.models.ManagedEnvironmentsCollection] - :raises: ~azure.core.exceptions.HttpResponseError + :return: An iterator like instance of either ManagedEnvironment or the result of cls(response) + :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.appcontainers.models.ManagedEnvironment] + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.ManagedEnvironmentsCollection] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironmentsCollection"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + def prepare_request(next_link=None): if not next_link: - + request = build_list_by_subscription_request( subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_by_subscription.metadata['url'], + template_url=self.list_by_subscription.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore else: - - request = build_list_by_subscription_request( - subscription_id=self._config.subscription_id, - api_version=api_version, - template_url=next_link, - ) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore request.method = "GET" return request @@ -332,10 +308,8 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) response = pipeline_response.http_response @@ -346,60 +320,60 @@ def get_next(next_link=None): return pipeline_response + return ItemPaged(get_next, extract_data) - return ItemPaged( - get_next, extract_data - ) - list_by_subscription.metadata = {'url': "/subscriptions/{subscriptionId}/providers/Microsoft.App/managedEnvironments"} # type: ignore + list_by_subscription.metadata = {"url": "/subscriptions/{subscriptionId}/providers/Microsoft.App/managedEnvironments"} # type: ignore @distributed_trace - def list_by_resource_group( - self, - resource_group_name: str, - **kwargs: Any - ) -> Iterable["_models.ManagedEnvironmentsCollection"]: + def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Iterable["_models.ManagedEnvironment"]: """Get all the Environments in a resource group. Get all the Managed Environments in a resource group. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of either ManagedEnvironmentsCollection or the result of - cls(response) - :rtype: - ~azure.core.paging.ItemPaged[~azure.mgmt.appcontainers.models.ManagedEnvironmentsCollection] - :raises: ~azure.core.exceptions.HttpResponseError + :return: An iterator like instance of either ManagedEnvironment or the result of cls(response) + :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.appcontainers.models.ManagedEnvironment] + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.ManagedEnvironmentsCollection] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironmentsCollection"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + def prepare_request(next_link=None): if not next_link: - + request = build_list_by_resource_group_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list_by_resource_group.metadata['url'], + template_url=self.list_by_resource_group.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore else: - - request = build_list_by_resource_group_request( - subscription_id=self._config.subscription_id, - resource_group_name=resource_group_name, - api_version=api_version, - template_url=next_link, - ) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore request.method = "GET" return request @@ -413,10 +387,8 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) response = pipeline_response.http_response @@ -427,56 +399,56 @@ def get_next(next_link=None): return pipeline_response + return ItemPaged(get_next, extract_data) - return ItemPaged( - get_next, extract_data - ) - list_by_resource_group.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments"} # type: ignore + list_by_resource_group.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments"} # type: ignore @distributed_trace - def get( - self, - resource_group_name: str, - environment_name: str, - **kwargs: Any - ) -> "_models.ManagedEnvironment": + def get(self, resource_group_name: str, environment_name: str, **kwargs: Any) -> _models.ManagedEnvironment: """Get the properties of a Managed Environment. Get the properties of a Managed Environment used to host container apps. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Environment. + :param environment_name: Name of the Environment. Required. :type environment_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: ManagedEnvironment, or the result of cls(response) + :return: ManagedEnvironment or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.ManagedEnvironment - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironment"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.ManagedEnvironment] - request = build_get_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get.metadata['url'], + template_url=self.get.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -484,89 +456,183 @@ def get( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('ManagedEnvironment', pipeline_response) + deserialized = self._deserialize("ManagedEnvironment", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore - + get.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore def _create_or_update_initial( self, resource_group_name: str, environment_name: str, - environment_envelope: "_models.ManagedEnvironment", + environment_envelope: Union[_models.ManagedEnvironment, IO], **kwargs: Any - ) -> "_models.ManagedEnvironment": - cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironment"] + ) -> _models.ManagedEnvironment: error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - _json = self._serialize.body(environment_envelope, 'ManagedEnvironment') + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ManagedEnvironment] - request = build_create_or_update_request_initial( - subscription_id=self._config.subscription_id, + content_type = content_type or "application/json" + _json = None + _content = None + if isinstance(environment_envelope, (IO, bytes)): + _content = environment_envelope + else: + _json = self._serialize.body(environment_envelope, "ManagedEnvironment") + + request = build_create_or_update_request( resource_group_name=resource_group_name, environment_name=environment_name, + subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, - template_url=self._create_or_update_initial.metadata['url'], + content=_content, + template_url=self._create_or_update_initial.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200, 201]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if response.status_code == 200: - deserialized = self._deserialize('ManagedEnvironment', pipeline_response) + deserialized = self._deserialize("ManagedEnvironment", pipeline_response) if response.status_code == 201: - deserialized = self._deserialize('ManagedEnvironment', pipeline_response) + deserialized = self._deserialize("ManagedEnvironment", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - _create_or_update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore + _create_or_update_initial.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore + @overload + def begin_create_or_update( + self, + resource_group_name: str, + environment_name: str, + environment_envelope: _models.ManagedEnvironment, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> LROPoller[_models.ManagedEnvironment]: + """Creates or updates a Managed Environment. + + Creates or updates a Managed Environment used to host container apps. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Environment. Required. + :type environment_name: str + :param environment_envelope: Configuration details of the Environment. Required. + :type environment_envelope: ~azure.mgmt.appcontainers.models.ManagedEnvironment + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this + operation to not poll, or pass in your own initialized polling object for a personal polling + strategy. + :paramtype polling: bool or ~azure.core.polling.PollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no + Retry-After header is present. + :return: An instance of LROPoller that returns either ManagedEnvironment or the result of + cls(response) + :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.appcontainers.models.ManagedEnvironment] + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + def begin_create_or_update( + self, + resource_group_name: str, + environment_name: str, + environment_envelope: IO, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> LROPoller[_models.ManagedEnvironment]: + """Creates or updates a Managed Environment. + + Creates or updates a Managed Environment used to host container apps. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Environment. Required. + :type environment_name: str + :param environment_envelope: Configuration details of the Environment. Required. + :type environment_envelope: IO + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this + operation to not poll, or pass in your own initialized polling object for a personal polling + strategy. + :paramtype polling: bool or ~azure.core.polling.PollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no + Retry-After header is present. + :return: An instance of LROPoller that returns either ManagedEnvironment or the result of + cls(response) + :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.appcontainers.models.ManagedEnvironment] + :raises ~azure.core.exceptions.HttpResponseError: + """ @distributed_trace def begin_create_or_update( self, resource_group_name: str, environment_name: str, - environment_envelope: "_models.ManagedEnvironment", + environment_envelope: Union[_models.ManagedEnvironment, IO], **kwargs: Any - ) -> LROPoller["_models.ManagedEnvironment"]: + ) -> LROPoller[_models.ManagedEnvironment]: """Creates or updates a Managed Environment. Creates or updates a Managed Environment used to host container apps. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Environment. + :param environment_name: Name of the Environment. Required. :type environment_name: str - :param environment_envelope: Configuration details of the Environment. - :type environment_envelope: ~azure.mgmt.appcontainers.models.ManagedEnvironment + :param environment_envelope: Configuration details of the Environment. Is either a model type + or a IO type. Required. + :type environment_envelope: ~azure.mgmt.appcontainers.models.ManagedEnvironment or IO + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this @@ -578,107 +644,109 @@ def begin_create_or_update( :return: An instance of LROPoller that returns either ManagedEnvironment or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[~azure.mgmt.appcontainers.models.ManagedEnvironment] - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - polling = kwargs.pop('polling', True) # type: Union[bool, PollingMethod] - cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironment"] - lro_delay = kwargs.pop( - 'polling_interval', - self._config.polling_interval - ) - cont_token = kwargs.pop('continuation_token', None) # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ManagedEnvironment] + polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] + lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) + cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] if cont_token is None: - raw_result = self._create_or_update_initial( + raw_result = self._create_or_update_initial( # type: ignore resource_group_name=resource_group_name, environment_name=environment_name, environment_envelope=environment_envelope, api_version=api_version, content_type=content_type, - cls=lambda x,y,z: x, + cls=lambda x, y, z: x, + headers=_headers, + params=_params, **kwargs ) - kwargs.pop('error_map', None) + kwargs.pop("error_map", None) def get_long_running_output(pipeline_response): - response = pipeline_response.http_response - deserialized = self._deserialize('ManagedEnvironment', pipeline_response) + deserialized = self._deserialize("ManagedEnvironment", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - - if polling is True: polling_method = ARMPolling(lro_delay, **kwargs) - elif polling is False: polling_method = NoPolling() - else: polling_method = polling + if polling is True: + polling_method = cast(PollingMethod, ARMPolling(lro_delay, **kwargs)) # type: PollingMethod + elif polling is False: + polling_method = cast(PollingMethod, NoPolling()) + else: + polling_method = polling if cont_token: return LROPoller.from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, - deserialization_callback=get_long_running_output + deserialization_callback=get_long_running_output, ) return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore + begin_create_or_update.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore def _delete_initial( # pylint: disable=inconsistent-return-statements - self, - resource_group_name: str, - environment_name: str, - **kwargs: Any + self, resource_group_name: str, environment_name: str, **kwargs: Any ) -> None: - cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - - request = build_delete_request_initial( - subscription_id=self._config.subscription_id, + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] + + request = build_delete_request( resource_group_name=resource_group_name, environment_name=environment_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self._delete_initial.metadata['url'], + template_url=self._delete_initial.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200, 202, 204]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: return cls(pipeline_response, None, {}) - _delete_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore - + _delete_initial.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore @distributed_trace - def begin_delete( # pylint: disable=inconsistent-return-statements - self, - resource_group_name: str, - environment_name: str, - **kwargs: Any - ) -> LROPoller[None]: + def begin_delete(self, resource_group_name: str, environment_name: str, **kwargs: Any) -> LROPoller[None]: """Delete a Managed Environment. Delete a Managed Environment if it does not have any container apps. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Environment. + :param environment_name: Name of the Environment. Required. :type environment_name: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. @@ -690,98 +758,190 @@ def begin_delete( # pylint: disable=inconsistent-return-statements Retry-After header is present. :return: An instance of LROPoller that returns either None or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[None] - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - polling = kwargs.pop('polling', True) # type: Union[bool, PollingMethod] - cls = kwargs.pop('cls', None) # type: ClsType[None] - lro_delay = kwargs.pop( - 'polling_interval', - self._config.polling_interval - ) - cont_token = kwargs.pop('continuation_token', None) # type: Optional[str] + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] + polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] + lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) + cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] if cont_token is None: - raw_result = self._delete_initial( + raw_result = self._delete_initial( # type: ignore resource_group_name=resource_group_name, environment_name=environment_name, api_version=api_version, - cls=lambda x,y,z: x, + cls=lambda x, y, z: x, + headers=_headers, + params=_params, **kwargs ) - kwargs.pop('error_map', None) + kwargs.pop("error_map", None) - def get_long_running_output(pipeline_response): + def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, {}) - - if polling is True: polling_method = ARMPolling(lro_delay, **kwargs) - elif polling is False: polling_method = NoPolling() - else: polling_method = polling + if polling is True: + polling_method = cast(PollingMethod, ARMPolling(lro_delay, **kwargs)) # type: PollingMethod + elif polling is False: + polling_method = cast(PollingMethod, NoPolling()) + else: + polling_method = polling if cont_token: return LROPoller.from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, - deserialization_callback=get_long_running_output + deserialization_callback=get_long_running_output, ) return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore + begin_delete.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore def _update_initial( # pylint: disable=inconsistent-return-statements self, resource_group_name: str, environment_name: str, - environment_envelope: "_models.ManagedEnvironment", + environment_envelope: Union[_models.ManagedEnvironment, IO], **kwargs: Any ) -> None: - cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - _json = self._serialize.body(environment_envelope, 'ManagedEnvironment') + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[None] - request = build_update_request_initial( - subscription_id=self._config.subscription_id, + content_type = content_type or "application/json" + _json = None + _content = None + if isinstance(environment_envelope, (IO, bytes)): + _content = environment_envelope + else: + _json = self._serialize.body(environment_envelope, "ManagedEnvironment") + + request = build_update_request( resource_group_name=resource_group_name, environment_name=environment_name, + subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, - template_url=self._update_initial.metadata['url'], + content=_content, + template_url=self._update_initial.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [202]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: return cls(pipeline_response, None, {}) - _update_initial.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore + _update_initial.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore + @overload + def begin_update( + self, + resource_group_name: str, + environment_name: str, + environment_envelope: _models.ManagedEnvironment, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> LROPoller[None]: + """Update Managed Environment's properties. + + Patches a Managed Environment using JSON Merge Patch. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Environment. Required. + :type environment_name: str + :param environment_envelope: Configuration details of the Environment. Required. + :type environment_envelope: ~azure.mgmt.appcontainers.models.ManagedEnvironment + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this + operation to not poll, or pass in your own initialized polling object for a personal polling + strategy. + :paramtype polling: bool or ~azure.core.polling.PollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no + Retry-After header is present. + :return: An instance of LROPoller that returns either None or the result of cls(response) + :rtype: ~azure.core.polling.LROPoller[None] + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + def begin_update( + self, + resource_group_name: str, + environment_name: str, + environment_envelope: IO, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> LROPoller[None]: + """Update Managed Environment's properties. + + Patches a Managed Environment using JSON Merge Patch. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Environment. Required. + :type environment_name: str + :param environment_envelope: Configuration details of the Environment. Required. + :type environment_envelope: IO + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :keyword str continuation_token: A continuation token to restart a poller from a saved state. + :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this + operation to not poll, or pass in your own initialized polling object for a personal polling + strategy. + :paramtype polling: bool or ~azure.core.polling.PollingMethod + :keyword int polling_interval: Default waiting time between two polls for LRO operations if no + Retry-After header is present. + :return: An instance of LROPoller that returns either None or the result of cls(response) + :rtype: ~azure.core.polling.LROPoller[None] + :raises ~azure.core.exceptions.HttpResponseError: + """ @distributed_trace - def begin_update( # pylint: disable=inconsistent-return-statements + def begin_update( self, resource_group_name: str, environment_name: str, - environment_envelope: "_models.ManagedEnvironment", + environment_envelope: Union[_models.ManagedEnvironment, IO], **kwargs: Any ) -> LROPoller[None]: """Update Managed Environment's properties. @@ -789,11 +949,16 @@ def begin_update( # pylint: disable=inconsistent-return-statements Patches a Managed Environment using JSON Merge Patch. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Environment. + :param environment_name: Name of the Environment. Required. :type environment_name: str - :param environment_envelope: Configuration details of the Environment. - :type environment_envelope: ~azure.mgmt.appcontainers.models.ManagedEnvironment + :param environment_envelope: Configuration details of the Environment. Is either a model type + or a IO type. Required. + :type environment_envelope: ~azure.mgmt.appcontainers.models.ManagedEnvironment or IO + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :keyword callable cls: A custom type or function that will be passed the direct response :keyword str continuation_token: A continuation token to restart a poller from a saved state. :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this @@ -804,44 +969,48 @@ def begin_update( # pylint: disable=inconsistent-return-statements Retry-After header is present. :return: An instance of LROPoller that returns either None or the result of cls(response) :rtype: ~azure.core.polling.LROPoller[None] - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] - polling = kwargs.pop('polling', True) # type: Union[bool, PollingMethod] - cls = kwargs.pop('cls', None) # type: ClsType[None] - lro_delay = kwargs.pop( - 'polling_interval', - self._config.polling_interval - ) - cont_token = kwargs.pop('continuation_token', None) # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[None] + polling = kwargs.pop("polling", True) # type: Union[bool, PollingMethod] + lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) + cont_token = kwargs.pop("continuation_token", None) # type: Optional[str] if cont_token is None: - raw_result = self._update_initial( + raw_result = self._update_initial( # type: ignore resource_group_name=resource_group_name, environment_name=environment_name, environment_envelope=environment_envelope, api_version=api_version, content_type=content_type, - cls=lambda x,y,z: x, + cls=lambda x, y, z: x, + headers=_headers, + params=_params, **kwargs ) - kwargs.pop('error_map', None) + kwargs.pop("error_map", None) - def get_long_running_output(pipeline_response): + def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, {}) - - if polling is True: polling_method = ARMPolling(lro_delay, **kwargs) - elif polling is False: polling_method = NoPolling() - else: polling_method = polling + if polling is True: + polling_method = cast(PollingMethod, ARMPolling(lro_delay, **kwargs)) # type: PollingMethod + elif polling is False: + polling_method = cast(PollingMethod, NoPolling()) + else: + polling_method = polling if cont_token: return LROPoller.from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, - deserialization_callback=get_long_running_output + deserialization_callback=get_long_running_output, ) return LROPoller(self._client, raw_result, get_long_running_output, polling_method) - begin_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore + begin_update.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}"} # type: ignore diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_managed_environments_storages_operations.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_managed_environments_storages_operations.py index 89642445aa0b..5f1fbe2031ee 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_managed_environments_storages_operations.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_managed_environments_storages_operations.py @@ -6,249 +6,239 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, Callable, Dict, Optional, TypeVar - -from msrest import Serializer - -from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload + +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import HttpResponse from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace +from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from .. import models as _models +from .._serialization import Serializer from .._vendor import _convert_request, _format_url_section -T = TypeVar('T') -JSONType = Any + +T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False + def build_list_request( - subscription_id: str, - resource_group_name: str, - environment_name: str, - **kwargs: Any + resource_group_name: str, environment_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/storages") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/storages", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "environmentName": _SERIALIZER.url("environment_name", environment_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="GET", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) def build_get_request( - subscription_id: str, - resource_group_name: str, - environment_name: str, - storage_name: str, - **kwargs: Any + resource_group_name: str, environment_name: str, storage_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/storages/{storageName}") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/storages/{storageName}", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str'), - "storageName": _SERIALIZER.url("storage_name", storage_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "environmentName": _SERIALIZER.url("environment_name", environment_name, "str"), + "storageName": _SERIALIZER.url("storage_name", storage_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="GET", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) def build_create_or_update_request( - subscription_id: str, - resource_group_name: str, - environment_name: str, - storage_name: str, - *, - json: JSONType = None, - content: Any = None, - **kwargs: Any + resource_group_name: str, environment_name: str, storage_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', None) # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/storages/{storageName}") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/storages/{storageName}", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str'), - "storageName": _SERIALIZER.url("storage_name", storage_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "environmentName": _SERIALIZER.url("environment_name", environment_name, "str"), + "storageName": _SERIALIZER.url("storage_name", storage_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] if content_type is not None: - _header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') + _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - return HttpRequest( - method="PUT", - url=_url, - params=_query_parameters, - headers=_header_parameters, - json=json, - content=content, - **kwargs - ) + return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs) def build_delete_request( - subscription_id: str, - resource_group_name: str, - environment_name: str, - storage_name: str, - **kwargs: Any + resource_group_name: str, environment_name: str, storage_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/storages/{storageName}") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/storages/{storageName}", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str'), - "storageName": _SERIALIZER.url("storage_name", storage_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "environmentName": _SERIALIZER.url("environment_name", environment_name, "str"), + "storageName": _SERIALIZER.url("storage_name", storage_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="DELETE", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) - -class ManagedEnvironmentsStoragesOperations(object): - """ManagedEnvironmentsStoragesOperations operations. - - You should not instantiate this class directly. Instead, you should create a Client instance that - instantiates it for you and attaches it as an attribute. - - :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.appcontainers.models - :param client: Client for service requests. - :param config: Configuration of service client. - :param serializer: An object model serializer. - :param deserializer: An object model deserializer. + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="DELETE", url=_url, params=_params, headers=_headers, **kwargs) + + +class ManagedEnvironmentsStoragesOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. + + Instead, you should access the following operations through + :class:`~azure.mgmt.appcontainers.ContainerAppsAPIClient`'s + :attr:`managed_environments_storages` attribute. """ models = _models - def __init__(self, client, config, serializer, deserializer): - self._client = client - self._serialize = serializer - self._deserialize = deserializer - self._config = config + def __init__(self, *args, **kwargs): + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace def list( - self, - resource_group_name: str, - environment_name: str, - **kwargs: Any - ) -> "_models.ManagedEnvironmentStoragesCollection": + self, resource_group_name: str, environment_name: str, **kwargs: Any + ) -> _models.ManagedEnvironmentStoragesCollection: """Get all storages for a managedEnvironment. Get all storages for a managedEnvironment. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Environment. + :param environment_name: Name of the Environment. Required. :type environment_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: ManagedEnvironmentStoragesCollection, or the result of cls(response) + :return: ManagedEnvironmentStoragesCollection or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.ManagedEnvironmentStoragesCollection - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironmentStoragesCollection"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.ManagedEnvironmentStoragesCollection] - request = build_list_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.list.metadata['url'], + template_url=self.list.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -256,64 +246,66 @@ def list( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('ManagedEnvironmentStoragesCollection', pipeline_response) + deserialized = self._deserialize("ManagedEnvironmentStoragesCollection", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - list.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/storages"} # type: ignore - + list.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/storages"} # type: ignore @distributed_trace def get( - self, - resource_group_name: str, - environment_name: str, - storage_name: str, - **kwargs: Any - ) -> "_models.ManagedEnvironmentStorage": + self, resource_group_name: str, environment_name: str, storage_name: str, **kwargs: Any + ) -> _models.ManagedEnvironmentStorage: """Get storage for a managedEnvironment. Get storage for a managedEnvironment. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Environment. + :param environment_name: Name of the Environment. Required. :type environment_name: str - :param storage_name: Name of the storage. + :param storage_name: Name of the storage. Required. :type storage_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: ManagedEnvironmentStorage, or the result of cls(response) + :return: ManagedEnvironmentStorage or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.ManagedEnvironmentStorage - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironmentStorage"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.ManagedEnvironmentStorage] - request = build_get_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, storage_name=storage_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.get.metadata['url'], + template_url=self.get.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -321,15 +313,80 @@ def get( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('ManagedEnvironmentStorage', pipeline_response) + deserialized = self._deserialize("ManagedEnvironmentStorage", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - get.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/storages/{storageName}"} # type: ignore + get.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/storages/{storageName}"} # type: ignore + @overload + def create_or_update( + self, + resource_group_name: str, + environment_name: str, + storage_name: str, + storage_envelope: _models.ManagedEnvironmentStorage, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> _models.ManagedEnvironmentStorage: + """Create or update storage for a managedEnvironment. + + Create or update storage for a managedEnvironment. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Environment. Required. + :type environment_name: str + :param storage_name: Name of the storage. Required. + :type storage_name: str + :param storage_envelope: Configuration details of storage. Required. + :type storage_envelope: ~azure.mgmt.appcontainers.models.ManagedEnvironmentStorage + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: ManagedEnvironmentStorage or the result of cls(response) + :rtype: ~azure.mgmt.appcontainers.models.ManagedEnvironmentStorage + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + def create_or_update( + self, + resource_group_name: str, + environment_name: str, + storage_name: str, + storage_envelope: IO, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> _models.ManagedEnvironmentStorage: + """Create or update storage for a managedEnvironment. + + Create or update storage for a managedEnvironment. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Environment. Required. + :type environment_name: str + :param storage_name: Name of the storage. Required. + :type storage_name: str + :param storage_envelope: Configuration details of storage. Required. + :type storage_envelope: IO + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: ManagedEnvironmentStorage or the result of cls(response) + :rtype: ~azure.mgmt.appcontainers.models.ManagedEnvironmentStorage + :raises ~azure.core.exceptions.HttpResponseError: + """ @distributed_trace def create_or_update( @@ -337,55 +394,74 @@ def create_or_update( resource_group_name: str, environment_name: str, storage_name: str, - storage_envelope: "_models.ManagedEnvironmentStorage", + storage_envelope: Union[_models.ManagedEnvironmentStorage, IO], **kwargs: Any - ) -> "_models.ManagedEnvironmentStorage": + ) -> _models.ManagedEnvironmentStorage: """Create or update storage for a managedEnvironment. Create or update storage for a managedEnvironment. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Environment. + :param environment_name: Name of the Environment. Required. :type environment_name: str - :param storage_name: Name of the storage. + :param storage_name: Name of the storage. Required. :type storage_name: str - :param storage_envelope: Configuration details of storage. - :type storage_envelope: ~azure.mgmt.appcontainers.models.ManagedEnvironmentStorage + :param storage_envelope: Configuration details of storage. Is either a model type or a IO type. + Required. + :type storage_envelope: ~azure.mgmt.appcontainers.models.ManagedEnvironmentStorage or IO + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: ManagedEnvironmentStorage, or the result of cls(response) + :return: ManagedEnvironmentStorage or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.ManagedEnvironmentStorage - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.ManagedEnvironmentStorage"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - _json = self._serialize.body(storage_envelope, 'ManagedEnvironmentStorage') + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[_models.ManagedEnvironmentStorage] + + content_type = content_type or "application/json" + _json = None + _content = None + if isinstance(storage_envelope, (IO, bytes)): + _content = storage_envelope + else: + _json = self._serialize.body(storage_envelope, "ManagedEnvironmentStorage") request = build_create_or_update_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, storage_name=storage_name, + subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, - template_url=self.create_or_update.metadata['url'], + content=_content, + template_url=self.create_or_update.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -393,64 +469,66 @@ def create_or_update( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('ManagedEnvironmentStorage', pipeline_response) + deserialized = self._deserialize("ManagedEnvironmentStorage", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - create_or_update.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/storages/{storageName}"} # type: ignore - + create_or_update.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/storages/{storageName}"} # type: ignore @distributed_trace def delete( # pylint: disable=inconsistent-return-statements - self, - resource_group_name: str, - environment_name: str, - storage_name: str, - **kwargs: Any + self, resource_group_name: str, environment_name: str, storage_name: str, **kwargs: Any ) -> None: """Delete storage for a managedEnvironment. Delete storage for a managedEnvironment. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Environment. + :param environment_name: Name of the Environment. Required. :type environment_name: str - :param storage_name: Name of the storage. + :param storage_name: Name of the storage. Required. :type storage_name: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: None, or the result of cls(response) + :return: None or the result of cls(response) :rtype: None - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType[None] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[None] - request = build_delete_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, storage_name=storage_name, + subscription_id=self._config.subscription_id, api_version=api_version, - template_url=self.delete.metadata['url'], + template_url=self.delete.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200, 204]: @@ -461,5 +539,4 @@ def delete( # pylint: disable=inconsistent-return-statements if cls: return cls(pipeline_response, None, {}) - delete.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/storages/{storageName}"} # type: ignore - + delete.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/storages/{storageName}"} # type: ignore diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_namespaces_operations.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_namespaces_operations.py index 59f158efe0d7..2d05ef1b4279 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_namespaces_operations.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_namespaces_operations.py @@ -6,143 +6,221 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, Callable, Dict, Optional, TypeVar - -from msrest import Serializer - -from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload + +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import HttpResponse from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace +from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from .. import models as _models +from .._serialization import Serializer from .._vendor import _convert_request, _format_url_section -T = TypeVar('T') -JSONType = Any + +T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False + def build_check_name_availability_request( - subscription_id: str, - resource_group_name: str, - environment_name: str, - *, - json: JSONType = None, - content: Any = None, - **kwargs: Any + resource_group_name: str, environment_name: str, subscription_id: str, **kwargs: Any ) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', None) # type: Optional[str] + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + accept = _headers.pop("Accept", "application/json") - accept = "application/json" # Construct URL - _url = kwargs.pop("template_url", "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/checkNameAvailability") # pylint: disable=line-too-long + _url = kwargs.pop( + "template_url", + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/checkNameAvailability", + ) # pylint: disable=line-too-long path_format_arguments = { - "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, 'str', min_length=1), - "resourceGroupName": _SERIALIZER.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), - "environmentName": _SERIALIZER.url("environment_name", environment_name, 'str'), + "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str", min_length=1), + "resourceGroupName": _SERIALIZER.url( + "resource_group_name", resource_group_name, "str", max_length=90, min_length=1 + ), + "environmentName": _SERIALIZER.url("environment_name", environment_name, "str"), } _url = _format_url_section(_url, **path_format_arguments) # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] if content_type is not None: - _header_parameters['Content-Type'] = _SERIALIZER.header("content_type", content_type, 'str') - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="POST", - url=_url, - params=_query_parameters, - headers=_header_parameters, - json=json, - content=content, - **kwargs - ) - -class NamespacesOperations(object): - """NamespacesOperations operations. - - You should not instantiate this class directly. Instead, you should create a Client instance that - instantiates it for you and attaches it as an attribute. - - :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.appcontainers.models - :param client: Client for service requests. - :param config: Configuration of service client. - :param serializer: An object model serializer. - :param deserializer: An object model deserializer. + _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs) + + +class NamespacesOperations: + """ + .. warning:: + **DO NOT** instantiate this class directly. + + Instead, you should access the following operations through + :class:`~azure.mgmt.appcontainers.ContainerAppsAPIClient`'s + :attr:`namespaces` attribute. """ models = _models - def __init__(self, client, config, serializer, deserializer): - self._client = client - self._serialize = serializer - self._deserialize = deserializer - self._config = config + def __init__(self, *args, **kwargs): + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") - @distributed_trace + @overload def check_name_availability( self, resource_group_name: str, environment_name: str, - check_name_availability_request: "_models.CheckNameAvailabilityRequest", + check_name_availability_request: _models.CheckNameAvailabilityRequest, + *, + content_type: str = "application/json", **kwargs: Any - ) -> "_models.CheckNameAvailabilityResponse": + ) -> _models.CheckNameAvailabilityResponse: """Checks the resource name availability. Checks if resource name is available. :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. :type resource_group_name: str - :param environment_name: Name of the Managed Environment. + :param environment_name: Name of the Managed Environment. Required. :type environment_name: str - :param check_name_availability_request: The check name availability request. + :param check_name_availability_request: The check name availability request. Required. :type check_name_availability_request: ~azure.mgmt.appcontainers.models.CheckNameAvailabilityRequest + :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. + Default value is "application/json". + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: CheckNameAvailabilityResponse or the result of cls(response) + :rtype: ~azure.mgmt.appcontainers.models.CheckNameAvailabilityResponse + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @overload + def check_name_availability( + self, + resource_group_name: str, + environment_name: str, + check_name_availability_request: IO, + *, + content_type: str = "application/json", + **kwargs: Any + ) -> _models.CheckNameAvailabilityResponse: + """Checks the resource name availability. + + Checks if resource name is available. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Managed Environment. Required. + :type environment_name: str + :param check_name_availability_request: The check name availability request. Required. + :type check_name_availability_request: IO + :keyword content_type: Body Parameter content-type. Content type parameter for binary body. + Default value is "application/json". + :paramtype content_type: str :keyword callable cls: A custom type or function that will be passed the direct response - :return: CheckNameAvailabilityResponse, or the result of cls(response) + :return: CheckNameAvailabilityResponse or the result of cls(response) :rtype: ~azure.mgmt.appcontainers.models.CheckNameAvailabilityResponse - :raises: ~azure.core.exceptions.HttpResponseError + :raises ~azure.core.exceptions.HttpResponseError: + """ + + @distributed_trace + def check_name_availability( + self, + resource_group_name: str, + environment_name: str, + check_name_availability_request: Union[_models.CheckNameAvailabilityRequest, IO], + **kwargs: Any + ) -> _models.CheckNameAvailabilityResponse: + """Checks the resource name availability. + + Checks if resource name is available. + + :param resource_group_name: The name of the resource group. The name is case insensitive. + Required. + :type resource_group_name: str + :param environment_name: Name of the Managed Environment. Required. + :type environment_name: str + :param check_name_availability_request: The check name availability request. Is either a model + type or a IO type. Required. + :type check_name_availability_request: + ~azure.mgmt.appcontainers.models.CheckNameAvailabilityRequest or IO + :keyword content_type: Body Parameter content-type. Known values are: 'application/json'. + Default value is None. + :paramtype content_type: str + :keyword callable cls: A custom type or function that will be passed the direct response + :return: CheckNameAvailabilityResponse or the result of cls(response) + :rtype: ~azure.mgmt.appcontainers.models.CheckNameAvailabilityResponse + :raises ~azure.core.exceptions.HttpResponseError: """ - cls = kwargs.pop('cls', None) # type: ClsType["_models.CheckNameAvailabilityResponse"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - content_type = kwargs.pop('content_type', "application/json") # type: Optional[str] + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + content_type = kwargs.pop("content_type", _headers.pop("Content-Type", None)) # type: Optional[str] + cls = kwargs.pop("cls", None) # type: ClsType[_models.CheckNameAvailabilityResponse] - _json = self._serialize.body(check_name_availability_request, 'CheckNameAvailabilityRequest') + content_type = content_type or "application/json" + _json = None + _content = None + if isinstance(check_name_availability_request, (IO, bytes)): + _content = check_name_availability_request + else: + _json = self._serialize.body(check_name_availability_request, "CheckNameAvailabilityRequest") request = build_check_name_availability_request( - subscription_id=self._config.subscription_id, resource_group_name=resource_group_name, environment_name=environment_name, + subscription_id=self._config.subscription_id, api_version=api_version, content_type=content_type, json=_json, - template_url=self.check_name_availability.metadata['url'], + content=_content, + template_url=self.check_name_availability.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) + response = pipeline_response.http_response if response.status_code not in [200]: @@ -150,12 +228,11 @@ def check_name_availability( error = self._deserialize.failsafe_deserialize(_models.DefaultErrorResponse, pipeline_response) raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) - deserialized = self._deserialize('CheckNameAvailabilityResponse', pipeline_response) + deserialized = self._deserialize("CheckNameAvailabilityResponse", pipeline_response) if cls: return cls(pipeline_response, deserialized, {}) return deserialized - check_name_availability.metadata = {'url': "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/checkNameAvailability"} # type: ignore - + check_name_availability.metadata = {"url": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/checkNameAvailability"} # type: ignore diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_operations.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_operations.py index d134b642c4d1..99409d372172 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_operations.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_operations.py @@ -7,109 +7,116 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from typing import Any, Callable, Dict, Iterable, Optional, TypeVar - -from msrest import Serializer - -from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error +from urllib.parse import parse_qs, urljoin, urlparse + +from azure.core.exceptions import ( + ClientAuthenticationError, + HttpResponseError, + ResourceExistsError, + ResourceNotFoundError, + ResourceNotModifiedError, + map_error, +) from azure.core.paging import ItemPaged from azure.core.pipeline import PipelineResponse from azure.core.pipeline.transport import HttpResponse from azure.core.rest import HttpRequest from azure.core.tracing.decorator import distributed_trace +from azure.core.utils import case_insensitive_dict from azure.mgmt.core.exceptions import ARMErrorFormat from .. import models as _models +from .._serialization import Serializer from .._vendor import _convert_request -T = TypeVar('T') + +T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False -def build_list_request( - **kwargs: Any -) -> HttpRequest: - api_version = kwargs.pop('api_version', "2022-03-01") # type: str - accept = "application/json" +def build_list_request(**kwargs: Any) -> HttpRequest: + _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", "2022-03-01")) # type: str + accept = _headers.pop("Accept", "application/json") + # Construct URL _url = kwargs.pop("template_url", "/providers/Microsoft.App/operations") # Construct parameters - _query_parameters = kwargs.pop("params", {}) # type: Dict[str, Any] - _query_parameters['api-version'] = _SERIALIZER.query("api_version", api_version, 'str') + _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") # Construct headers - _header_parameters = kwargs.pop("headers", {}) # type: Dict[str, Any] - _header_parameters['Accept'] = _SERIALIZER.header("accept", accept, 'str') - - return HttpRequest( - method="GET", - url=_url, - params=_query_parameters, - headers=_header_parameters, - **kwargs - ) - -class Operations(object): - """Operations operations. - - You should not instantiate this class directly. Instead, you should create a Client instance that - instantiates it for you and attaches it as an attribute. - - :ivar models: Alias to model classes used in this operation group. - :type models: ~azure.mgmt.appcontainers.models - :param client: Client for service requests. - :param config: Configuration of service client. - :param serializer: An object model serializer. - :param deserializer: An object model deserializer. + _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") + + return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) + + +class Operations: + """ + .. warning:: + **DO NOT** instantiate this class directly. + + Instead, you should access the following operations through + :class:`~azure.mgmt.appcontainers.ContainerAppsAPIClient`'s + :attr:`operations` attribute. """ models = _models - def __init__(self, client, config, serializer, deserializer): - self._client = client - self._serialize = serializer - self._deserialize = deserializer - self._config = config + def __init__(self, *args, **kwargs): + input_args = list(args) + self._client = input_args.pop(0) if input_args else kwargs.pop("client") + self._config = input_args.pop(0) if input_args else kwargs.pop("config") + self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer") + self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def list( - self, - **kwargs: Any - ) -> Iterable["_models.AvailableOperations"]: + def list(self, **kwargs: Any) -> Iterable["_models.OperationDetail"]: """Lists all of the available RP operations. :keyword callable cls: A custom type or function that will be passed the direct response - :return: An iterator like instance of either AvailableOperations or the result of cls(response) - :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.appcontainers.models.AvailableOperations] - :raises: ~azure.core.exceptions.HttpResponseError + :return: An iterator like instance of either OperationDetail or the result of cls(response) + :rtype: ~azure.core.paging.ItemPaged[~azure.mgmt.appcontainers.models.OperationDetail] + :raises ~azure.core.exceptions.HttpResponseError: """ - api_version = kwargs.pop('api_version', "2022-03-01") # type: str + _headers = kwargs.pop("headers", {}) or {} + _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) + + api_version = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) # type: str + cls = kwargs.pop("cls", None) # type: ClsType[_models.AvailableOperations] - cls = kwargs.pop('cls', None) # type: ClsType["_models.AvailableOperations"] error_map = { - 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError + 401: ClientAuthenticationError, + 404: ResourceNotFoundError, + 409: ResourceExistsError, + 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop('error_map', {})) + error_map.update(kwargs.pop("error_map", {}) or {}) + def prepare_request(next_link=None): if not next_link: - + request = build_list_request( api_version=api_version, - template_url=self.list.metadata['url'], + template_url=self.list.metadata["url"], + headers=_headers, + params=_params, ) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore else: - - request = build_list_request( - api_version=api_version, - template_url=next_link, - ) + # make call to next link with the client's api-version + _parsed_next_link = urlparse(next_link) + _next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query)) + _next_request_params["api-version"] = self._config.api_version + request = HttpRequest("GET", urljoin(next_link, _parsed_next_link.path), params=_next_request_params) request = _convert_request(request) - request.url = self._client.format_url(request.url) + request.url = self._client.format_url(request.url) # type: ignore request.method = "GET" return request @@ -123,10 +130,8 @@ def extract_data(pipeline_response): def get_next(next_link=None): request = prepare_request(next_link) - pipeline_response = self._client._pipeline.run( # pylint: disable=protected-access - request, - stream=False, - **kwargs + pipeline_response = self._client._pipeline.run( # type: ignore # pylint: disable=protected-access + request, stream=False, **kwargs ) response = pipeline_response.http_response @@ -137,8 +142,6 @@ def get_next(next_link=None): return pipeline_response + return ItemPaged(get_next, extract_data) - return ItemPaged( - get_next, extract_data - ) - list.metadata = {'url': "/providers/Microsoft.App/operations"} # type: ignore + list.metadata = {"url": "/providers/Microsoft.App/operations"} # type: ignore diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_patch.py b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_patch.py new file mode 100644 index 000000000000..f7dd32510333 --- /dev/null +++ b/sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/operations/_patch.py @@ -0,0 +1,20 @@ +# ------------------------------------ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT License. +# ------------------------------------ +"""Customize generated code here. + +Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize +""" +from typing import List + +__all__: List[str] = [] # Add all objects you want publicly available to users at this package level + + +def patch_sdk(): + """Do not remove from this file. + + `patch_sdk` is a last resort escape hatch that allows you to do customizations + you can't accomplish using the techniques described in + https://aka.ms/azsdk/python/dpcodegen/python/customize + """ diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/conftest.py b/sdk/appcontainers/azure-mgmt-appcontainers/conftest.py new file mode 100644 index 000000000000..1fbcdaa8baa5 --- /dev/null +++ b/sdk/appcontainers/azure-mgmt-appcontainers/conftest.py @@ -0,0 +1,51 @@ +# -------------------------------------------------------------------------- +# +# Copyright (c) Microsoft Corporation. All rights reserved. +# +# The MIT License (MIT) +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the ""Software""), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. +# +# -------------------------------------------------------------------------- +import os +import platform +import pytest +import sys + +from dotenv import load_dotenv + +from devtools_testutils import test_proxy, add_general_regex_sanitizer +from devtools_testutils import add_header_regex_sanitizer, add_body_key_sanitizer + + +load_dotenv() + +@pytest.fixture(scope="session", autouse=True) +def add_sanitizers(test_proxy): + subscription_id = os.environ.get("AZURE_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000") + tenant_id = os.environ.get("AZURE_TENANT_ID", "00000000-0000-0000-0000-000000000000") + client_id = os.environ.get("AZURE_CLIENT_ID", "00000000-0000-0000-0000-000000000000") + client_secret = os.environ.get("AZURE_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=subscription_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=tenant_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=client_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=client_secret, value="00000000-0000-0000-0000-000000000000") + add_header_regex_sanitizer(key="Set-Cookie", value="[set-cookie;]") + add_header_regex_sanitizer(key="Cookie", value="cookie;") + add_body_key_sanitizer(json_path="$..access_token", value="access_token") diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/setup.py b/sdk/appcontainers/azure-mgmt-appcontainers/setup.py index 80d4786a8c09..9b4eeb61c1ea 100644 --- a/sdk/appcontainers/azure-mgmt-appcontainers/setup.py +++ b/sdk/appcontainers/azure-mgmt-appcontainers/setup.py @@ -51,7 +51,6 @@ 'Programming Language :: Python', 'Programming Language :: Python :: 3 :: Only', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', @@ -70,9 +69,9 @@ 'pytyped': ['py.typed'], }, install_requires=[ - 'msrest>=0.6.21', + 'msrest>=0.7.1', 'azure-common~=1.1', - 'azure-mgmt-core>=1.3.0,<2.0.0', + 'azure-mgmt-core>=1.3.2,<2.0.0', ], - python_requires=">=3.6" + python_requires=">=3.7" ) diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/testcase.py b/sdk/appcontainers/azure-mgmt-appcontainers/testcase.py new file mode 100644 index 000000000000..c63f837dfc8a --- /dev/null +++ b/sdk/appcontainers/azure-mgmt-appcontainers/testcase.py @@ -0,0 +1,23 @@ +# coding: utf-8 + +#------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +#-------------------------------------------------------------------------- + +import +from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy + +AZURE_LOCATION = 'eastus' + +class TestMgmt(AzureMgmtRecordedTestCase): + + def setup_method(self, method): + self.mgmt_client = self.create_mgmt_client( + .) + + def test___list(self): + result = self.mgmt_client..() + assert list(result) is not None + diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/tests/conftest.py b/sdk/appcontainers/azure-mgmt-appcontainers/tests/conftest.py new file mode 100644 index 000000000000..1fbcdaa8baa5 --- /dev/null +++ b/sdk/appcontainers/azure-mgmt-appcontainers/tests/conftest.py @@ -0,0 +1,51 @@ +# -------------------------------------------------------------------------- +# +# Copyright (c) Microsoft Corporation. All rights reserved. +# +# The MIT License (MIT) +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the ""Software""), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. +# +# -------------------------------------------------------------------------- +import os +import platform +import pytest +import sys + +from dotenv import load_dotenv + +from devtools_testutils import test_proxy, add_general_regex_sanitizer +from devtools_testutils import add_header_regex_sanitizer, add_body_key_sanitizer + + +load_dotenv() + +@pytest.fixture(scope="session", autouse=True) +def add_sanitizers(test_proxy): + subscription_id = os.environ.get("AZURE_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000") + tenant_id = os.environ.get("AZURE_TENANT_ID", "00000000-0000-0000-0000-000000000000") + client_id = os.environ.get("AZURE_CLIENT_ID", "00000000-0000-0000-0000-000000000000") + client_secret = os.environ.get("AZURE_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=subscription_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=tenant_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=client_id, value="00000000-0000-0000-0000-000000000000") + add_general_regex_sanitizer(regex=client_secret, value="00000000-0000-0000-0000-000000000000") + add_header_regex_sanitizer(key="Set-Cookie", value="[set-cookie;]") + add_header_regex_sanitizer(key="Cookie", value="cookie;") + add_body_key_sanitizer(json_path="$..access_token", value="access_token") diff --git a/sdk/appcontainers/azure-mgmt-appcontainers/tests/test_mgmt_appcontainers.py b/sdk/appcontainers/azure-mgmt-appcontainers/tests/test_mgmt_appcontainers.py new file mode 100644 index 000000000000..591804531600 --- /dev/null +++ b/sdk/appcontainers/azure-mgmt-appcontainers/tests/test_mgmt_appcontainers.py @@ -0,0 +1,21 @@ +# coding: utf-8 + +# ------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# -------------------------------------------------------------------------- + +import appcontainers +from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer, recorded_by_proxy + +AZURE_LOCATION = "eastus" + + +class TestMgmtappcontainers(AzureMgmtRecordedTestCase): + def setup_method(self, method): + self.mgmt_client = self.create_mgmt_client(appcontainers.ContainerAppsAPIClient) + + def test_appcontainers_ContainerAppsOperations_list(self): + result = self.mgmt_client.ContainerAppsOperations.list_by_subscription() + assert list(result) is not None diff --git a/shared_requirements.txt b/shared_requirements.txt index c55e517be4f9..60e975212fa9 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -386,8 +386,8 @@ opentelemetry-sdk<2.0.0,>=1.5.0,!=1.10a0 #override azure-mgmt-network azure-mgmt-core>=1.3.2,<2.0.0 #override azure-mgmt-redhatopenshift msrest>=0.6.21 #override azure-mgmt-redhatopenshift azure-mgmt-core>=1.3.0,<2.0.0 -#override azure-mgmt-appcontainers msrest>=0.6.21 -#override azure-mgmt-appcontainers azure-mgmt-core>=1.3.0,<2.0.0 +#override azure-mgmt-appcontainers msrest>=0.7.1 +#override azure-mgmt-appcontainers azure-mgmt-core>=1.3.2,<2.0.0 #override azure-mgmt-recoveryservicesbackup azure-mgmt-core>=1.3.2,<2.0.0 #override azure-mgmt-dynatrace msrest>=0.6.21 #override azure-mgmt-dynatrace azure-mgmt-core>=1.3.0,<2.0.0