From 8c134f37e929e8993ad68dd0aded827086438cda Mon Sep 17 00:00:00 2001 From: Qingyi Liu Date: Tue, 7 Jun 2022 17:22:51 +0800 Subject: [PATCH 1/6] [Spring] update the app name used in build to app name and deployment name --- src/spring/azext_spring/_buildservices_factory.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/spring/azext_spring/_buildservices_factory.py b/src/spring/azext_spring/_buildservices_factory.py index 7e62bd50837..1dba36f4120 100644 --- a/src/spring/azext_spring/_buildservices_factory.py +++ b/src/spring/azext_spring/_buildservices_factory.py @@ -58,7 +58,7 @@ def _get_upload_info(self): except AttributeError as e: raise AzureInternalError("Failed to get a SAS URL to upload context. Error: {}".format(e)) - def _queue_build(self, relative_path=None, builder=None, build_env=None, build_cpu=None, build_memory=None, app=None, **_): + def _queue_build(self, relative_path=None, builder=None, build_env=None, build_cpu=None, build_memory=None, app=None, deployment=None, **_): subscription = get_subscription_id(self.cmd.cli_ctx) service_resource_id = '/subscriptions/{}/resourceGroups/{}/providers/Microsoft.AppPlatform/Spring/{}'.format(subscription, self.resource_group, self.service) build_resource_requests = models.BuildResourceRequests( @@ -75,7 +75,7 @@ def _queue_build(self, relative_path=None, builder=None, build_env=None, build_c return self.client.build_service.create_or_update_build(self.resource_group, self.service, self.name, - app, + app+"-"+deployment, build).properties.triggered_build_result.id except (AttributeError, CloudError) as e: raise DeploymentError("Failed to create or update a build. Error: {}".format(e.message)) From 8921c1b5587b32000ed9a05a5e8b5182e0a85f9c Mon Sep 17 00:00:00 2001 From: Qingyi Liu Date: Wed, 8 Jun 2022 09:34:58 +0800 Subject: [PATCH 2/6] fix test --- src/spring/azext_spring/_buildservices_factory.py | 2 +- src/spring/azext_spring/tests/latest/test_asa_app.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/spring/azext_spring/_buildservices_factory.py b/src/spring/azext_spring/_buildservices_factory.py index 1dba36f4120..81ed9c0d34d 100644 --- a/src/spring/azext_spring/_buildservices_factory.py +++ b/src/spring/azext_spring/_buildservices_factory.py @@ -75,7 +75,7 @@ def _queue_build(self, relative_path=None, builder=None, build_env=None, build_c return self.client.build_service.create_or_update_build(self.resource_group, self.service, self.name, - app+"-"+deployment, + app + "-" + deployment, build).properties.triggered_build_result.id except (AttributeError, CloudError) as e: raise DeploymentError("Failed to create or update a build. Error: {}".format(e.message)) diff --git a/src/spring/azext_spring/tests/latest/test_asa_app.py b/src/spring/azext_spring/tests/latest/test_asa_app.py index f270ac75618..1241537beb1 100644 --- a/src/spring/azext_spring/tests/latest/test_asa_app.py +++ b/src/spring/azext_spring/tests/latest/test_asa_app.py @@ -273,7 +273,7 @@ def verify_build_args(self, client, *args): if build_args and build_args[0]: self.assertEqual(1, len(build_args)) self.assertEqual(5, len(build_args[0][0])) - self.assertEqual(args[0:2]+('default',)+(args[2],), build_args[0][0][0:4]) + self.assertEqual(args[0:2]+('default',)+(args[2]+args[3],), build_args[0][0][0:4]) self.put_build_resource = build_args[0][0][4] def _execute(self, *args, **kwargs): From 8cb69dc382fed29519aed43a4f48577b42bc52f0 Mon Sep 17 00:00:00 2001 From: Qingyi Liu Date: Wed, 8 Jun 2022 09:44:15 +0800 Subject: [PATCH 3/6] fix test --- src/spring/azext_spring/_buildservices_factory.py | 2 +- src/spring/azext_spring/tests/latest/test_asa_app.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/spring/azext_spring/_buildservices_factory.py b/src/spring/azext_spring/_buildservices_factory.py index 81ed9c0d34d..c84e7dca670 100644 --- a/src/spring/azext_spring/_buildservices_factory.py +++ b/src/spring/azext_spring/_buildservices_factory.py @@ -75,7 +75,7 @@ def _queue_build(self, relative_path=None, builder=None, build_env=None, build_c return self.client.build_service.create_or_update_build(self.resource_group, self.service, self.name, - app + "-" + deployment, + app + '-' + deployment, build).properties.triggered_build_result.id except (AttributeError, CloudError) as e: raise DeploymentError("Failed to create or update a build. Error: {}".format(e.message)) diff --git a/src/spring/azext_spring/tests/latest/test_asa_app.py b/src/spring/azext_spring/tests/latest/test_asa_app.py index 1241537beb1..2d8d783c8d0 100644 --- a/src/spring/azext_spring/tests/latest/test_asa_app.py +++ b/src/spring/azext_spring/tests/latest/test_asa_app.py @@ -273,7 +273,7 @@ def verify_build_args(self, client, *args): if build_args and build_args[0]: self.assertEqual(1, len(build_args)) self.assertEqual(5, len(build_args[0][0])) - self.assertEqual(args[0:2]+('default',)+(args[2]+args[3],), build_args[0][0][0:4]) + self.assertEqual(args[0:2]+('default',)+(args[2] + '-' + args[3],), build_args[0][0][0:4]) self.put_build_resource = build_args[0][0][4] def _execute(self, *args, **kwargs): From fe06e3c1ddc79a661576d28c740002b65f603319 Mon Sep 17 00:00:00 2001 From: Qingyi Liu Date: Wed, 8 Jun 2022 10:34:23 +0800 Subject: [PATCH 4/6] fix test --- src/spring/azext_spring/tests/latest/test_asa_app.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/spring/azext_spring/tests/latest/test_asa_app.py b/src/spring/azext_spring/tests/latest/test_asa_app.py index 2d8d783c8d0..bcc3c58dcaf 100644 --- a/src/spring/azext_spring/tests/latest/test_asa_app.py +++ b/src/spring/azext_spring/tests/latest/test_asa_app.py @@ -267,20 +267,20 @@ def _get_upload_info(self): resp.upload_url = 'https://mystorage.file.core.windows.net/root/my-relative-path?sv=2018-03-28&sr=f&sig=my-fake-pass&se=2021-12-28T06%3A43%3A17Z&sp=w' return resp - def verify_build_args(self, client, *args): + def verify_build_args(self, client, *args, **kwargs): build_args = client.build_service.create_or_update_build.call_args_list if build_args and build_args[0]: self.assertEqual(1, len(build_args)) self.assertEqual(5, len(build_args[0][0])) - self.assertEqual(args[0:2]+('default',)+(args[2] + '-' + args[3],), build_args[0][0][0:4]) + self.assertEqual(args[0:2]+('default',)+(args[2] + '-' + kwargs[0],), build_args[0][0][0:4]) self.put_build_resource = build_args[0][0][4] def _execute(self, *args, **kwargs): client = kwargs.pop('client', None) or self._get_basic_mock_client() app_deploy(_get_test_cmd(), client, *args, **kwargs) - self.verify_build_args(client, *args) + self.verify_build_args(client, *args, **kwargs) call_args = client.deployments.begin_update.call_args_list self.assertEqual(1, len(call_args)) From 035ab54edda8e6802d7ab6cf203a38cdf00e6b02 Mon Sep 17 00:00:00 2001 From: Qingyi Liu Date: Wed, 8 Jun 2022 11:18:24 +0800 Subject: [PATCH 5/6] fix test --- src/spring/azext_spring/tests/latest/test_asa_app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/spring/azext_spring/tests/latest/test_asa_app.py b/src/spring/azext_spring/tests/latest/test_asa_app.py index bcc3c58dcaf..4b274ff6de9 100644 --- a/src/spring/azext_spring/tests/latest/test_asa_app.py +++ b/src/spring/azext_spring/tests/latest/test_asa_app.py @@ -267,13 +267,13 @@ def _get_upload_info(self): resp.upload_url = 'https://mystorage.file.core.windows.net/root/my-relative-path?sv=2018-03-28&sr=f&sig=my-fake-pass&se=2021-12-28T06%3A43%3A17Z&sp=w' return resp - def verify_build_args(self, client, *args, **kwargs): + def verify_build_args(self, client, *args, deployment=None, **_): build_args = client.build_service.create_or_update_build.call_args_list if build_args and build_args[0]: self.assertEqual(1, len(build_args)) self.assertEqual(5, len(build_args[0][0])) - self.assertEqual(args[0:2]+('default',)+(args[2] + '-' + kwargs[0],), build_args[0][0][0:4]) + self.assertEqual(args[0:2]+('default',)+(args[2] + '-' + deployment,), build_args[0][0][0:4]) self.put_build_resource = build_args[0][0][4] def _execute(self, *args, **kwargs): From b727fdd14d6f64989850e69d8a256356bcd5383b Mon Sep 17 00:00:00 2001 From: Qingyi Liu Date: Wed, 8 Jun 2022 13:56:13 +0800 Subject: [PATCH 6/6] fix test --- src/spring/azext_spring/tests/latest/test_asa_app.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/spring/azext_spring/tests/latest/test_asa_app.py b/src/spring/azext_spring/tests/latest/test_asa_app.py index 4b274ff6de9..4efbc7fd382 100644 --- a/src/spring/azext_spring/tests/latest/test_asa_app.py +++ b/src/spring/azext_spring/tests/latest/test_asa_app.py @@ -267,20 +267,20 @@ def _get_upload_info(self): resp.upload_url = 'https://mystorage.file.core.windows.net/root/my-relative-path?sv=2018-03-28&sr=f&sig=my-fake-pass&se=2021-12-28T06%3A43%3A17Z&sp=w' return resp - def verify_build_args(self, client, *args, deployment=None, **_): + def verify_build_args(self, client, *args): build_args = client.build_service.create_or_update_build.call_args_list if build_args and build_args[0]: self.assertEqual(1, len(build_args)) self.assertEqual(5, len(build_args[0][0])) - self.assertEqual(args[0:2]+('default',)+(args[2] + '-' + deployment,), build_args[0][0][0:4]) + self.assertEqual(args[0:2]+('default',)+(args[2]+'-default',), build_args[0][0][0:4]) self.put_build_resource = build_args[0][0][4] def _execute(self, *args, **kwargs): client = kwargs.pop('client', None) or self._get_basic_mock_client() app_deploy(_get_test_cmd(), client, *args, **kwargs) - self.verify_build_args(client, *args, **kwargs) + self.verify_build_args(client, *args) call_args = client.deployments.begin_update.call_args_list self.assertEqual(1, len(call_args))