Skip to content

[Synapse] az synapse workspace: Add --last-commit-id for git repo config #23257

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
evelyn-ys merged 1 commit into from
Jul 20, 2022
Merged

[Synapse] az synapse workspace: Add --last-commit-id for git repo config #23257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/azure-cli/azure/cli/command_modules/synapse/manual/_help.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
--storage-account testadlsgen2 --file-system testfilesystem \\
--sql-admin-login-user cliuser1 --sql-admin-login-password Password123! --location "East US" \\
--repository-type AzureDevOpsGit --account-name testuser --project-name testprj \\
--repository-name testrepo --collaboration-branch main
--repository-name testrepo --collaboration-branch main --last-commit-id 000000
"""

helps['synapse workspace list'] = """
Expand Down
1 change: 1 addition & 0 deletions src/azure-cli/azure/cli/command_modules/synapse/manual/_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ def load_arguments(self, _):
c.argument('root_folder', arg_group=repository_arg_group, help='The name of the folder to the location of your Azure synapse JSON resources are imported. Default is /')
c.argument('project_name', arg_group=repository_arg_group, help='The project name to which you are connecting.')
c.argument('tenant_id', arg_group=repository_arg_group, help='The tenant id used to connect Azure devops')
c.argument('last_commit_id', arg_group=repository_arg_group, help='The last commit ID.')

with self.argument_context('synapse workspace create') as c:
c.argument('location', get_location_type(self.cli_ctx), validator=get_default_location_from_resource_group)
Expand Down
6 changes: 4 additions & 2 deletions src/azure-cli/azure/cli/command_modules/synapse/manual/operations/workspace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def list_workspaces(cmd, client, resource_group_name=None):
def create_workspace(cmd, client, resource_group_name, workspace_name, storage_account, file_system,
sql_admin_login_user, sql_admin_login_password, location=None, key_name="default", key_identifier=None, enable_managed_virtual_network=None,
allowed_aad_tenant_ids=None, prevent_data_exfiltration=None, tags=None, repository_type=None, host_name=None, account_name=None,
collaboration_branch=None, repository_name=None, root_folder='/', project_name=None, tenant_id=None, no_wait=False):
collaboration_branch=None, repository_name=None, root_folder='/', project_name=None, last_commit_id=None, tenant_id=None, no_wait=False):
identity_type = "SystemAssigned"
identity = ManagedIdentity(type=identity_type)
account_url = "https://{}.dfs.{}".format(storage_account, cmd.cli_ctx.cloud.suffixes.storage_endpoint)
Expand Down Expand Up @@ -64,6 +64,7 @@ def create_workspace(cmd, client, resource_group_name, workspace_name, storage_a
repository_name=repository_name,
collaboration_branch=collaboration_branch,
root_folder=root_folder,
last_commit_id=last_commit_id,
tenant_id=tenant_id)

workspace_info = Workspace(
Expand All @@ -84,7 +85,7 @@ def create_workspace(cmd, client, resource_group_name, workspace_name, storage_a
# pylint: disable=too-many-locals
def update_workspace(cmd, client, resource_group_name, workspace_name, sql_admin_login_password=None,
allowed_aad_tenant_ids=None, tags=None, key_name=None, repository_type=None, host_name=None, account_name=None,
collaboration_branch=None, repository_name=None, root_folder=None, project_name=None, tenant_id=None, no_wait=False):
collaboration_branch=None, repository_name=None, root_folder=None, project_name=None, last_commit_id=None, tenant_id=None, no_wait=False):
encryption = None
tenant_ids_list = None
workspace_repository_configuration = None
Expand Down Expand Up @@ -118,6 +119,7 @@ def update_workspace(cmd, client, resource_group_name, workspace_name, sql_admin
repository_name=repository_name,
collaboration_branch=collaboration_branch,
root_folder=root_folder,
last_commit_id=last_commit_id,
tenant_id=tenant_id)

updated_vnet_settings = ManagedVirtualNetworkSettings(allowed_aad_tenant_ids_for_linking=tenant_ids_list) if allowed_aad_tenant_ids is not None else None
Expand Down