Skip to content

[Spring] update the app name used in build to app name and deployment name #4951

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
zhoxing-ms merged 6 commits into from
Jun 8, 2022
Merged

[Spring] update the app name used in build to app name and deployment name #4951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8c134f3
[Spring] update the app name used in build to app name and deployment…
smile37773 Jun 7, 2022
8921c1b
fix test
smile37773 Jun 8, 2022
8cb69dc
fix test
smile37773 Jun 8, 2022
fe06e3c
fix test
smile37773 Jun 8, 2022
035ab54
fix test
smile37773 Jun 8, 2022
b727fdd
fix test
smile37773 Jun 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/spring/azext_spring/_buildservices_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion src/spring/azext_spring/tests/latest/test_asa_app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]+'-default',), build_args[0][0][0:4])
self.put_build_resource = build_args[0][0][4]

def _execute(self, *args, **kwargs):
Expand Down