From 034a7616788bb987b787c850fd79002240776b43 Mon Sep 17 00:00:00 2001 From: Daeun Yim Date: Tue, 25 May 2021 10:05:45 -0700 Subject: [PATCH 01/10] add private dns zone for restore and ha validator, template for github actions --- .../rdbms/_flexible_server_util.py | 7 ++++-- .../cli/command_modules/rdbms/_params.py | 4 +++- .../rdbms/flexible_server_custom_mysql.py | 8 +++---- .../rdbms/flexible_server_custom_postgres.py | 23 +++++++++++++++---- .../mysql_githubaction_template.yaml | 13 +++++++++++ .../postgresql_githubaction_template.yaml | 13 +++++++++++ 6 files changed, 57 insertions(+), 11 deletions(-) create mode 100644 src/azure-cli/azure/cli/command_modules/rdbms/templates/mysql_githubaction_template.yaml create mode 100644 src/azure-cli/azure/cli/command_modules/rdbms/templates/postgresql_githubaction_template.yaml diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/_flexible_server_util.py b/src/azure-cli/azure/cli/command_modules/rdbms/_flexible_server_util.py index 49dde216e0f..1b612ee1b05 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/_flexible_server_util.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/_flexible_server_util.py @@ -182,8 +182,11 @@ def get_mysql_list_skus_info(cmd, location): def _parse_list_skus(result, database_engine): result = _get_list_from_paged_response(result) + single_az = False if not result: raise InvalidArgumentValueError("No available SKUs in this location") + if len(result) == 1: + single_az = True tiers = result[0].supported_flexible_server_editions tiers_dict = {} @@ -219,8 +222,8 @@ def _parse_list_skus(result, database_engine): tiers_dict[tier_name] = tier_dict if database_engine == 'mysql': - return tiers_dict, iops_dict - return tiers_dict + return tiers_dict, iops_dict, single_az + return tiers_dict, single_az def _get_available_values(sku_info, argument, tier=None): diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/_params.py b/src/azure-cli/azure/cli/command_modules/rdbms/_params.py index a5e885b4186..2c4bbec8614 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/_params.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/_params.py @@ -301,7 +301,7 @@ def _flexible_server_params(command_group): c.argument('high_availability', default="Disabled", options_list=['--high-availability'], help='Enable or disable high availability feature. Default value is Disabled. High availability can only be set during flexible server create time') c.argument('assign_identity', options_list=['--assign-identity'], help='Generate and assign an Azure Active Directory Identity for this server for use with key management services like Azure KeyVault. No need to enter extra argument.') - c.argument('private_dns_zone_arguments', options_list=['--private-dns-zone'], help='The name or id of new or existing private dns zone. You can use the private dns zone from same resource group, different resource group, or different subscription. If you want to use a zone from different resource group or subscription, please provide resource Id. CLI creates a new private dns zone within the same resource group if not provided by users.') + c.argument('private_dns_zone_arguments', options_list=['--private-dns-zone'], help='This parameter only applies for a server with private access. The name or id of new or existing private dns zone. You can use the private dns zone from same resource group, different resource group, or different subscription. If you want to use a zone from different resource group or subscription, please provide resource Id. CLI creates a new private dns zone within the same resource group if not provided by users.') c.argument('database_name', id_part=None, arg_type=database_name_setter_arg_type, options_list=['--database-name', '-d'], help='The name of the database to be created when provisioning the database server') with self.argument_context('{} flexible-server delete'.format(command_group)) as c: @@ -320,6 +320,8 @@ def _flexible_server_params(command_group): help='The name of the source server to restore from.') c.argument('zone', options_list=['--zone'], help='Availability zone into which to provision the resource.') + c.argument('private_dns_zone_arguments', options_list=['--private-dns-zone'], + help='This parameter only applies for a server with private access. The name or id of new or existing private dns zone. You can use the private dns zone from same resource group, different resource group, or different subscription. If you want to use a zone from different resource group or subscription, please provide resource Id. CLI creates a new private dns zone within the same resource group if not provided by users.') elif command_group == 'mysql': c.argument('source_server', options_list=['--source-server'], help='The name or resource ID of the source server to restore from.') diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_mysql.py b/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_mysql.py index b45e23421ff..461f663b6a8 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_mysql.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_mysql.py @@ -39,7 +39,7 @@ def flexible_server_create(cmd, client, resource_group_name=None, server_name=No # validator if location is None: location = DEFAULT_LOCATION_MySQL - sku_info, iops_info = get_mysql_list_skus_info(cmd, location) + sku_info, iops_info, single_az = get_mysql_list_skus_info(cmd, location) mysql_arguments_validator(tier, sku_name, storage_mb, backup_retention, sku_info, version=version) db_context = DbContext( @@ -49,6 +49,8 @@ def flexible_server_create(cmd, client, resource_group_name=None, server_name=No if high_availability is not None and high_availability.lower() == 'enabled': if tier == 'Burstable': raise ArgumentUsageError("High availability is not supported for Burstable tier") + if single_az: + raise ArgumentUsageError("This region is single availability zone. High availability is not supported in a single availability zone region.") # Raise error when user passes values for both parameters if subnet_arm_resource_id is not None and public_access is not None: @@ -173,13 +175,12 @@ def flexible_server_update_custom_func(cmd, instance, tags=None, auto_grow=None, assign_identity=False, - ha_enabled=None, replication_role=None, maintenance_window=None, iops=None): # validator location = ''.join(instance.location.lower().split()) - sku_info, iops_info = get_mysql_list_skus_info(cmd, location) + sku_info, iops_info, _ = get_mysql_list_skus_info(cmd, location) mysql_arguments_validator(tier, sku_name, storage_mb, backup_retention, sku_info, instance=instance) server_module_path = instance.__module__ @@ -247,7 +248,6 @@ def flexible_server_update_custom_func(cmd, instance, ssl_enforcement=ssl_enforcement, delegated_subnet_arguments=instance.delegated_subnet_arguments, tags=tags, - ha_enabled=ha_enabled, replication_role=replication_role) if assign_identity: diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_postgres.py b/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_postgres.py index ffeec6bd129..b6a98916234 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_postgres.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_postgres.py @@ -29,7 +29,7 @@ # region create without args # pylint: disable=too-many-locals # pylint: disable=too-many-statements -# pylint: disable=raise-missing-from +# pylint: disable=raise-missing-from, unbalanced-tuple-unpacking def flexible_server_create(cmd, client, resource_group_name=None, server_name=None, location=None, backup_retention=None, @@ -44,7 +44,7 @@ def flexible_server_create(cmd, client, # validator if location is None: location = DEFAULT_LOCATION_PG - sku_info = get_postgres_list_skus_info(cmd, location) + sku_info, single_az = get_postgres_list_skus_info(cmd, location) pg_arguments_validator(tier, sku_name, storage_mb, sku_info, version=version) storage_mb *= 1024 @@ -55,6 +55,8 @@ def flexible_server_create(cmd, client, if high_availability is not None and high_availability.lower() == 'enabled': if tier == 'Burstable': raise ArgumentUsageError("High availability is not supported for Burstable tier") + if single_az: + raise ArgumentUsageError("This region is single availability zone. High availability is not supported in a single availability zone region.") # Raise error when user passes values for both parameters if subnet_arm_resource_id is not None and public_access is not None: @@ -138,7 +140,8 @@ def flexible_server_create(cmd, client, def flexible_server_restore(cmd, client, resource_group_name, server_name, - source_server, restore_point_in_time=None, location=None, zone=None, no_wait=False): + source_server, restore_point_in_time=None, location=None, zone=None, no_wait=False, + private_dns_zone_arguments=None): provider = 'Microsoft.DBforPostgreSQL' validate_server_name(cf_postgres_check_resource_availability(cmd.cli_ctx, '_'), server_name, 'Microsoft.DBforPostgreSQL/flexibleServers') @@ -169,7 +172,19 @@ def flexible_server_restore(cmd, client, try: source_server_object = client.get(id_parts['resource_group'], id_parts['name']) parameters.location = source_server_object.location - parameters.private_dns_zone_arguments = source_server_object.private_dns_zone_arguments + if source_server_object.public_network_access == 'Disabled': + parameters.private_dns_zone_arguments = source_server_object.private_dns_zone_arguments + if private_dns_zone_arguments is not None: + subnet_id = source_server_object.delegated_subnet_arguments.subnet_arm_resource_id + private_dns_zone_id = prepare_private_dns_zone(cmd, + 'PostgreSQL', + resource_group_name, + server_name, + private_dns_zone=private_dns_zone_arguments, + subnet_id=subnet_id, + location=location) + parameters.private_dns_zone_arguments = postgresql_flexibleservers.models.ServerPropertiesPrivateDnsZoneArguments(private_dns_zone_arm_resource_id=private_dns_zone_id) + except Exception as e: raise ResourceNotFoundError(e) diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/templates/mysql_githubaction_template.yaml b/src/azure-cli/azure/cli/command_modules/rdbms/templates/mysql_githubaction_template.yaml new file mode 100644 index 00000000000..65d71207f84 --- /dev/null +++ b/src/azure-cli/azure/cli/command_modules/rdbms/templates/mysql_githubaction_template.yaml @@ -0,0 +1,13 @@ +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - uses: azure/login@v1 + with: + creds: ${{ secrets.AZURE_CREDENTIALS }} + - uses: azure/mysql@v1 + with: + server-name: MYSQL_SERVER_NAME + connection-string: ${{ secrets.AZURE_MYSQL_CONNECTION_STRING }} + sql-file: MYSQL_FILE_NAME diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/templates/postgresql_githubaction_template.yaml b/src/azure-cli/azure/cli/command_modules/rdbms/templates/postgresql_githubaction_template.yaml new file mode 100644 index 00000000000..e5bff63b25b --- /dev/null +++ b/src/azure-cli/azure/cli/command_modules/rdbms/templates/postgresql_githubaction_template.yaml @@ -0,0 +1,13 @@ +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - uses: azure/login@v1 + with: + creds: ${{ secrets.AZURE_CREDENTIALS }} + - uses: azure/postgresql@v1 + with: + server-name: POSTGRESQL_SERVER_NAME + connection-string: ${{ secrets.AZURE_POSTGRESQL_CONNECTION_STRING }} + sql-file: POSTGRESQL_FILE_NAME From 1e2872938c256f8b4c078d0ddbc58ac7c0e11e13 Mon Sep 17 00:00:00 2001 From: Daeun Yim Date: Tue, 1 Jun 2021 14:00:27 -0700 Subject: [PATCH 02/10] change auto registration and fix autogenerated name --- .../command_modules/rdbms/flexible_server_custom_mysql.py | 3 +-- .../rdbms/flexible_server_custom_postgres.py | 2 +- .../rdbms/flexible_server_virtual_network.py | 8 ++++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_mysql.py b/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_mysql.py index 461f663b6a8..fc7ad76df79 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_mysql.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_mysql.py @@ -543,8 +543,7 @@ def _determine_iops(storage_gb, iops_info, iops_input, tier, sku_name): def get_free_iops(storage_in_mb, iops_info, tier, sku_name): free_iops = MINIMUM_IOPS + (storage_in_mb // 1024) * 3 max_supported_iops = iops_info[tier][sku_name] # free iops cannot exceed maximum supported iops for the sku - logger.warning(iops_info[tier]) - logger.warning(iops_info[tier][sku_name]) + return min(free_iops, max_supported_iops) diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_postgres.py b/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_postgres.py index b6a98916234..f9ba1ae93d9 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_postgres.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_postgres.py @@ -205,7 +205,7 @@ def flexible_server_update_custom_func(cmd, instance, # validator location = ''.join(instance.location.lower().split()) - sku_info = get_postgres_list_skus_info(cmd, location) + sku_info, _ = get_postgres_list_skus_info(cmd, location) pg_arguments_validator(tier, sku_name, storage_mb, sku_info, instance=instance) server_module_path = instance.__module__ diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_virtual_network.py b/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_virtual_network.py index 70686a43247..1445225eb9d 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_virtual_network.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_virtual_network.py @@ -53,7 +53,7 @@ def prepare_private_network(cmd, resource_group_name, server_name, vnet, subnet, elif _check_if_resource_name(vnet) and is_valid_resource_name(vnet): logger.warning("You have supplied a Vnet name. Verifying its existence...") - subnet_result = _create_vnet_subnet_delegation(cmd, nw_client, resource_client, delegation_service_name, resource_group_name, vnet, 'Subnet' + server_name[6:], + subnet_result = _create_vnet_subnet_delegation(cmd, nw_client, resource_client, delegation_service_name, resource_group_name, vnet, 'Subnet' + server_name, location, server_name, vnet_address_pref, subnet_address_pref) else: raise ValidationError("Incorrectly formed Vnet ID or Vnet name") @@ -69,7 +69,7 @@ def prepare_private_network(cmd, resource_group_name, server_name, vnet, subnet, raise ValidationError("If you pass both --vnet and --subnet, consider passing names instead of IDs. If you want to use an existing subnet, please provide the subnet Id only (not vnet Id).") elif subnet is None and vnet is None: - subnet_result = _create_vnet_subnet_delegation(cmd, nw_client, resource_client, delegation_service_name, resource_group_name, 'Vnet' + server_name[6:], 'Subnet' + server_name[6:], + subnet_result = _create_vnet_subnet_delegation(cmd, nw_client, resource_client, delegation_service_name, resource_group_name, 'Vnet' + server_name, 'Subnet' + server_name, location, server_name, vnet_address_pref, subnet_address_pref) else: return None @@ -82,7 +82,7 @@ def address_private_network_with_id_input(cmd, rid, nw_client, resource_client, nw_client, resource_client = _change_client_with_different_subscription(cmd, id_subscription, nw_client, resource_client) _resource_group_verify_and_create(resource_client, id_resource_group, location) if id_subnet is None: - id_subnet = 'Subnet' + server_name[6:] + id_subnet = 'Subnet' + server_name return _create_vnet_subnet_delegation(cmd, nw_client, resource_client, delegation_service_name, id_resource_group, id_vnet, id_subnet, location, server_name, vnet_address_pref, subnet_address_pref) @@ -215,7 +215,7 @@ def prepare_private_dns_zone(cmd, database_engine, resource_group, server_name, raise ValidationError('The suffix of the private DNS zone should be in "{}" format'.format(private_dns_zone_suffix)) link = VirtualNetworkLink(location='global', virtual_network=SubResource(id=vnet.id)) - link.registration_enabled = True + link.registration_enabled = False # check existence DNS zone and change resource group zone_exist_flag = False From ec0b702f62a36286b5b3d9457ecca4fc11df531f Mon Sep 17 00:00:00 2001 From: Daeun Yim Date: Tue, 1 Jun 2021 20:03:13 -0700 Subject: [PATCH 03/10] test fixed --- .../rdbms/_flexible_server_util.py | 8 +- .../mysql_githubaction_template.yaml | 1 + .../postgresql_githubaction_template.yaml | 1 + ...flexible_server_vnet_ha_server_create.yaml | 50 +++++------ ...et_mgmt_supplied_vname_and_subnetname.yaml | 24 ++--- ...exible_server_vnet_mgmt_supplied_vnet.yaml | 76 ++++++++-------- ...ql_flexible_server_vnet_server_create.yaml | 50 +++++------ ...flexible_server_vnet_ha_server_create.yaml | 74 ++++++++-------- ...et_mgmt_supplied_vname_and_subnetname.yaml | 30 +++---- ...exible_server_vnet_mgmt_supplied_vnet.yaml | 88 +++++++++---------- ...es_flexible_server_vnet_server_create.yaml | 70 +++++++-------- .../latest/test_rdbms_flexible_commands.py | 12 +-- 12 files changed, 245 insertions(+), 239 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/_flexible_server_util.py b/src/azure-cli/azure/cli/command_modules/rdbms/_flexible_server_util.py index 1b612ee1b05..e2ec3260dff 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/_flexible_server_util.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/_flexible_server_util.py @@ -336,9 +336,12 @@ def run_subprocess_get_output(command): return process -def register_credential_secrets(cmd, server, repository): +def register_credential_secrets(cmd, database_engine, server, repository): resource_group = parse_resource_id(server.id)["resource_group"] - scope = "/subscriptions/{}/resourceGroups/{}".format(get_subscription_id(cmd.cli_ctx), resource_group) + provider = "DBforMySQL" + if database_engine == "postgresql": + provider = "DBforPostgreSQL" + scope = "/subscriptions/{}/resourceGroups/{}/providers/Microsoft.{}/flexibleServers/{}".format(get_subscription_id(cmd.cli_ctx), resource_group, provider, server.name) app = create_service_principal_for_rbac(cmd, name=server.name, role='contributor', scopes=[scope]) app['clientId'], app['clientSecret'], app['tenantId'] = app.pop('appId'), app.pop('password'), app.pop('tenant') @@ -380,6 +383,7 @@ def fill_action_template(cmd, database_engine, server, database_name, administra if AZURE_CREDENTIALS not in github_secrets: register_credential_secrets(cmd, + database_engine=database_engine, server=server, repository=repository) diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/templates/mysql_githubaction_template.yaml b/src/azure-cli/azure/cli/command_modules/rdbms/templates/mysql_githubaction_template.yaml index 65d71207f84..fc1f89967b4 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/templates/mysql_githubaction_template.yaml +++ b/src/azure-cli/azure/cli/command_modules/rdbms/templates/mysql_githubaction_template.yaml @@ -1,3 +1,4 @@ +on: [push, workflow_dispatch] jobs: build: runs-on: ubuntu-latest diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/templates/postgresql_githubaction_template.yaml b/src/azure-cli/azure/cli/command_modules/rdbms/templates/postgresql_githubaction_template.yaml index e5bff63b25b..e07a5d4a6f2 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/templates/postgresql_githubaction_template.yaml +++ b/src/azure-cli/azure/cli/command_modules/rdbms/templates/postgresql_githubaction_template.yaml @@ -1,3 +1,4 @@ +on: [push, workflow_dispatch] jobs: build: runs-on: ubuntu-latest diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_mysql_flexible_server_vnet_ha_server_create.yaml b/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_mysql_flexible_server_vnet_ha_server_create.yaml index ee85c95c30c..27b29f97683 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_mysql_flexible_server_vnet_ha_server_create.yaml +++ b/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_mysql_flexible_server_vnet_ha_server_create.yaml @@ -929,10 +929,10 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003?api-version=2021-02-01 response: body: - string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/virtualNetworks/Vnetbclitest-2000003'' + string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003'' under resource group ''clitest.rg000001'' was not found. For more details please go to https://aka.ms/ARMResourceNotFoundFix"}}' headers: @@ -978,11 +978,11 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.8.5 (Linux-4.4.0-19041-Microsoft-x86_64-with-glibc2.29) method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Vnetbclitest-2000003\",\r\n \"id\": - \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003\",\r\n + string: "{\r\n \"name\": \"Vnetazuredbclitest-2000003\",\r\n \"id\": + \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003\",\r\n \ \"etag\": \"W/\\\"14041f3c-0e8c-4cbf-a9bf-ddfea8a29c7a\\\"\",\r\n \"type\": \"Microsoft.Network/virtualNetworks\",\r\n \"location\": \"eastus2euap\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \"resourceGuid\": @@ -1086,11 +1086,11 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.8.5 (Linux-4.4.0-19041-Microsoft-x86_64-with-glibc2.29) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Vnetbclitest-2000003\",\r\n \"id\": - \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003\",\r\n + string: "{\r\n \"name\": \"Vnetazuredbclitest-2000003\",\r\n \"id\": + \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003\",\r\n \ \"etag\": \"W/\\\"ef8d3bb4-6ca6-4fe1-aa2c-8bd661e05287\\\"\",\r\n \"type\": \"Microsoft.Network/virtualNetworks\",\r\n \"location\": \"eastus2euap\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"resourceGuid\": @@ -1920,11 +1920,11 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003/subnets/Subnetbclitest-2000003?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003/subnets/Subnetazuredbclitest-2000003?api-version=2021-02-01 response: body: string: "{\r\n \"error\": {\r\n \"code\": \"NotFound\",\r\n \"message\": - \"Resource /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003/subnets/Subnetbclitest-2000003 + \"Resource /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003/subnets/Subnetazuredbclitest-2000003 not found.\",\r\n \"details\": []\r\n }\r\n}" headers: cache-control: @@ -1967,11 +1967,11 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.8.5 (Linux-4.4.0-19041-Microsoft-x86_64-with-glibc2.29) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Vnetbclitest-2000003\",\r\n \"id\": - \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003\",\r\n + string: "{\r\n \"name\": \"Vnetazuredbclitest-2000003\",\r\n \"id\": + \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003\",\r\n \ \"etag\": \"W/\\\"ef8d3bb4-6ca6-4fe1-aa2c-8bd661e05287\\\"\",\r\n \"type\": \"Microsoft.Network/virtualNetworks\",\r\n \"location\": \"eastus2euap\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"resourceGuid\": @@ -2011,7 +2011,7 @@ interactions: code: 200 message: OK - request: - body: '{"name": "Subnetbclitest-2000003", "properties": {"addressPrefix": + body: '{"name": "Subnetazuredbclitest-2000003", "properties": {"addressPrefix": "10.0.0.0/24", "serviceEndpoints": [{"service": "Microsoft.Storage"}], "delegations": [{"name": "Microsoft.DBforMySQL/flexibleServers", "properties": {"serviceName": "Microsoft.DBforMySQL/flexibleServers"}}]}}' @@ -2033,18 +2033,18 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.8.5 (Linux-4.4.0-19041-Microsoft-x86_64-with-glibc2.29) method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003/subnets/Subnetbclitest-2000003?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003/subnets/Subnetazuredbclitest-2000003?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Subnetbclitest-2000003\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003/subnets/Subnetbclitest-2000003\",\r\n + string: "{\r\n \"name\": \"Subnetazuredbclitest-2000003\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003/subnets/Subnetazuredbclitest-2000003\",\r\n \ \"etag\": \"W/\\\"7e5e7cab-8989-4778-9aa3-66d473b899fb\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \"addressPrefix\": \"10.0.0.0/24\",\r\n \ \"serviceEndpoints\": [\r\n {\r\n \"provisioningState\": \"Updating\",\r\n \ \"service\": \"Microsoft.Storage\",\r\n \"locations\": [\r\n \ \"eastus2euap\",\r\n \"centraluseuap\"\r\n ]\r\n \ }\r\n ],\r\n \"delegations\": [\r\n {\r\n \"name\": - \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003/subnets/Subnetbclitest-2000003/delegations/Microsoft.DBforMySQL/flexibleServers\",\r\n + \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003/subnets/Subnetazuredbclitest-2000003/delegations/Microsoft.DBforMySQL/flexibleServers\",\r\n \ \"etag\": \"W/\\\"7e5e7cab-8989-4778-9aa3-66d473b899fb\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"serviceName\": \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"actions\": @@ -2147,18 +2147,18 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.8.5 (Linux-4.4.0-19041-Microsoft-x86_64-with-glibc2.29) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003/subnets/Subnetbclitest-2000003?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003/subnets/Subnetazuredbclitest-2000003?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Subnetbclitest-2000003\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003/subnets/Subnetbclitest-2000003\",\r\n + string: "{\r\n \"name\": \"Subnetazuredbclitest-2000003\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003/subnets/Subnetazuredbclitest-2000003\",\r\n \ \"etag\": \"W/\\\"c908f39c-9510-4441-95fb-7c488827e621\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"addressPrefix\": \"10.0.0.0/24\",\r\n \ \"serviceEndpoints\": [\r\n {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"service\": \"Microsoft.Storage\",\r\n \"locations\": [\r\n \ \"eastus2euap\",\r\n \"centraluseuap\"\r\n ]\r\n \ }\r\n ],\r\n \"delegations\": [\r\n {\r\n \"name\": - \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003/subnets/Subnetbclitest-2000003/delegations/Microsoft.DBforMySQL/flexibleServers\",\r\n + \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003/subnets/Subnetazuredbclitest-2000003/delegations/Microsoft.DBforMySQL/flexibleServers\",\r\n \ \"etag\": \"W/\\\"c908f39c-9510-4441-95fb-7c488827e621\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"serviceName\": \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"actions\": @@ -2203,7 +2203,7 @@ interactions: "GeneralPurpose"}, "properties": {"administratorLogin": "fluidgull9", "administratorLoginPassword": "t9cq6ezAcWOCJTeF3bwQgg", "version": "5.7", "haEnabled": "Enabled", "storageProfile": {"backupRetentionDays": 7, "storageMB": 32768, "storageIops": 396}, "delegatedSubnetArguments": - {"subnetArmResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003/subnets/Subnetbclitest-2000003"}, + {"subnetArmResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003/subnets/Subnetazuredbclitest-2000003"}, "createMode": "Default"}}' headers: Accept: @@ -3194,7 +3194,7 @@ interactions: uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBForMySql/flexibleServers/azuredbclitest-2000003?api-version=2020-07-01-preview response: body: - string: '{"sku":{"name":"Standard_D2s_v3","tier":"GeneralPurpose"},"properties":{"administratorLogin":"fluidgull9","storageProfile":{"storageMB":32768,"storageIops":396,"backupRetentionDays":7,"storageAutogrow":"Disabled","fileStorageSkuName":"Premium_ZRS"},"version":"5.7","state":"Ready","haState":"Healthy","fullyQualifiedDomainName":"azuredbclitest-2000003.mysql.database.azure.com","sourceServerId":"","publicNetworkAccess":"Disabled","sslEnforcement":"Disabled","haEnabled":"Enabled","availabilityZone":"3","standbyAvailabilityZone":"useast2euap-AZ03","earliestRestoreDate":"2021-05-05T06:45:53.9495428+00:00","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0},"replicationRole":"None","replicaCapacity":10,"delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003/subnets/Subnetbclitest-2000003"},"byokEnforcement":"Disabled"},"location":"East + string: '{"sku":{"name":"Standard_D2s_v3","tier":"GeneralPurpose"},"properties":{"administratorLogin":"fluidgull9","storageProfile":{"storageMB":32768,"storageIops":396,"backupRetentionDays":7,"storageAutogrow":"Disabled","fileStorageSkuName":"Premium_ZRS"},"version":"5.7","state":"Ready","haState":"Healthy","fullyQualifiedDomainName":"azuredbclitest-2000003.mysql.database.azure.com","sourceServerId":"","publicNetworkAccess":"Disabled","sslEnforcement":"Disabled","haEnabled":"Enabled","availabilityZone":"3","standbyAvailabilityZone":"useast2euap-AZ03","earliestRestoreDate":"2021-05-05T06:45:53.9495428+00:00","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0},"replicationRole":"None","replicaCapacity":10,"delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003/subnets/Subnetazuredbclitest-2000003"},"byokEnforcement":"Disabled"},"location":"East US 2 EUAP","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBforMySQL/flexibleServers/azuredbclitest-2000003","name":"azuredbclitest-2000003","type":"Microsoft.DBforMySQL/flexibleServers"}' headers: cache-control: @@ -3429,7 +3429,7 @@ interactions: uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBForMySql/flexibleServers/azuredbclitest-2000003?api-version=2020-07-01-preview response: body: - string: '{"sku":{"name":"Standard_D2s_v3","tier":"GeneralPurpose"},"properties":{"administratorLogin":"fluidgull9","storageProfile":{"storageMB":32768,"storageIops":396,"backupRetentionDays":7,"storageAutogrow":"Disabled","fileStorageSkuName":"Premium_ZRS"},"version":"5.7","state":"Ready","haState":"Healthy","fullyQualifiedDomainName":"azuredbclitest-2000003.mysql.database.azure.com","sourceServerId":"","publicNetworkAccess":"Disabled","sslEnforcement":"Disabled","haEnabled":"Enabled","availabilityZone":"3","standbyAvailabilityZone":"useast2euap-AZ03","earliestRestoreDate":"2021-05-05T06:45:53.9495428+00:00","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0},"replicationRole":"None","replicaCapacity":10,"delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003/subnets/Subnetbclitest-2000003"},"byokEnforcement":"Disabled"},"location":"East + string: '{"sku":{"name":"Standard_D2s_v3","tier":"GeneralPurpose"},"properties":{"administratorLogin":"fluidgull9","storageProfile":{"storageMB":32768,"storageIops":396,"backupRetentionDays":7,"storageAutogrow":"Disabled","fileStorageSkuName":"Premium_ZRS"},"version":"5.7","state":"Ready","haState":"Healthy","fullyQualifiedDomainName":"azuredbclitest-2000003.mysql.database.azure.com","sourceServerId":"","publicNetworkAccess":"Disabled","sslEnforcement":"Disabled","haEnabled":"Enabled","availabilityZone":"3","standbyAvailabilityZone":"useast2euap-AZ03","earliestRestoreDate":"2021-05-05T06:45:53.9495428+00:00","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0},"replicationRole":"None","replicaCapacity":10,"delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003/subnets/Subnetazuredbclitest-2000003"},"byokEnforcement":"Disabled"},"location":"East US 2 EUAP","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBforMySQL/flexibleServers/azuredbclitest-2000003","name":"azuredbclitest-2000003","type":"Microsoft.DBforMySQL/flexibleServers"}' headers: cache-control: diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_mysql_flexible_server_vnet_mgmt_supplied_vname_and_subnetname.yaml b/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_mysql_flexible_server_vnet_mgmt_supplied_vname_and_subnetname.yaml index 5e8d096fe80..fe97adc4567 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_mysql_flexible_server_vnet_mgmt_supplied_vname_and_subnetname.yaml +++ b/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_mysql_flexible_server_vnet_mgmt_supplied_vname_and_subnetname.yaml @@ -5554,11 +5554,11 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnetetserver6mysql?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnettestvnetserver6mysql?api-version=2021-02-01 response: body: string: "{\r\n \"error\": {\r\n \"code\": \"NotFound\",\r\n \"message\": - \"Resource /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnetetserver6mysql + \"Resource /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnettestvnetserver6mysql not found.\",\r\n \"details\": []\r\n }\r\n}" headers: cache-control: @@ -5645,7 +5645,7 @@ interactions: code: 200 message: OK - request: - body: '{"name": "Subnetetserver6mysql", "properties": {"addressPrefix": "10.0.0.0/24", + body: '{"name": "Subnettestvnetserver6mysql", "properties": {"addressPrefix": "10.0.0.0/24", "serviceEndpoints": [{"service": "Microsoft.Storage"}], "delegations": [{"name": "Microsoft.DBforMySQL/flexibleServers", "properties": {"serviceName": "Microsoft.DBforMySQL/flexibleServers"}}]}}' headers: @@ -5667,17 +5667,17 @@ interactions: - AZURECLI/2.22.1 (MSI) azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnetetserver6mysql?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnettestvnetserver6mysql?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Subnetetserver6mysql\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnetetserver6mysql\",\r\n + string: "{\r\n \"name\": \"Subnettestvnetserver6mysql\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnettestvnetserver6mysql\",\r\n \ \"etag\": \"W/\\\"56447fb0-e831-419f-a7c3-7e11dd304f88\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \"addressPrefix\": \"10.0.0.0/24\",\r\n \ \"serviceEndpoints\": [\r\n {\r\n \"provisioningState\": \"Updating\",\r\n \ \"service\": \"Microsoft.Storage\",\r\n \"locations\": [\r\n \ \"eastus2euap\",\r\n \"centraluseuap\"\r\n ]\r\n \ }\r\n ],\r\n \"delegations\": [\r\n {\r\n \"name\": - \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnetetserver6mysql/delegations/Microsoft.DBforMySQL/flexibleServers\",\r\n + \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnettestvnetserver6mysql/delegations/Microsoft.DBforMySQL/flexibleServers\",\r\n \ \"etag\": \"W/\\\"56447fb0-e831-419f-a7c3-7e11dd304f88\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"serviceName\": \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"actions\": @@ -5782,17 +5782,17 @@ interactions: - AZURECLI/2.22.1 (MSI) azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnetetserver6mysql?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnettestvnetserver6mysql?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Subnetetserver6mysql\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnetetserver6mysql\",\r\n + string: "{\r\n \"name\": \"Subnettestvnetserver6mysql\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnettestvnetserver6mysql\",\r\n \ \"etag\": \"W/\\\"b6e7413c-1cca-450f-928e-ba89cd0f0303\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"addressPrefix\": \"10.0.0.0/24\",\r\n \ \"serviceEndpoints\": [\r\n {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"service\": \"Microsoft.Storage\",\r\n \"locations\": [\r\n \ \"eastus2euap\",\r\n \"centraluseuap\"\r\n ]\r\n \ }\r\n ],\r\n \"delegations\": [\r\n {\r\n \"name\": - \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnetetserver6mysql/delegations/Microsoft.DBforMySQL/flexibleServers\",\r\n + \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnettestvnetserver6mysql/delegations/Microsoft.DBforMySQL/flexibleServers\",\r\n \ \"etag\": \"W/\\\"b6e7413c-1cca-450f-928e-ba89cd0f0303\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"serviceName\": \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"actions\": @@ -5837,7 +5837,7 @@ interactions: "properties": {"administratorLogin": "ashamedredwing3", "administratorLoginPassword": "xHERlkIMb5mgFICv83RgFg", "version": "5.7", "haEnabled": "Disabled", "storageProfile": {"backupRetentionDays": 7, "storageMB": 20480, "storageIops": 100}, "delegatedSubnetArguments": - {"subnetArmResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnetetserver6mysql"}, + {"subnetArmResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnettestvnetserver6mysql"}, "createMode": "Default"}}' headers: Accept: @@ -6230,7 +6230,7 @@ interactions: uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBForMySql/flexibleServers/testvnetserver6mysql?api-version=2020-07-01-preview response: body: - string: '{"sku":{"name":"Standard_B1ms","tier":"Burstable"},"properties":{"administratorLogin":"ashamedredwing3","storageProfile":{"storageMB":20480,"storageIops":100,"backupRetentionDays":7,"storageAutogrow":"Disabled","fileStorageSkuName":"Premium_LRS"},"version":"5.7","state":"Ready","haState":"NotEnabled","fullyQualifiedDomainName":"testvnetserver6mysql.mysql.database.azure.com","sourceServerId":"","publicNetworkAccess":"Disabled","sslEnforcement":"Disabled","haEnabled":"Disabled","availabilityZone":"2","earliestRestoreDate":"2021-04-28T22:12:30.8659976+00:00","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0},"replicationRole":"None","replicaCapacity":10,"delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnetetserver6mysql"},"byokEnforcement":"Disabled"},"location":"East + string: '{"sku":{"name":"Standard_B1ms","tier":"Burstable"},"properties":{"administratorLogin":"ashamedredwing3","storageProfile":{"storageMB":20480,"storageIops":100,"backupRetentionDays":7,"storageAutogrow":"Disabled","fileStorageSkuName":"Premium_LRS"},"version":"5.7","state":"Ready","haState":"NotEnabled","fullyQualifiedDomainName":"testvnetserver6mysql.mysql.database.azure.com","sourceServerId":"","publicNetworkAccess":"Disabled","sslEnforcement":"Disabled","haEnabled":"Disabled","availabilityZone":"2","earliestRestoreDate":"2021-04-28T22:12:30.8659976+00:00","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0},"replicationRole":"None","replicaCapacity":10,"delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnettestvnetserver6mysql"},"byokEnforcement":"Disabled"},"location":"East US 2 EUAP","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBforMySQL/flexibleServers/testvnetserver6mysql","name":"testvnetserver6mysql","type":"Microsoft.DBforMySQL/flexibleServers"}' headers: cache-control: @@ -6512,7 +6512,7 @@ interactions: uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBForMySql/flexibleServers/testvnetserver6mysql?api-version=2020-07-01-preview response: body: - string: '{"sku":{"name":"Standard_B1ms","tier":"Burstable"},"properties":{"administratorLogin":"ashamedredwing3","storageProfile":{"storageMB":20480,"storageIops":100,"backupRetentionDays":7,"storageAutogrow":"Disabled","fileStorageSkuName":"Premium_LRS"},"version":"5.7","state":"Ready","haState":"NotEnabled","fullyQualifiedDomainName":"testvnetserver6mysql.mysql.database.azure.com","sourceServerId":"","publicNetworkAccess":"Disabled","sslEnforcement":"Disabled","haEnabled":"Disabled","availabilityZone":"2","earliestRestoreDate":"2021-04-28T22:12:30.8659976+00:00","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0},"replicationRole":"None","replicaCapacity":10,"delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnetetserver6mysql"},"byokEnforcement":"Disabled"},"location":"East + string: '{"sku":{"name":"Standard_B1ms","tier":"Burstable"},"properties":{"administratorLogin":"ashamedredwing3","storageProfile":{"storageMB":20480,"storageIops":100,"backupRetentionDays":7,"storageAutogrow":"Disabled","fileStorageSkuName":"Premium_LRS"},"version":"5.7","state":"Ready","haState":"NotEnabled","fullyQualifiedDomainName":"testvnetserver6mysql.mysql.database.azure.com","sourceServerId":"","publicNetworkAccess":"Disabled","sslEnforcement":"Disabled","haEnabled":"Disabled","availabilityZone":"2","earliestRestoreDate":"2021-04-28T22:12:30.8659976+00:00","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0},"replicationRole":"None","replicaCapacity":10,"delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnettestvnetserver6mysql"},"byokEnforcement":"Disabled"},"location":"East US 2 EUAP","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBforMySQL/flexibleServers/testvnetserver6mysql","name":"testvnetserver6mysql","type":"Microsoft.DBforMySQL/flexibleServers"}' headers: cache-control: diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_mysql_flexible_server_vnet_mgmt_supplied_vnet.yaml b/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_mysql_flexible_server_vnet_mgmt_supplied_vnet.yaml index cdc811b9799..3ad61677a15 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_mysql_flexible_server_vnet_mgmt_supplied_vnet.yaml +++ b/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_mysql_flexible_server_vnet_mgmt_supplied_vnet.yaml @@ -2,7 +2,7 @@ interactions: - request: body: '{"location": "eastus2euap", "tags": {}, "properties": {"addressSpace": {"addressPrefixes": ["10.0.0.0/16"]}, "dhcpOptions": {}, "subnets": [{"name": - "Subnetetserver3mysql", "properties": {"addressPrefix": "10.0.0.0/24"}}]}}' + "Subnettestvnetserver3mysql", "properties": {"addressPrefix": "10.0.0.0/24"}}]}}' headers: Accept: - application/json @@ -32,8 +32,8 @@ interactions: \ \"resourceGuid\": \"f4e6e88d-b662-4557-8ba2-219ce165e661\",\r\n \"addressSpace\": {\r\n \"addressPrefixes\": [\r\n \"10.0.0.0/16\"\r\n ]\r\n \ },\r\n \"dhcpOptions\": {\r\n \"dnsServers\": []\r\n },\r\n - \ \"subnets\": [\r\n {\r\n \"name\": \"Subnetetserver3mysql\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3mysql\",\r\n + \ \"subnets\": [\r\n {\r\n \"name\": \"Subnettestvnetserver3mysql\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3mysql\",\r\n \ \"etag\": \"W/\\\"7af1ccf6-495f-4cce-ab90-ad6888fcb9b4\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \ \"addressPrefix\": \"10.0.0.0/24\",\r\n \"delegations\": @@ -149,8 +149,8 @@ interactions: \ \"resourceGuid\": \"f4e6e88d-b662-4557-8ba2-219ce165e661\",\r\n \"addressSpace\": {\r\n \"addressPrefixes\": [\r\n \"10.0.0.0/16\"\r\n ]\r\n \ },\r\n \"dhcpOptions\": {\r\n \"dnsServers\": []\r\n },\r\n - \ \"subnets\": [\r\n {\r\n \"name\": \"Subnetetserver3mysql\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3mysql\",\r\n + \ \"subnets\": [\r\n {\r\n \"name\": \"Subnettestvnetserver3mysql\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3mysql\",\r\n \ \"etag\": \"W/\\\"a270554f-3d0a-4df7-86df-8677aec6f0f2\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"addressPrefix\": \"10.0.0.0/24\",\r\n \"delegations\": @@ -1129,8 +1129,8 @@ interactions: \ \"resourceGuid\": \"f4e6e88d-b662-4557-8ba2-219ce165e661\",\r\n \"addressSpace\": {\r\n \"addressPrefixes\": [\r\n \"10.0.0.0/16\"\r\n ]\r\n \ },\r\n \"dhcpOptions\": {\r\n \"dnsServers\": []\r\n },\r\n - \ \"subnets\": [\r\n {\r\n \"name\": \"Subnetetserver3mysql\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3mysql\",\r\n + \ \"subnets\": [\r\n {\r\n \"name\": \"Subnettestvnetserver3mysql\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3mysql\",\r\n \ \"etag\": \"W/\\\"a270554f-3d0a-4df7-86df-8677aec6f0f2\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"addressPrefix\": \"10.0.0.0/24\",\r\n \"delegations\": @@ -1196,8 +1196,8 @@ interactions: \ \"resourceGuid\": \"f4e6e88d-b662-4557-8ba2-219ce165e661\",\r\n \"addressSpace\": {\r\n \"addressPrefixes\": [\r\n \"10.0.0.0/16\"\r\n ]\r\n \ },\r\n \"dhcpOptions\": {\r\n \"dnsServers\": []\r\n },\r\n - \ \"subnets\": [\r\n {\r\n \"name\": \"Subnetetserver3mysql\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3mysql\",\r\n + \ \"subnets\": [\r\n {\r\n \"name\": \"Subnettestvnetserver3mysql\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3mysql\",\r\n \ \"etag\": \"W/\\\"a270554f-3d0a-4df7-86df-8677aec6f0f2\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"addressPrefix\": \"10.0.0.0/24\",\r\n \"delegations\": @@ -2027,10 +2027,10 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3mysql?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3mysql?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Subnetetserver3mysql\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3mysql\",\r\n + string: "{\r\n \"name\": \"Subnettestvnetserver3mysql\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3mysql\",\r\n \ \"etag\": \"W/\\\"a270554f-3d0a-4df7-86df-8677aec6f0f2\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"addressPrefix\": \"10.0.0.0/24\",\r\n \ \"delegations\": [],\r\n \"privateEndpointNetworkPolicies\": \"Enabled\",\r\n @@ -2858,10 +2858,10 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3mysql?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3mysql?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Subnetetserver3mysql\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3mysql\",\r\n + string: "{\r\n \"name\": \"Subnettestvnetserver3mysql\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3mysql\",\r\n \ \"etag\": \"W/\\\"a270554f-3d0a-4df7-86df-8677aec6f0f2\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"addressPrefix\": \"10.0.0.0/24\",\r\n \ \"delegations\": [],\r\n \"privateEndpointNetworkPolicies\": \"Enabled\",\r\n @@ -2915,10 +2915,10 @@ interactions: - AZURECLI/2.22.1 (MSI) azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3mysql?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3mysql?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Subnetetserver3mysql\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3mysql\",\r\n + string: "{\r\n \"name\": \"Subnettestvnetserver3mysql\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3mysql\",\r\n \ \"etag\": \"W/\\\"a270554f-3d0a-4df7-86df-8677aec6f0f2\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"addressPrefix\": \"10.0.0.0/24\",\r\n \ \"delegations\": [],\r\n \"privateEndpointNetworkPolicies\": \"Enabled\",\r\n @@ -2956,8 +2956,8 @@ interactions: code: 200 message: OK - request: - body: '{"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3mysql", - "name": "Subnetetserver3mysql", "properties": {"addressPrefix": "10.0.0.0/24", + body: '{"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3mysql", + "name": "Subnettestvnetserver3mysql", "properties": {"addressPrefix": "10.0.0.0/24", "serviceEndpoints": [{"service": "Microsoft.Storage"}], "delegations": [{"name": "Microsoft.DBforMySQL/flexibleServers", "properties": {"serviceName": "Microsoft.DBforMySQL/flexibleServers"}}], "privateEndpointNetworkPolicies": "Enabled", "privateLinkServiceNetworkPolicies": @@ -2981,17 +2981,17 @@ interactions: - AZURECLI/2.22.1 (MSI) azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3mysql?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3mysql?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Subnetetserver3mysql\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3mysql\",\r\n + string: "{\r\n \"name\": \"Subnettestvnetserver3mysql\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3mysql\",\r\n \ \"etag\": \"W/\\\"af77e330-92fb-49fb-870f-dc74e2eae330\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \"addressPrefix\": \"10.0.0.0/24\",\r\n \ \"serviceEndpoints\": [\r\n {\r\n \"provisioningState\": \"Updating\",\r\n \ \"service\": \"Microsoft.Storage\",\r\n \"locations\": [\r\n \ \"eastus2euap\",\r\n \"centraluseuap\"\r\n ]\r\n \ }\r\n ],\r\n \"delegations\": [\r\n {\r\n \"name\": - \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3mysql/delegations/Microsoft.DBforMySQL/flexibleServers\",\r\n + \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3mysql/delegations/Microsoft.DBforMySQL/flexibleServers\",\r\n \ \"etag\": \"W/\\\"af77e330-92fb-49fb-870f-dc74e2eae330\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"serviceName\": \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"actions\": @@ -3100,17 +3100,17 @@ interactions: - AZURECLI/2.22.1 (MSI) azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3mysql?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3mysql?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Subnetetserver3mysql\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3mysql\",\r\n + string: "{\r\n \"name\": \"Subnettestvnetserver3mysql\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3mysql\",\r\n \ \"etag\": \"W/\\\"204ad1e5-dc76-402a-b7e8-6f1f7cd49d2e\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"addressPrefix\": \"10.0.0.0/24\",\r\n \ \"serviceEndpoints\": [\r\n {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"service\": \"Microsoft.Storage\",\r\n \"locations\": [\r\n \ \"eastus2euap\",\r\n \"centraluseuap\"\r\n ]\r\n \ }\r\n ],\r\n \"delegations\": [\r\n {\r\n \"name\": - \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3mysql/delegations/Microsoft.DBforMySQL/flexibleServers\",\r\n + \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3mysql/delegations/Microsoft.DBforMySQL/flexibleServers\",\r\n \ \"etag\": \"W/\\\"204ad1e5-dc76-402a-b7e8-6f1f7cd49d2e\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"serviceName\": \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"actions\": @@ -3155,7 +3155,7 @@ interactions: "properties": {"administratorLogin": "goofymarten4", "administratorLoginPassword": "ZOypv46RV4c66LyIqrQC3g", "version": "5.7", "haEnabled": "Disabled", "storageProfile": {"backupRetentionDays": 7, "storageMB": 20480, "storageIops": 100}, "delegatedSubnetArguments": - {"subnetArmResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3mysql"}, + {"subnetArmResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3mysql"}, "createMode": "Default"}}' headers: Accept: @@ -3594,7 +3594,7 @@ interactions: uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBForMySql/flexibleServers/testvnetserver3mysql?api-version=2020-07-01-preview response: body: - string: '{"sku":{"name":"Standard_B1ms","tier":"Burstable"},"properties":{"administratorLogin":"goofymarten4","storageProfile":{"storageMB":20480,"storageIops":100,"backupRetentionDays":7,"storageAutogrow":"Disabled","fileStorageSkuName":"Premium_LRS"},"version":"5.7","state":"Ready","haState":"NotEnabled","fullyQualifiedDomainName":"testvnetserver3mysql.mysql.database.azure.com","sourceServerId":"","publicNetworkAccess":"Disabled","sslEnforcement":"Disabled","haEnabled":"Disabled","availabilityZone":"2","earliestRestoreDate":"2021-04-28T22:04:50.8544701+00:00","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0},"replicationRole":"None","replicaCapacity":10,"delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3mysql"},"byokEnforcement":"Disabled"},"location":"East + string: '{"sku":{"name":"Standard_B1ms","tier":"Burstable"},"properties":{"administratorLogin":"goofymarten4","storageProfile":{"storageMB":20480,"storageIops":100,"backupRetentionDays":7,"storageAutogrow":"Disabled","fileStorageSkuName":"Premium_LRS"},"version":"5.7","state":"Ready","haState":"NotEnabled","fullyQualifiedDomainName":"testvnetserver3mysql.mysql.database.azure.com","sourceServerId":"","publicNetworkAccess":"Disabled","sslEnforcement":"Disabled","haEnabled":"Disabled","availabilityZone":"2","earliestRestoreDate":"2021-04-28T22:04:50.8544701+00:00","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0},"replicationRole":"None","replicaCapacity":10,"delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3mysql"},"byokEnforcement":"Disabled"},"location":"East US 2 EUAP","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBforMySQL/flexibleServers/testvnetserver3mysql","name":"testvnetserver3mysql","type":"Microsoft.DBforMySQL/flexibleServers"}' headers: cache-control: @@ -5732,11 +5732,11 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnetetserver4mysql?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnettestvnetserver4mysql?api-version=2021-02-01 response: body: string: "{\r\n \"error\": {\r\n \"code\": \"NotFound\",\r\n \"message\": - \"Resource /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnetetserver4mysql + \"Resource /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnettestvnetserver4mysql not found.\",\r\n \"details\": []\r\n }\r\n}" headers: cache-control: @@ -5823,7 +5823,7 @@ interactions: code: 200 message: OK - request: - body: '{"name": "Subnetetserver4mysql", "properties": {"addressPrefix": "10.0.0.0/24", + body: '{"name": "Subnettestvnetserver4mysql", "properties": {"addressPrefix": "10.0.0.0/24", "serviceEndpoints": [{"service": "Microsoft.Storage"}], "delegations": [{"name": "Microsoft.DBforMySQL/flexibleServers", "properties": {"serviceName": "Microsoft.DBforMySQL/flexibleServers"}}]}}' headers: @@ -5845,17 +5845,17 @@ interactions: - AZURECLI/2.22.1 (MSI) azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnetetserver4mysql?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnettestvnetserver4mysql?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Subnetetserver4mysql\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnetetserver4mysql\",\r\n + string: "{\r\n \"name\": \"Subnettestvnetserver4mysql\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnettestvnetserver4mysql\",\r\n \ \"etag\": \"W/\\\"8f9f91e7-ecf7-483e-af83-284491c26f92\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \"addressPrefix\": \"10.0.0.0/24\",\r\n \ \"serviceEndpoints\": [\r\n {\r\n \"provisioningState\": \"Updating\",\r\n \ \"service\": \"Microsoft.Storage\",\r\n \"locations\": [\r\n \ \"eastus2euap\",\r\n \"centraluseuap\"\r\n ]\r\n \ }\r\n ],\r\n \"delegations\": [\r\n {\r\n \"name\": - \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnetetserver4mysql/delegations/Microsoft.DBforMySQL/flexibleServers\",\r\n + \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnettestvnetserver4mysql/delegations/Microsoft.DBforMySQL/flexibleServers\",\r\n \ \"etag\": \"W/\\\"8f9f91e7-ecf7-483e-af83-284491c26f92\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"serviceName\": \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"actions\": @@ -5960,17 +5960,17 @@ interactions: - AZURECLI/2.22.1 (MSI) azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnetetserver4mysql?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnettestvnetserver4mysql?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Subnetetserver4mysql\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnetetserver4mysql\",\r\n + string: "{\r\n \"name\": \"Subnettestvnetserver4mysql\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnettestvnetserver4mysql\",\r\n \ \"etag\": \"W/\\\"bea18e7d-6902-4518-84e9-41f91f0cf54e\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"addressPrefix\": \"10.0.0.0/24\",\r\n \ \"serviceEndpoints\": [\r\n {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"service\": \"Microsoft.Storage\",\r\n \"locations\": [\r\n \ \"eastus2euap\",\r\n \"centraluseuap\"\r\n ]\r\n \ }\r\n ],\r\n \"delegations\": [\r\n {\r\n \"name\": - \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnetetserver4mysql/delegations/Microsoft.DBforMySQL/flexibleServers\",\r\n + \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnettestvnetserver4mysql/delegations/Microsoft.DBforMySQL/flexibleServers\",\r\n \ \"etag\": \"W/\\\"bea18e7d-6902-4518-84e9-41f91f0cf54e\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"serviceName\": \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"actions\": @@ -6015,7 +6015,7 @@ interactions: "properties": {"administratorLogin": "crasscheetah3", "administratorLoginPassword": "OQ91blUPo_Qj57rgI32FHQ", "version": "5.7", "haEnabled": "Disabled", "storageProfile": {"backupRetentionDays": 7, "storageMB": 20480, "storageIops": 100}, "delegatedSubnetArguments": - {"subnetArmResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnetetserver4mysql"}, + {"subnetArmResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnettestvnetserver4mysql"}, "createMode": "Default"}}' headers: Accept: @@ -6408,7 +6408,7 @@ interactions: uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBForMySql/flexibleServers/testvnetserver4mysql?api-version=2020-07-01-preview response: body: - string: '{"sku":{"name":"Standard_B1ms","tier":"Burstable"},"properties":{"administratorLogin":"crasscheetah3","storageProfile":{"storageMB":20480,"storageIops":100,"backupRetentionDays":7,"storageAutogrow":"Disabled","fileStorageSkuName":"Premium_LRS"},"version":"5.7","state":"Ready","haState":"NotEnabled","fullyQualifiedDomainName":"testvnetserver4mysql.mysql.database.azure.com","sourceServerId":"","publicNetworkAccess":"Disabled","sslEnforcement":"Disabled","haEnabled":"Disabled","availabilityZone":"2","earliestRestoreDate":"2021-04-28T22:13:30.5162637+00:00","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0},"replicationRole":"None","replicaCapacity":10,"delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnetetserver4mysql"},"byokEnforcement":"Disabled"},"location":"East + string: '{"sku":{"name":"Standard_B1ms","tier":"Burstable"},"properties":{"administratorLogin":"crasscheetah3","storageProfile":{"storageMB":20480,"storageIops":100,"backupRetentionDays":7,"storageAutogrow":"Disabled","fileStorageSkuName":"Premium_LRS"},"version":"5.7","state":"Ready","haState":"NotEnabled","fullyQualifiedDomainName":"testvnetserver4mysql.mysql.database.azure.com","sourceServerId":"","publicNetworkAccess":"Disabled","sslEnforcement":"Disabled","haEnabled":"Disabled","availabilityZone":"2","earliestRestoreDate":"2021-04-28T22:13:30.5162637+00:00","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0},"replicationRole":"None","replicaCapacity":10,"delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnettestvnetserver4mysql"},"byokEnforcement":"Disabled"},"location":"East US 2 EUAP","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBforMySQL/flexibleServers/testvnetserver4mysql","name":"testvnetserver4mysql","type":"Microsoft.DBforMySQL/flexibleServers"}' headers: cache-control: @@ -6643,7 +6643,7 @@ interactions: uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBForMySql/flexibleServers/testvnetserver3mysql?api-version=2020-07-01-preview response: body: - string: '{"sku":{"name":"Standard_B1ms","tier":"Burstable"},"properties":{"administratorLogin":"goofymarten4","storageProfile":{"storageMB":20480,"storageIops":100,"backupRetentionDays":7,"storageAutogrow":"Disabled","fileStorageSkuName":"Premium_LRS"},"version":"5.7","state":"Ready","haState":"NotEnabled","fullyQualifiedDomainName":"testvnetserver3mysql.mysql.database.azure.com","sourceServerId":"","publicNetworkAccess":"Disabled","sslEnforcement":"Disabled","haEnabled":"Disabled","availabilityZone":"2","earliestRestoreDate":"2021-04-28T22:04:50.8544701+00:00","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0},"replicationRole":"None","replicaCapacity":10,"delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3mysql"},"byokEnforcement":"Disabled"},"location":"East + string: '{"sku":{"name":"Standard_B1ms","tier":"Burstable"},"properties":{"administratorLogin":"goofymarten4","storageProfile":{"storageMB":20480,"storageIops":100,"backupRetentionDays":7,"storageAutogrow":"Disabled","fileStorageSkuName":"Premium_LRS"},"version":"5.7","state":"Ready","haState":"NotEnabled","fullyQualifiedDomainName":"testvnetserver3mysql.mysql.database.azure.com","sourceServerId":"","publicNetworkAccess":"Disabled","sslEnforcement":"Disabled","haEnabled":"Disabled","availabilityZone":"2","earliestRestoreDate":"2021-04-28T22:04:50.8544701+00:00","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0},"replicationRole":"None","replicaCapacity":10,"delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3mysql"},"byokEnforcement":"Disabled"},"location":"East US 2 EUAP","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBforMySQL/flexibleServers/testvnetserver3mysql","name":"testvnetserver3mysql","type":"Microsoft.DBforMySQL/flexibleServers"}' headers: cache-control: @@ -6690,7 +6690,7 @@ interactions: uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBForMySql/flexibleServers/testvnetserver4mysql?api-version=2020-07-01-preview response: body: - string: '{"sku":{"name":"Standard_B1ms","tier":"Burstable"},"properties":{"administratorLogin":"crasscheetah3","storageProfile":{"storageMB":20480,"storageIops":100,"backupRetentionDays":7,"storageAutogrow":"Disabled","fileStorageSkuName":"Premium_LRS"},"version":"5.7","state":"Ready","haState":"NotEnabled","fullyQualifiedDomainName":"testvnetserver4mysql.mysql.database.azure.com","sourceServerId":"","publicNetworkAccess":"Disabled","sslEnforcement":"Disabled","haEnabled":"Disabled","availabilityZone":"2","earliestRestoreDate":"2021-04-28T22:13:30.5162637+00:00","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0},"replicationRole":"None","replicaCapacity":10,"delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnetetserver4mysql"},"byokEnforcement":"Disabled"},"location":"East + string: '{"sku":{"name":"Standard_B1ms","tier":"Burstable"},"properties":{"administratorLogin":"crasscheetah3","storageProfile":{"storageMB":20480,"storageIops":100,"backupRetentionDays":7,"storageAutogrow":"Disabled","fileStorageSkuName":"Premium_LRS"},"version":"5.7","state":"Ready","haState":"NotEnabled","fullyQualifiedDomainName":"testvnetserver4mysql.mysql.database.azure.com","sourceServerId":"","publicNetworkAccess":"Disabled","sslEnforcement":"Disabled","haEnabled":"Disabled","availabilityZone":"2","earliestRestoreDate":"2021-04-28T22:13:30.5162637+00:00","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0},"replicationRole":"None","replicaCapacity":10,"delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnettestvnetserver4mysql"},"byokEnforcement":"Disabled"},"location":"East US 2 EUAP","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBforMySQL/flexibleServers/testvnetserver4mysql","name":"testvnetserver4mysql","type":"Microsoft.DBforMySQL/flexibleServers"}' headers: cache-control: diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_mysql_flexible_server_vnet_server_create.yaml b/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_mysql_flexible_server_vnet_server_create.yaml index 94261906ded..7f26c1ef92f 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_mysql_flexible_server_vnet_server_create.yaml +++ b/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_mysql_flexible_server_vnet_server_create.yaml @@ -982,10 +982,10 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002?api-version=2021-02-01 response: body: - string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/virtualNetworks/Vnetbclitest-000002'' + string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002'' under resource group ''clitest.rg000001'' was not found. For more details please go to https://aka.ms/ARMResourceNotFoundFix"}}' headers: @@ -1032,11 +1032,11 @@ interactions: - AZURECLI/2.22.0 (MSI) azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Vnetbclitest-000002\",\r\n \"id\": - \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002\",\r\n + string: "{\r\n \"name\": \"Vnetazuredbclitest-000002\",\r\n \"id\": + \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002\",\r\n \ \"etag\": \"W/\\\"fe4ab77a-a7d5-4185-a04f-0cd1b4511dcc\\\"\",\r\n \"type\": \"Microsoft.Network/virtualNetworks\",\r\n \"location\": \"eastus2euap\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \"resourceGuid\": @@ -1142,11 +1142,11 @@ interactions: - AZURECLI/2.22.0 (MSI) azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Vnetbclitest-000002\",\r\n \"id\": - \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002\",\r\n + string: "{\r\n \"name\": \"Vnetazuredbclitest-000002\",\r\n \"id\": + \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002\",\r\n \ \"etag\": \"W/\\\"11b8d49f-8243-43f4-a563-0920b32022d5\\\"\",\r\n \"type\": \"Microsoft.Network/virtualNetworks\",\r\n \"location\": \"eastus2euap\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"resourceGuid\": @@ -1976,11 +1976,11 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002/subnets/Subnetbclitest-000002?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002/subnets/Subnetazuredbclitest-000002?api-version=2021-02-01 response: body: string: "{\r\n \"error\": {\r\n \"code\": \"NotFound\",\r\n \"message\": - \"Resource /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002/subnets/Subnetbclitest-000002 + \"Resource /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002/subnets/Subnetazuredbclitest-000002 not found.\",\r\n \"details\": []\r\n }\r\n}" headers: cache-control: @@ -2024,11 +2024,11 @@ interactions: - AZURECLI/2.22.0 (MSI) azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Vnetbclitest-000002\",\r\n \"id\": - \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002\",\r\n + string: "{\r\n \"name\": \"Vnetazuredbclitest-000002\",\r\n \"id\": + \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002\",\r\n \ \"etag\": \"W/\\\"11b8d49f-8243-43f4-a563-0920b32022d5\\\"\",\r\n \"type\": \"Microsoft.Network/virtualNetworks\",\r\n \"location\": \"eastus2euap\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"resourceGuid\": @@ -2068,7 +2068,7 @@ interactions: code: 200 message: OK - request: - body: '{"name": "Subnetbclitest-000002", "properties": {"addressPrefix": + body: '{"name": "Subnetazuredbclitest-000002", "properties": {"addressPrefix": "10.0.0.0/24", "serviceEndpoints": [{"service": "Microsoft.Storage"}], "delegations": [{"name": "Microsoft.DBforMySQL/flexibleServers", "properties": {"serviceName": "Microsoft.DBforMySQL/flexibleServers"}}]}}' @@ -2091,18 +2091,18 @@ interactions: - AZURECLI/2.22.0 (MSI) azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002/subnets/Subnetbclitest-000002?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002/subnets/Subnetazuredbclitest-000002?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Subnetbclitest-000002\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002/subnets/Subnetbclitest-000002\",\r\n + string: "{\r\n \"name\": \"Subnetazuredbclitest-000002\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002/subnets/Subnetazuredbclitest-000002\",\r\n \ \"etag\": \"W/\\\"13ef3741-a01d-47f7-a464-f6a406c1c85e\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \"addressPrefix\": \"10.0.0.0/24\",\r\n \ \"serviceEndpoints\": [\r\n {\r\n \"provisioningState\": \"Updating\",\r\n \ \"service\": \"Microsoft.Storage\",\r\n \"locations\": [\r\n \ \"eastus2euap\",\r\n \"centraluseuap\"\r\n ]\r\n \ }\r\n ],\r\n \"delegations\": [\r\n {\r\n \"name\": - \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002/subnets/Subnetbclitest-000002/delegations/Microsoft.DBforMySQL/flexibleServers\",\r\n + \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002/subnets/Subnetazuredbclitest-000002/delegations/Microsoft.DBforMySQL/flexibleServers\",\r\n \ \"etag\": \"W/\\\"13ef3741-a01d-47f7-a464-f6a406c1c85e\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"serviceName\": \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"actions\": @@ -2257,18 +2257,18 @@ interactions: - AZURECLI/2.22.0 (MSI) azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002/subnets/Subnetbclitest-000002?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002/subnets/Subnetazuredbclitest-000002?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Subnetbclitest-000002\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002/subnets/Subnetbclitest-000002\",\r\n + string: "{\r\n \"name\": \"Subnetazuredbclitest-000002\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002/subnets/Subnetazuredbclitest-000002\",\r\n \ \"etag\": \"W/\\\"61051dac-f46b-4c57-b7e4-ecb19ad55ee0\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"addressPrefix\": \"10.0.0.0/24\",\r\n \ \"serviceEndpoints\": [\r\n {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"service\": \"Microsoft.Storage\",\r\n \"locations\": [\r\n \ \"eastus2euap\",\r\n \"centraluseuap\"\r\n ]\r\n \ }\r\n ],\r\n \"delegations\": [\r\n {\r\n \"name\": - \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002/subnets/Subnetbclitest-000002/delegations/Microsoft.DBforMySQL/flexibleServers\",\r\n + \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002/subnets/Subnetazuredbclitest-000002/delegations/Microsoft.DBforMySQL/flexibleServers\",\r\n \ \"etag\": \"W/\\\"61051dac-f46b-4c57-b7e4-ecb19ad55ee0\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"serviceName\": \"Microsoft.DBforMySQL/flexibleServers\",\r\n \"actions\": @@ -2313,7 +2313,7 @@ interactions: "properties": {"administratorLogin": "fluidcordial6", "administratorLoginPassword": "43nU0sN8mjOzxTaDFlLpTw", "version": "5.7", "haEnabled": "Disabled", "storageProfile": {"backupRetentionDays": 7, "storageMB": 10240, "storageIops": 100}, "delegatedSubnetArguments": - {"subnetArmResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002/subnets/Subnetbclitest-000002"}, + {"subnetArmResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002/subnets/Subnetazuredbclitest-000002"}, "createMode": "Default"}}' headers: Accept: @@ -2798,7 +2798,7 @@ interactions: uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBForMySql/flexibleServers/azuredbclitest-000002?api-version=2020-07-01-preview response: body: - string: '{"sku":{"name":"Standard_B1ms","tier":"Burstable"},"properties":{"administratorLogin":"fluidcordial6","storageProfile":{"storageMB":10240,"storageIops":100,"backupRetentionDays":7,"storageAutogrow":"Disabled","fileStorageSkuName":"Premium_LRS"},"version":"5.7","state":"Ready","haState":"NotEnabled","fullyQualifiedDomainName":"azuredbclitest-000002.mysql.database.azure.com","sourceServerId":"","publicNetworkAccess":"Disabled","sslEnforcement":"Disabled","haEnabled":"Disabled","earliestRestoreDate":"2021-04-23T04:16:31.2318613+00:00","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0},"replicationRole":"None","replicaCapacity":10,"delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002/subnets/Subnetbclitest-000002"},"byokEnforcement":"Disabled"},"location":"East + string: '{"sku":{"name":"Standard_B1ms","tier":"Burstable"},"properties":{"administratorLogin":"fluidcordial6","storageProfile":{"storageMB":10240,"storageIops":100,"backupRetentionDays":7,"storageAutogrow":"Disabled","fileStorageSkuName":"Premium_LRS"},"version":"5.7","state":"Ready","haState":"NotEnabled","fullyQualifiedDomainName":"azuredbclitest-000002.mysql.database.azure.com","sourceServerId":"","publicNetworkAccess":"Disabled","sslEnforcement":"Disabled","haEnabled":"Disabled","earliestRestoreDate":"2021-04-23T04:16:31.2318613+00:00","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0},"replicationRole":"None","replicaCapacity":10,"delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002/subnets/Subnetazuredbclitest-000002"},"byokEnforcement":"Disabled"},"location":"East US 2 EUAP","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBforMySQL/flexibleServers/azuredbclitest-000002","name":"azuredbclitest-000002","type":"Microsoft.DBforMySQL/flexibleServers"}' headers: cache-control: @@ -3033,7 +3033,7 @@ interactions: uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBForMySql/flexibleServers/azuredbclitest-000002?api-version=2020-07-01-preview response: body: - string: '{"sku":{"name":"Standard_B1ms","tier":"Burstable"},"properties":{"administratorLogin":"fluidcordial6","storageProfile":{"storageMB":10240,"storageIops":100,"backupRetentionDays":7,"storageAutogrow":"Disabled","fileStorageSkuName":"Premium_LRS"},"version":"5.7","state":"Ready","haState":"NotEnabled","fullyQualifiedDomainName":"azuredbclitest-000002.mysql.database.azure.com","sourceServerId":"","publicNetworkAccess":"Disabled","sslEnforcement":"Disabled","haEnabled":"Disabled","earliestRestoreDate":"2021-04-23T04:16:31.2318613+00:00","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0},"replicationRole":"None","replicaCapacity":10,"delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002/subnets/Subnetbclitest-000002"},"byokEnforcement":"Disabled"},"location":"East + string: '{"sku":{"name":"Standard_B1ms","tier":"Burstable"},"properties":{"administratorLogin":"fluidcordial6","storageProfile":{"storageMB":10240,"storageIops":100,"backupRetentionDays":7,"storageAutogrow":"Disabled","fileStorageSkuName":"Premium_LRS"},"version":"5.7","state":"Ready","haState":"NotEnabled","fullyQualifiedDomainName":"azuredbclitest-000002.mysql.database.azure.com","sourceServerId":"","publicNetworkAccess":"Disabled","sslEnforcement":"Disabled","haEnabled":"Disabled","earliestRestoreDate":"2021-04-23T04:16:31.2318613+00:00","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0},"replicationRole":"None","replicaCapacity":10,"delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002/subnets/Subnetazuredbclitest-000002"},"byokEnforcement":"Disabled"},"location":"East US 2 EUAP","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBforMySQL/flexibleServers/azuredbclitest-000002","name":"azuredbclitest-000002","type":"Microsoft.DBforMySQL/flexibleServers"}' headers: cache-control: diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_postgres_flexible_server_vnet_ha_server_create.yaml b/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_postgres_flexible_server_vnet_ha_server_create.yaml index 5e103aaf191..50633330c1c 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_postgres_flexible_server_vnet_ha_server_create.yaml +++ b/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_postgres_flexible_server_vnet_ha_server_create.yaml @@ -922,10 +922,10 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-resource/16.1.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003?api-version=2021-02-01 response: body: - string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/virtualNetworks/Vnetbclitest-2000003'' + string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003'' under resource group ''clitest.rg000001'' was not found. For more details please go to https://aka.ms/ARMResourceNotFoundFix"}}' headers: @@ -971,11 +971,11 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Vnetbclitest-2000003\",\r\n \"id\": - \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003\",\r\n + string: "{\r\n \"name\": \"Vnetazuredbclitest-2000003\",\r\n \"id\": + \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003\",\r\n \ \"etag\": \"W/\\\"55e6fbc8-047b-476e-8a69-e16201da2f99\\\"\",\r\n \"type\": \"Microsoft.Network/virtualNetworks\",\r\n \"location\": \"eastus2euap\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \"resourceGuid\": @@ -1079,11 +1079,11 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Vnetbclitest-2000003\",\r\n \"id\": - \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003\",\r\n + string: "{\r\n \"name\": \"Vnetazuredbclitest-2000003\",\r\n \"id\": + \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003\",\r\n \ \"etag\": \"W/\\\"1fa0ae34-a56d-4c23-803a-6b2bdf8e50a9\\\"\",\r\n \"type\": \"Microsoft.Network/virtualNetworks\",\r\n \"location\": \"eastus2euap\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"resourceGuid\": @@ -1909,11 +1909,11 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-resource/16.1.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003/subnets/Subnetbclitest-2000003?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003/subnets/Subnetazuredbclitest-2000003?api-version=2021-02-01 response: body: string: "{\r\n \"error\": {\r\n \"code\": \"NotFound\",\r\n \"message\": - \"Resource /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003/subnets/Subnetbclitest-2000003 + \"Resource /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003/subnets/Subnetazuredbclitest-2000003 not found.\",\r\n \"details\": []\r\n }\r\n}" headers: cache-control: @@ -1956,11 +1956,11 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Vnetbclitest-2000003\",\r\n \"id\": - \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003\",\r\n + string: "{\r\n \"name\": \"Vnetazuredbclitest-2000003\",\r\n \"id\": + \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003\",\r\n \ \"etag\": \"W/\\\"1fa0ae34-a56d-4c23-803a-6b2bdf8e50a9\\\"\",\r\n \"type\": \"Microsoft.Network/virtualNetworks\",\r\n \"location\": \"eastus2euap\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"resourceGuid\": @@ -2000,7 +2000,7 @@ interactions: code: 200 message: OK - request: - body: '{"name": "Subnetbclitest-2000003", "properties": {"addressPrefix": + body: '{"name": "Subnetazuredbclitest-2000003", "properties": {"addressPrefix": "10.0.0.0/24", "delegations": [{"name": "Microsoft.DBforPostgreSQL/flexibleServers", "properties": {"serviceName": "Microsoft.DBforPostgreSQL/flexibleServers"}}]}}' headers: @@ -2021,15 +2021,15 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003/subnets/Subnetbclitest-2000003?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003/subnets/Subnetazuredbclitest-2000003?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Subnetbclitest-2000003\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003/subnets/Subnetbclitest-2000003\",\r\n + string: "{\r\n \"name\": \"Subnetazuredbclitest-2000003\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003/subnets/Subnetazuredbclitest-2000003\",\r\n \ \"etag\": \"W/\\\"a47e1355-3379-461f-b401-03fab0dae993\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \"addressPrefix\": \"10.0.0.0/24\",\r\n \ \"delegations\": [\r\n {\r\n \"name\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003/subnets/Subnetbclitest-2000003/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003/subnets/Subnetazuredbclitest-2000003/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n \ \"etag\": \"W/\\\"a47e1355-3379-461f-b401-03fab0dae993\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"serviceName\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n @@ -2132,15 +2132,15 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003/subnets/Subnetbclitest-2000003?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003/subnets/Subnetazuredbclitest-2000003?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Subnetbclitest-2000003\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003/subnets/Subnetbclitest-2000003\",\r\n + string: "{\r\n \"name\": \"Subnetazuredbclitest-2000003\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003/subnets/Subnetazuredbclitest-2000003\",\r\n \ \"etag\": \"W/\\\"0aef4535-d418-42e2-bf46-bd43ff880fd3\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"addressPrefix\": \"10.0.0.0/24\",\r\n \ \"delegations\": [\r\n {\r\n \"name\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003/subnets/Subnetbclitest-2000003/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003/subnets/Subnetazuredbclitest-2000003/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n \ \"etag\": \"W/\\\"0aef4535-d418-42e2-bf46-bd43ff880fd3\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"serviceName\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n @@ -2248,23 +2248,23 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Vnetbclitest-2000003\",\r\n \"id\": - \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003\",\r\n + string: "{\r\n \"name\": \"Vnetazuredbclitest-2000003\",\r\n \"id\": + \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003\",\r\n \ \"etag\": \"W/\\\"0aef4535-d418-42e2-bf46-bd43ff880fd3\\\"\",\r\n \"type\": \"Microsoft.Network/virtualNetworks\",\r\n \"location\": \"eastus2euap\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"resourceGuid\": \"41851e49-e2be-4268-a298-05eb155a556c\",\r\n \"addressSpace\": {\r\n \"addressPrefixes\": [\r\n \"10.0.0.0/16\"\r\n ]\r\n },\r\n \"subnets\": [\r\n - \ {\r\n \"name\": \"Subnetbclitest-2000003\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003/subnets/Subnetbclitest-2000003\",\r\n + \ {\r\n \"name\": \"Subnetazuredbclitest-2000003\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003/subnets/Subnetazuredbclitest-2000003\",\r\n \ \"etag\": \"W/\\\"0aef4535-d418-42e2-bf46-bd43ff880fd3\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"addressPrefix\": \"10.0.0.0/24\",\r\n \"delegations\": [\r\n {\r\n \"name\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003/subnets/Subnetbclitest-2000003/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003/subnets/Subnetazuredbclitest-2000003/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n \ \"etag\": \"W/\\\"0aef4535-d418-42e2-bf46-bd43ff880fd3\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"serviceName\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n @@ -4089,7 +4089,7 @@ interactions: code: 200 message: OK - request: - body: '{"location": "global", "properties": {"virtualNetwork": {"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003"}, + body: '{"location": "global", "properties": {"virtualNetwork": {"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003"}, "registrationEnabled": true}}' headers: Accept: @@ -4111,7 +4111,7 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-mgmt-privatedns/1.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/azuredbclitest-2000003.private.postgres.database.azure.com/virtualNetworkLinks/Vnetbclitest-2000003-link?api-version=2018-09-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/azuredbclitest-2000003.private.postgres.database.azure.com/virtualNetworkLinks/Vnetazuredbclitest-2000003-link?api-version=2018-09-01 response: body: string: '{}' @@ -4207,10 +4207,10 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-mgmt-privatedns/1.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/azuredbclitest-2000003.private.postgres.database.azure.com/virtualNetworkLinks/Vnetbclitest-2000003-link?api-version=2018-09-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/azuredbclitest-2000003.private.postgres.database.azure.com/virtualNetworkLinks/Vnetazuredbclitest-2000003-link?api-version=2018-09-01 response: body: - string: '{"id":"\/subscriptions\/00000000-0000-0000-0000-000000000000\/resourceGroups\/clitest.rg000001\/providers\/Microsoft.Network\/privateDnsZones\/azuredbclitest-2000003.private.postgres.database.azure.com\/virtualNetworkLinks\/Vnetbclitest-2000003-link","name":"Vnetbclitest-2000003-link","type":"Microsoft.Network\/privateDnsZones\/virtualNetworkLinks","etag":"\"bd00379f-0000-0100-0000-609cd8ea0000\"","location":"global","properties":{"provisioningState":"Succeeded","registrationEnabled":true,"virtualNetwork":{"id":"\/subscriptions\/00000000-0000-0000-0000-000000000000\/resourceGroups\/clitest.rg000001\/providers\/Microsoft.Network\/virtualNetworks\/Vnetbclitest-2000003"},"virtualNetworkLinkState":"InProgress"}}' + string: '{"id":"\/subscriptions\/00000000-0000-0000-0000-000000000000\/resourceGroups\/clitest.rg000001\/providers\/Microsoft.Network\/privateDnsZones\/azuredbclitest-2000003.private.postgres.database.azure.com\/virtualNetworkLinks\/Vnetazuredbclitest-2000003-link","name":"Vnetazuredbclitest-2000003-link","type":"Microsoft.Network\/privateDnsZones\/virtualNetworkLinks","etag":"\"bd00379f-0000-0100-0000-609cd8ea0000\"","location":"global","properties":{"provisioningState":"Succeeded","registrationEnabled":true,"virtualNetwork":{"id":"\/subscriptions\/00000000-0000-0000-0000-000000000000\/resourceGroups\/clitest.rg000001\/providers\/Microsoft.Network\/virtualNetworks\/Vnetazuredbclitest-2000003"},"virtualNetworkLinkState":"InProgress"}}' headers: cache-control: - private @@ -4246,7 +4246,7 @@ interactions: "GeneralPurpose"}, "properties": {"administratorLogin": "amusedopossum8", "administratorLoginPassword": "1HsFR0SEX2T1hV9TiFwL9w", "version": "12", "storageProfile": {"backupRetentionDays": 7, "storageMB": 131072}, "haEnabled": "Enabled", "delegatedSubnetArguments": - {"subnetArmResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003/subnets/Subnetbclitest-2000003"}, + {"subnetArmResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003/subnets/Subnetazuredbclitest-2000003"}, "privateDnsZoneArguments": {"privateDnsZoneArmResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/azuredbclitest-2000003.private.postgres.database.azure.com"}, "createMode": "Default"}}' headers: @@ -4365,10 +4365,10 @@ interactions: - python/3.7.7 (Windows-10-10.0.19041-SP0) msrest/0.6.21 msrest_azure/0.6.3 azure-mgmt-privatedns/0.1.0 Azure-SDK-For-Python AZURECLI/2.22.0 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/azuredbclitest-2000003.private.postgres.database.azure.com/virtualNetworkLinks/Vnetbclitest-2000003-link?api-version=2018-09-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/azuredbclitest-2000003.private.postgres.database.azure.com/virtualNetworkLinks/Vnetazuredbclitest-2000003-link?api-version=2018-09-01 response: body: - string: '{"id":"\/subscriptions\/00000000-0000-0000-0000-000000000000\/resourceGroups\/clitest.rg000001\/providers\/Microsoft.Network\/privateDnsZones\/azuredbclitest-2000003.private.postgres.database.azure.com\/virtualNetworkLinks\/Vnetbclitest-2000003-link","name":"Vnetbclitest-2000003-link","type":"Microsoft.Network\/privateDnsZones\/virtualNetworkLinks","etag":"\"ec00d9de-0000-0100-0000-607fcd760000\"","location":"global","properties":{"provisioningState":"Succeeded","registrationEnabled":true,"virtualNetwork":{"id":"\/subscriptions\/00000000-0000-0000-0000-000000000000\/resourceGroups\/clitest.rg000001\/providers\/Microsoft.Network\/virtualNetworks\/Vnetbclitest-2000003"},"virtualNetworkLinkState":"InProgress"}}' + string: '{"id":"\/subscriptions\/00000000-0000-0000-0000-000000000000\/resourceGroups\/clitest.rg000001\/providers\/Microsoft.Network\/privateDnsZones\/azuredbclitest-2000003.private.postgres.database.azure.com\/virtualNetworkLinks\/Vnetazuredbclitest-2000003-link","name":"Vnetazuredbclitest-2000003-link","type":"Microsoft.Network\/privateDnsZones\/virtualNetworkLinks","etag":"\"ec00d9de-0000-0100-0000-607fcd760000\"","location":"global","properties":{"provisioningState":"Succeeded","registrationEnabled":true,"virtualNetwork":{"id":"\/subscriptions\/00000000-0000-0000-0000-000000000000\/resourceGroups\/clitest.rg000001\/providers\/Microsoft.Network\/virtualNetworks\/Vnetazuredbclitest-2000003"},"virtualNetworkLinkState":"InProgress"}}' headers: cache-control: - private @@ -4832,7 +4832,7 @@ interactions: uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBForPostgreSql/flexibleServers/azuredbclitest-2000003?api-version=2020-02-14-preview response: body: - string: '{"sku":{"name":"Standard_D2s_v3","tier":"GeneralPurpose","capacity":2},"properties":{"fullyQualifiedDomainName":"azuredbclitest-2000003.postgres.database.azure.com","version":"12","minorVersion":"6","standbyCount":1,"haEnabled":"Enabled","administratorLogin":"amusedopossum8","publicNetworkAccess":"Disabled","delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003/subnets/Subnetbclitest-2000003"},"privateDnsZoneArguments":{"privateDnsZoneArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/azuredbclitest-2000003.private.postgres.database.azure.com"},"logBackupStorageSku":"Standard_ZRS","haState":"Healthy","state":"Ready","availabilityZone":"2","standbyAvailabilityZone":"1","storageProfile":{"storageMB":131072,"backupRetentionDays":7,"geoRedundantBackup":"Disabled"},"earliestRestoreDate":"2021-04-21T07:08:53.7995648+00:00","byokEnforcement":"Disabled","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0}},"location":"East + string: '{"sku":{"name":"Standard_D2s_v3","tier":"GeneralPurpose","capacity":2},"properties":{"fullyQualifiedDomainName":"azuredbclitest-2000003.postgres.database.azure.com","version":"12","minorVersion":"6","standbyCount":1,"haEnabled":"Enabled","administratorLogin":"amusedopossum8","publicNetworkAccess":"Disabled","delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003/subnets/Subnetazuredbclitest-2000003"},"privateDnsZoneArguments":{"privateDnsZoneArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/azuredbclitest-2000003.private.postgres.database.azure.com"},"logBackupStorageSku":"Standard_ZRS","haState":"Healthy","state":"Ready","availabilityZone":"2","standbyAvailabilityZone":"1","storageProfile":{"storageMB":131072,"backupRetentionDays":7,"geoRedundantBackup":"Disabled"},"earliestRestoreDate":"2021-04-21T07:08:53.7995648+00:00","byokEnforcement":"Disabled","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0}},"location":"East US 2 EUAP","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBforPostgreSQL/flexibleServers/azuredbclitest-2000003","name":"azuredbclitest-2000003","type":"Microsoft.DBforPostgreSQL/flexibleServers"}' headers: cache-control: @@ -5067,7 +5067,7 @@ interactions: uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBForPostgreSql/flexibleServers/azuredbclitest-2000003?api-version=2020-02-14-preview response: body: - string: '{"sku":{"name":"Standard_D2s_v3","tier":"GeneralPurpose","capacity":2},"properties":{"fullyQualifiedDomainName":"azuredbclitest-2000003.postgres.database.azure.com","version":"12","minorVersion":"6","standbyCount":1,"haEnabled":"Enabled","administratorLogin":"amusedopossum8","publicNetworkAccess":"Disabled","delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-2000003/subnets/Subnetbclitest-2000003"},"privateDnsZoneArguments":{"privateDnsZoneArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/azuredbclitest-2000003.private.postgres.database.azure.com"},"logBackupStorageSku":"Standard_ZRS","haState":"Healthy","state":"Ready","availabilityZone":"2","standbyAvailabilityZone":"1","storageProfile":{"storageMB":131072,"backupRetentionDays":7,"geoRedundantBackup":"Disabled"},"earliestRestoreDate":"2021-04-21T07:09:06.3997297+00:00","byokEnforcement":"Disabled","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0}},"location":"East + string: '{"sku":{"name":"Standard_D2s_v3","tier":"GeneralPurpose","capacity":2},"properties":{"fullyQualifiedDomainName":"azuredbclitest-2000003.postgres.database.azure.com","version":"12","minorVersion":"6","standbyCount":1,"haEnabled":"Enabled","administratorLogin":"amusedopossum8","publicNetworkAccess":"Disabled","delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-2000003/subnets/Subnetazuredbclitest-2000003"},"privateDnsZoneArguments":{"privateDnsZoneArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/azuredbclitest-2000003.private.postgres.database.azure.com"},"logBackupStorageSku":"Standard_ZRS","haState":"Healthy","state":"Ready","availabilityZone":"2","standbyAvailabilityZone":"1","storageProfile":{"storageMB":131072,"backupRetentionDays":7,"geoRedundantBackup":"Disabled"},"earliestRestoreDate":"2021-04-21T07:09:06.3997297+00:00","byokEnforcement":"Disabled","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0}},"location":"East US 2 EUAP","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBforPostgreSQL/flexibleServers/azuredbclitest-2000003","name":"azuredbclitest-2000003","type":"Microsoft.DBforPostgreSQL/flexibleServers"}' headers: cache-control: diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_postgres_flexible_server_vnet_mgmt_supplied_vname_and_subnetname.yaml b/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_postgres_flexible_server_vnet_mgmt_supplied_vname_and_subnetname.yaml index 62001976b37..aa79536396f 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_postgres_flexible_server_vnet_mgmt_supplied_vname_and_subnetname.yaml +++ b/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_postgres_flexible_server_vnet_mgmt_supplied_vname_and_subnetname.yaml @@ -7485,11 +7485,11 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-resource/16.1.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnetetserver6postgres?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnettestvnetserver6postgres?api-version=2021-02-01 response: body: string: "{\r\n \"error\": {\r\n \"code\": \"NotFound\",\r\n \"message\": - \"Resource /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnetetserver6postgres + \"Resource /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnettestvnetserver6postgres not found.\",\r\n \"details\": []\r\n }\r\n}" headers: cache-control: @@ -7575,7 +7575,7 @@ interactions: code: 200 message: OK - request: - body: '{"name": "Subnetetserver6postgres", "properties": {"addressPrefix": "10.0.0.0/24", + body: '{"name": "Subnettestvnetserver6postgres", "properties": {"addressPrefix": "10.0.0.0/24", "delegations": [{"name": "Microsoft.DBforPostgreSQL/flexibleServers", "properties": {"serviceName": "Microsoft.DBforPostgreSQL/flexibleServers"}}]}}' headers: @@ -7596,14 +7596,14 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnetetserver6postgres?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnettestvnetserver6postgres?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Subnetetserver6postgres\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnetetserver6postgres\",\r\n + string: "{\r\n \"name\": \"Subnettestvnetserver6postgres\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnettestvnetserver6postgres\",\r\n \ \"etag\": \"W/\\\"f2422b6b-4cfa-4f47-90f7-9feb66dcb449\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \"addressPrefix\": \"10.0.0.0/24\",\r\n \ \"delegations\": [\r\n {\r\n \"name\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnetetserver6postgres/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnettestvnetserver6postgres/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n \ \"etag\": \"W/\\\"f2422b6b-4cfa-4f47-90f7-9feb66dcb449\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"serviceName\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n @@ -7706,14 +7706,14 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnetetserver6postgres?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnettestvnetserver6postgres?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Subnetetserver6postgres\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnetetserver6postgres\",\r\n + string: "{\r\n \"name\": \"Subnettestvnetserver6postgres\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnettestvnetserver6postgres\",\r\n \ \"etag\": \"W/\\\"dd56cf9b-8c5c-45e6-81ba-98ba9c5c7f13\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"addressPrefix\": \"10.0.0.0/24\",\r\n \ \"delegations\": [\r\n {\r\n \"name\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnetetserver6postgres/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnettestvnetserver6postgres/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n \ \"etag\": \"W/\\\"dd56cf9b-8c5c-45e6-81ba-98ba9c5c7f13\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"serviceName\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n @@ -7830,13 +7830,13 @@ interactions: \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"resourceGuid\": \"1125ebb6-6cd9-4bdd-bd41-2158274b14ce\",\r\n \"addressSpace\": {\r\n \"addressPrefixes\": [\r\n \"10.0.0.0/16\"\r\n ]\r\n },\r\n \"subnets\": [\r\n - \ {\r\n \"name\": \"Subnetetserver6postgres\",\r\n \"id\": - \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnetetserver6postgres\",\r\n + \ {\r\n \"name\": \"Subnettestvnetserver6postgres\",\r\n \"id\": + \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnettestvnetserver6postgres\",\r\n \ \"etag\": \"W/\\\"dd56cf9b-8c5c-45e6-81ba-98ba9c5c7f13\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"addressPrefix\": \"10.0.0.0/24\",\r\n \"delegations\": [\r\n {\r\n \"name\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnetetserver6postgres/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnettestvnetserver6postgres/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n \ \"etag\": \"W/\\\"dd56cf9b-8c5c-45e6-81ba-98ba9c5c7f13\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"serviceName\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n @@ -9818,7 +9818,7 @@ interactions: "GeneralPurpose"}, "properties": {"administratorLogin": "fluidoxbird6", "administratorLoginPassword": "FGWWz1C75FXDeE0UvmOZCw", "version": "12", "storageProfile": {"backupRetentionDays": 7, "storageMB": 131072}, "haEnabled": "Disabled", "delegatedSubnetArguments": - {"subnetArmResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnetetserver6postgres"}, + {"subnetArmResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnettestvnetserver6postgres"}, "privateDnsZoneArguments": {"privateDnsZoneArmResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/testvnetserver6postgres.private.postgres.database.azure.com"}, "createMode": "Default"}}' headers: @@ -10122,7 +10122,7 @@ interactions: uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBForPostgreSql/flexibleServers/testvnetserver6postgres?api-version=2020-02-14-preview response: body: - string: '{"sku":{"capacity":2,"name":"Standard_D2s_v3","tier":"GeneralPurpose"},"properties":{"fullyQualifiedDomainName":"testvnetserver6postgres.postgres.database.azure.com","version":"12","minorVersion":"6","standbyCount":0,"haEnabled":"Disabled","administratorLogin":"fluidoxbird6","publicNetworkAccess":"Disabled","delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnetetserver6postgres"},"privateDnsZoneArguments":{"privateDnsZoneArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/testvnetserver6postgres.private.postgres.database.azure.com"},"logBackupStorageSku":"Standard_ZRS","haState":"NotEnabled","state":"Ready","availabilityZone":"1","storageProfile":{"storageMB":131072,"backupRetentionDays":7,"geoRedundantBackup":"Disabled"},"earliestRestoreDate":"2021-05-13T06:51:19.632069+00:00","byokEnforcement":"Disabled","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0}},"location":"East + string: '{"sku":{"capacity":2,"name":"Standard_D2s_v3","tier":"GeneralPurpose"},"properties":{"fullyQualifiedDomainName":"testvnetserver6postgres.postgres.database.azure.com","version":"12","minorVersion":"6","standbyCount":0,"haEnabled":"Disabled","administratorLogin":"fluidoxbird6","publicNetworkAccess":"Disabled","delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnettestvnetserver6postgres"},"privateDnsZoneArguments":{"privateDnsZoneArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/testvnetserver6postgres.private.postgres.database.azure.com"},"logBackupStorageSku":"Standard_ZRS","haState":"NotEnabled","state":"Ready","availabilityZone":"1","storageProfile":{"storageMB":131072,"backupRetentionDays":7,"geoRedundantBackup":"Disabled"},"earliestRestoreDate":"2021-05-13T06:51:19.632069+00:00","byokEnforcement":"Disabled","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0}},"location":"East US 2 EUAP","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBforPostgreSQL/flexibleServers/testvnetserver6postgres","name":"testvnetserver6postgres","type":"Microsoft.DBforPostgreSQL/flexibleServers"}' headers: cache-control: @@ -10639,7 +10639,7 @@ interactions: uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBForPostgreSql/flexibleServers/testvnetserver6postgres?api-version=2020-02-14-preview response: body: - string: '{"sku":{"capacity":2,"name":"Standard_D2s_v3","tier":"GeneralPurpose"},"properties":{"fullyQualifiedDomainName":"testvnetserver6postgres.postgres.database.azure.com","version":"12","minorVersion":"6","standbyCount":0,"haEnabled":"Disabled","administratorLogin":"fluidoxbird6","publicNetworkAccess":"Disabled","delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnetetserver6postgres"},"privateDnsZoneArguments":{"privateDnsZoneArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/testvnetserver6postgres.private.postgres.database.azure.com"},"logBackupStorageSku":"Standard_ZRS","haState":"NotEnabled","state":"Ready","availabilityZone":"1","storageProfile":{"storageMB":131072,"backupRetentionDays":7,"geoRedundantBackup":"Disabled"},"earliestRestoreDate":"2021-05-13T06:51:38.5385315+00:00","byokEnforcement":"Disabled","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0}},"location":"East + string: '{"sku":{"capacity":2,"name":"Standard_D2s_v3","tier":"GeneralPurpose"},"properties":{"fullyQualifiedDomainName":"testvnetserver6postgres.postgres.database.azure.com","version":"12","minorVersion":"6","standbyCount":0,"haEnabled":"Disabled","administratorLogin":"fluidoxbird6","publicNetworkAccess":"Disabled","delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet6/subnets/Subnettestvnetserver6postgres"},"privateDnsZoneArguments":{"privateDnsZoneArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/testvnetserver6postgres.private.postgres.database.azure.com"},"logBackupStorageSku":"Standard_ZRS","haState":"NotEnabled","state":"Ready","availabilityZone":"1","storageProfile":{"storageMB":131072,"backupRetentionDays":7,"geoRedundantBackup":"Disabled"},"earliestRestoreDate":"2021-05-13T06:51:38.5385315+00:00","byokEnforcement":"Disabled","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0}},"location":"East US 2 EUAP","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBforPostgreSQL/flexibleServers/testvnetserver6postgres","name":"testvnetserver6postgres","type":"Microsoft.DBforPostgreSQL/flexibleServers"}' headers: cache-control: diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_postgres_flexible_server_vnet_mgmt_supplied_vnet.yaml b/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_postgres_flexible_server_vnet_mgmt_supplied_vnet.yaml index 637110ab6d2..8f5a81848eb 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_postgres_flexible_server_vnet_mgmt_supplied_vnet.yaml +++ b/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_postgres_flexible_server_vnet_mgmt_supplied_vnet.yaml @@ -2,7 +2,7 @@ interactions: - request: body: '{"location": "eastus2euap", "tags": {}, "properties": {"addressSpace": {"addressPrefixes": ["10.0.0.0/16"]}, "dhcpOptions": {}, "subnets": [{"name": - "Subnetetserver3postgres", "properties": {"addressPrefix": "10.0.0.0/24"}}]}}' + "Subnettestvnetserver3postgres", "properties": {"addressPrefix": "10.0.0.0/24"}}]}}' headers: Accept: - application/json @@ -31,8 +31,8 @@ interactions: \ \"resourceGuid\": \"e172df35-afcf-4895-afff-e0e336f81b7e\",\r\n \"addressSpace\": {\r\n \"addressPrefixes\": [\r\n \"10.0.0.0/16\"\r\n ]\r\n \ },\r\n \"dhcpOptions\": {\r\n \"dnsServers\": []\r\n },\r\n - \ \"subnets\": [\r\n {\r\n \"name\": \"Subnetetserver3postgres\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3postgres\",\r\n + \ \"subnets\": [\r\n {\r\n \"name\": \"Subnettestvnetserver3postgres\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3postgres\",\r\n \ \"etag\": \"W/\\\"0e91a4f9-6095-4cf3-823c-518ea598799b\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \ \"addressPrefix\": \"10.0.0.0/24\",\r\n \"delegations\": @@ -146,8 +146,8 @@ interactions: \ \"resourceGuid\": \"e172df35-afcf-4895-afff-e0e336f81b7e\",\r\n \"addressSpace\": {\r\n \"addressPrefixes\": [\r\n \"10.0.0.0/16\"\r\n ]\r\n \ },\r\n \"dhcpOptions\": {\r\n \"dnsServers\": []\r\n },\r\n - \ \"subnets\": [\r\n {\r\n \"name\": \"Subnetetserver3postgres\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3postgres\",\r\n + \ \"subnets\": [\r\n {\r\n \"name\": \"Subnettestvnetserver3postgres\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3postgres\",\r\n \ \"etag\": \"W/\\\"7e3e6f89-d099-496d-92fe-d2221f469b8f\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"addressPrefix\": \"10.0.0.0/24\",\r\n \"delegations\": @@ -1119,8 +1119,8 @@ interactions: \ \"resourceGuid\": \"e172df35-afcf-4895-afff-e0e336f81b7e\",\r\n \"addressSpace\": {\r\n \"addressPrefixes\": [\r\n \"10.0.0.0/16\"\r\n ]\r\n \ },\r\n \"dhcpOptions\": {\r\n \"dnsServers\": []\r\n },\r\n - \ \"subnets\": [\r\n {\r\n \"name\": \"Subnetetserver3postgres\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3postgres\",\r\n + \ \"subnets\": [\r\n {\r\n \"name\": \"Subnettestvnetserver3postgres\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3postgres\",\r\n \ \"etag\": \"W/\\\"7e3e6f89-d099-496d-92fe-d2221f469b8f\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"addressPrefix\": \"10.0.0.0/24\",\r\n \"delegations\": @@ -1185,8 +1185,8 @@ interactions: \ \"resourceGuid\": \"e172df35-afcf-4895-afff-e0e336f81b7e\",\r\n \"addressSpace\": {\r\n \"addressPrefixes\": [\r\n \"10.0.0.0/16\"\r\n ]\r\n \ },\r\n \"dhcpOptions\": {\r\n \"dnsServers\": []\r\n },\r\n - \ \"subnets\": [\r\n {\r\n \"name\": \"Subnetetserver3postgres\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3postgres\",\r\n + \ \"subnets\": [\r\n {\r\n \"name\": \"Subnettestvnetserver3postgres\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3postgres\",\r\n \ \"etag\": \"W/\\\"7e3e6f89-d099-496d-92fe-d2221f469b8f\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"addressPrefix\": \"10.0.0.0/24\",\r\n \"delegations\": @@ -2012,10 +2012,10 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-resource/16.1.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3postgres?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3postgres?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Subnetetserver3postgres\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3postgres\",\r\n + string: "{\r\n \"name\": \"Subnettestvnetserver3postgres\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3postgres\",\r\n \ \"etag\": \"W/\\\"7e3e6f89-d099-496d-92fe-d2221f469b8f\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"addressPrefix\": \"10.0.0.0/24\",\r\n \ \"delegations\": [],\r\n \"privateEndpointNetworkPolicies\": \"Enabled\",\r\n @@ -2839,10 +2839,10 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-resource/16.1.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3postgres?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3postgres?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Subnetetserver3postgres\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3postgres\",\r\n + string: "{\r\n \"name\": \"Subnettestvnetserver3postgres\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3postgres\",\r\n \ \"etag\": \"W/\\\"7e3e6f89-d099-496d-92fe-d2221f469b8f\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"addressPrefix\": \"10.0.0.0/24\",\r\n \ \"delegations\": [],\r\n \"privateEndpointNetworkPolicies\": \"Enabled\",\r\n @@ -2895,10 +2895,10 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3postgres?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3postgres?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Subnetetserver3postgres\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3postgres\",\r\n + string: "{\r\n \"name\": \"Subnettestvnetserver3postgres\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3postgres\",\r\n \ \"etag\": \"W/\\\"7e3e6f89-d099-496d-92fe-d2221f469b8f\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"addressPrefix\": \"10.0.0.0/24\",\r\n \ \"delegations\": [],\r\n \"privateEndpointNetworkPolicies\": \"Enabled\",\r\n @@ -2936,8 +2936,8 @@ interactions: code: 200 message: OK - request: - body: '{"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3postgres", - "name": "Subnetetserver3postgres", "properties": {"addressPrefix": "10.0.0.0/24", + body: '{"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3postgres", + "name": "Subnettestvnetserver3postgres", "properties": {"addressPrefix": "10.0.0.0/24", "delegations": [{"name": "Microsoft.DBforPostgreSQL/flexibleServers", "properties": {"serviceName": "Microsoft.DBforPostgreSQL/flexibleServers"}}], "privateEndpointNetworkPolicies": "Enabled", "privateLinkServiceNetworkPolicies": "Enabled"}}' @@ -2959,14 +2959,14 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3postgres?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3postgres?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Subnetetserver3postgres\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3postgres\",\r\n + string: "{\r\n \"name\": \"Subnettestvnetserver3postgres\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3postgres\",\r\n \ \"etag\": \"W/\\\"6154a677-183a-4b2a-9607-ac7e1436ba6b\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \"addressPrefix\": \"10.0.0.0/24\",\r\n \ \"delegations\": [\r\n {\r\n \"name\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3postgres/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3postgres/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n \ \"etag\": \"W/\\\"6154a677-183a-4b2a-9607-ac7e1436ba6b\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"serviceName\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n @@ -3073,14 +3073,14 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3postgres?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3postgres?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Subnetetserver3postgres\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3postgres\",\r\n + string: "{\r\n \"name\": \"Subnettestvnetserver3postgres\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3postgres\",\r\n \ \"etag\": \"W/\\\"b73b9bd6-b03b-4d01-a915-365504a1aa69\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"addressPrefix\": \"10.0.0.0/24\",\r\n \ \"delegations\": [\r\n {\r\n \"name\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3postgres/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3postgres/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n \ \"etag\": \"W/\\\"b73b9bd6-b03b-4d01-a915-365504a1aa69\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"serviceName\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n @@ -3198,13 +3198,13 @@ interactions: \ \"resourceGuid\": \"e172df35-afcf-4895-afff-e0e336f81b7e\",\r\n \"addressSpace\": {\r\n \"addressPrefixes\": [\r\n \"10.0.0.0/16\"\r\n ]\r\n \ },\r\n \"dhcpOptions\": {\r\n \"dnsServers\": []\r\n },\r\n - \ \"subnets\": [\r\n {\r\n \"name\": \"Subnetetserver3postgres\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3postgres\",\r\n + \ \"subnets\": [\r\n {\r\n \"name\": \"Subnettestvnetserver3postgres\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3postgres\",\r\n \ \"etag\": \"W/\\\"b73b9bd6-b03b-4d01-a915-365504a1aa69\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"addressPrefix\": \"10.0.0.0/24\",\r\n \"delegations\": [\r\n {\r\n \"name\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3postgres/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3postgres/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n \ \"etag\": \"W/\\\"b73b9bd6-b03b-4d01-a915-365504a1aa69\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"serviceName\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n @@ -5186,7 +5186,7 @@ interactions: "GeneralPurpose"}, "properties": {"administratorLogin": "nearbadger1", "administratorLoginPassword": "msRyWPl0jdcpnxTs_LvDjw", "version": "12", "storageProfile": {"backupRetentionDays": 7, "storageMB": 131072}, "haEnabled": "Disabled", "delegatedSubnetArguments": - {"subnetArmResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3postgres"}, + {"subnetArmResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3postgres"}, "privateDnsZoneArguments": {"privateDnsZoneArmResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/testvnetserver3postgres.private.postgres.database.azure.com"}, "createMode": "Default"}}' headers: @@ -5489,7 +5489,7 @@ interactions: uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBForPostgreSql/flexibleServers/testvnetserver3postgres?api-version=2020-02-14-preview response: body: - string: '{"sku":{"capacity":2,"name":"Standard_D2s_v3","tier":"GeneralPurpose"},"properties":{"fullyQualifiedDomainName":"testvnetserver3postgres.postgres.database.azure.com","version":"12","minorVersion":"6","standbyCount":0,"haEnabled":"Disabled","administratorLogin":"nearbadger1","publicNetworkAccess":"Disabled","delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3postgres"},"privateDnsZoneArguments":{"privateDnsZoneArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/testvnetserver3postgres.private.postgres.database.azure.com"},"logBackupStorageSku":"Standard_ZRS","haState":"NotEnabled","state":"Ready","availabilityZone":"1","storageProfile":{"storageMB":131072,"backupRetentionDays":7,"geoRedundantBackup":"Disabled"},"earliestRestoreDate":"2021-05-13T06:46:34.3014034+00:00","byokEnforcement":"Disabled","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0}},"location":"East + string: '{"sku":{"capacity":2,"name":"Standard_D2s_v3","tier":"GeneralPurpose"},"properties":{"fullyQualifiedDomainName":"testvnetserver3postgres.postgres.database.azure.com","version":"12","minorVersion":"6","standbyCount":0,"haEnabled":"Disabled","administratorLogin":"nearbadger1","publicNetworkAccess":"Disabled","delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3postgres"},"privateDnsZoneArguments":{"privateDnsZoneArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/testvnetserver3postgres.private.postgres.database.azure.com"},"logBackupStorageSku":"Standard_ZRS","haState":"NotEnabled","state":"Ready","availabilityZone":"1","storageProfile":{"storageMB":131072,"backupRetentionDays":7,"geoRedundantBackup":"Disabled"},"earliestRestoreDate":"2021-05-13T06:46:34.3014034+00:00","byokEnforcement":"Disabled","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0}},"location":"East US 2 EUAP","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBforPostgreSQL/flexibleServers/testvnetserver3postgres","name":"testvnetserver3postgres","type":"Microsoft.DBforPostgreSQL/flexibleServers"}' headers: cache-control: @@ -7613,11 +7613,11 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-resource/16.1.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnetetserver4postgres?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnettestvnetserver4postgres?api-version=2021-02-01 response: body: string: "{\r\n \"error\": {\r\n \"code\": \"NotFound\",\r\n \"message\": - \"Resource /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnetetserver4postgres + \"Resource /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnettestvnetserver4postgres not found.\",\r\n \"details\": []\r\n }\r\n}" headers: cache-control: @@ -7703,7 +7703,7 @@ interactions: code: 200 message: OK - request: - body: '{"name": "Subnetetserver4postgres", "properties": {"addressPrefix": "10.0.0.0/24", + body: '{"name": "Subnettestvnetserver4postgres", "properties": {"addressPrefix": "10.0.0.0/24", "delegations": [{"name": "Microsoft.DBforPostgreSQL/flexibleServers", "properties": {"serviceName": "Microsoft.DBforPostgreSQL/flexibleServers"}}]}}' headers: @@ -7724,14 +7724,14 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnetetserver4postgres?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnettestvnetserver4postgres?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Subnetetserver4postgres\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnetetserver4postgres\",\r\n + string: "{\r\n \"name\": \"Subnettestvnetserver4postgres\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnettestvnetserver4postgres\",\r\n \ \"etag\": \"W/\\\"1c81b4b4-b0b2-4129-b53d-edc5939e7a56\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \"addressPrefix\": \"10.0.0.0/24\",\r\n \ \"delegations\": [\r\n {\r\n \"name\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnetetserver4postgres/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnettestvnetserver4postgres/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n \ \"etag\": \"W/\\\"1c81b4b4-b0b2-4129-b53d-edc5939e7a56\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"serviceName\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n @@ -7834,14 +7834,14 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnetetserver4postgres?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnettestvnetserver4postgres?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Subnetetserver4postgres\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnetetserver4postgres\",\r\n + string: "{\r\n \"name\": \"Subnettestvnetserver4postgres\",\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnettestvnetserver4postgres\",\r\n \ \"etag\": \"W/\\\"1bbd9b08-ccba-4d72-a827-d3fbe35370cd\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"addressPrefix\": \"10.0.0.0/24\",\r\n \ \"delegations\": [\r\n {\r\n \"name\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnetetserver4postgres/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnettestvnetserver4postgres/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n \ \"etag\": \"W/\\\"1bbd9b08-ccba-4d72-a827-d3fbe35370cd\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"serviceName\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n @@ -7958,13 +7958,13 @@ interactions: \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"resourceGuid\": \"e5e325c1-1684-40d8-b417-a43622a74e92\",\r\n \"addressSpace\": {\r\n \"addressPrefixes\": [\r\n \"10.0.0.0/16\"\r\n ]\r\n },\r\n \"subnets\": [\r\n - \ {\r\n \"name\": \"Subnetetserver4postgres\",\r\n \"id\": - \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnetetserver4postgres\",\r\n + \ {\r\n \"name\": \"Subnettestvnetserver4postgres\",\r\n \"id\": + \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnettestvnetserver4postgres\",\r\n \ \"etag\": \"W/\\\"1bbd9b08-ccba-4d72-a827-d3fbe35370cd\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"addressPrefix\": \"10.0.0.0/24\",\r\n \"delegations\": [\r\n {\r\n \"name\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnetetserver4postgres/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnettestvnetserver4postgres/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n \ \"etag\": \"W/\\\"1bbd9b08-ccba-4d72-a827-d3fbe35370cd\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"serviceName\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n @@ -9946,7 +9946,7 @@ interactions: "GeneralPurpose"}, "properties": {"administratorLogin": "amusedlollies4", "administratorLoginPassword": "yf0l2RXlUcSkCDkZyFz1ow", "version": "12", "storageProfile": {"backupRetentionDays": 7, "storageMB": 131072}, "haEnabled": "Disabled", "delegatedSubnetArguments": - {"subnetArmResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnetetserver4postgres"}, + {"subnetArmResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnettestvnetserver4postgres"}, "privateDnsZoneArguments": {"privateDnsZoneArmResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/testvnetserver4postgres.private.postgres.database.azure.com"}, "createMode": "Default"}}' headers: @@ -10202,7 +10202,7 @@ interactions: uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBForPostgreSql/flexibleServers/testvnetserver4postgres?api-version=2020-02-14-preview response: body: - string: '{"sku":{"capacity":2,"name":"Standard_D2s_v3","tier":"GeneralPurpose"},"properties":{"fullyQualifiedDomainName":"testvnetserver4postgres.postgres.database.azure.com","version":"12","minorVersion":"6","standbyCount":0,"haEnabled":"Disabled","administratorLogin":"amusedlollies4","publicNetworkAccess":"Disabled","delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnetetserver4postgres"},"privateDnsZoneArguments":{"privateDnsZoneArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/testvnetserver4postgres.private.postgres.database.azure.com"},"logBackupStorageSku":"Standard_ZRS","haState":"NotEnabled","state":"Ready","availabilityZone":"1","storageProfile":{"storageMB":131072,"backupRetentionDays":7,"geoRedundantBackup":"Disabled"},"earliestRestoreDate":"2021-05-13T06:52:17.5997429+00:00","byokEnforcement":"Disabled","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0}},"location":"East + string: '{"sku":{"capacity":2,"name":"Standard_D2s_v3","tier":"GeneralPurpose"},"properties":{"fullyQualifiedDomainName":"testvnetserver4postgres.postgres.database.azure.com","version":"12","minorVersion":"6","standbyCount":0,"haEnabled":"Disabled","administratorLogin":"amusedlollies4","publicNetworkAccess":"Disabled","delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnettestvnetserver4postgres"},"privateDnsZoneArguments":{"privateDnsZoneArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/testvnetserver4postgres.private.postgres.database.azure.com"},"logBackupStorageSku":"Standard_ZRS","haState":"NotEnabled","state":"Ready","availabilityZone":"1","storageProfile":{"storageMB":131072,"backupRetentionDays":7,"geoRedundantBackup":"Disabled"},"earliestRestoreDate":"2021-05-13T06:52:17.5997429+00:00","byokEnforcement":"Disabled","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0}},"location":"East US 2 EUAP","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBforPostgreSQL/flexibleServers/testvnetserver4postgres","name":"testvnetserver4postgres","type":"Microsoft.DBforPostgreSQL/flexibleServers"}' headers: cache-control: @@ -10484,7 +10484,7 @@ interactions: uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBForPostgreSql/flexibleServers/testvnetserver3postgres?api-version=2020-02-14-preview response: body: - string: '{"sku":{"capacity":2,"name":"Standard_D2s_v3","tier":"GeneralPurpose"},"properties":{"fullyQualifiedDomainName":"testvnetserver3postgres.postgres.database.azure.com","version":"12","minorVersion":"6","standbyCount":0,"haEnabled":"Disabled","administratorLogin":"nearbadger1","publicNetworkAccess":"Disabled","delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnetetserver3postgres"},"privateDnsZoneArguments":{"privateDnsZoneArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/testvnetserver3postgres.private.postgres.database.azure.com"},"logBackupStorageSku":"Standard_ZRS","haState":"NotEnabled","state":"Ready","availabilityZone":"1","storageProfile":{"storageMB":131072,"backupRetentionDays":7,"geoRedundantBackup":"Disabled"},"earliestRestoreDate":"2021-05-13T06:52:31.6390431+00:00","byokEnforcement":"Disabled","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0}},"location":"East + string: '{"sku":{"capacity":2,"name":"Standard_D2s_v3","tier":"GeneralPurpose"},"properties":{"fullyQualifiedDomainName":"testvnetserver3postgres.postgres.database.azure.com","version":"12","minorVersion":"6","standbyCount":0,"haEnabled":"Disabled","administratorLogin":"nearbadger1","publicNetworkAccess":"Disabled","delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet2/subnets/Subnettestvnetserver3postgres"},"privateDnsZoneArguments":{"privateDnsZoneArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/testvnetserver3postgres.private.postgres.database.azure.com"},"logBackupStorageSku":"Standard_ZRS","haState":"NotEnabled","state":"Ready","availabilityZone":"1","storageProfile":{"storageMB":131072,"backupRetentionDays":7,"geoRedundantBackup":"Disabled"},"earliestRestoreDate":"2021-05-13T06:52:31.6390431+00:00","byokEnforcement":"Disabled","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0}},"location":"East US 2 EUAP","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBforPostgreSQL/flexibleServers/testvnetserver3postgres","name":"testvnetserver3postgres","type":"Microsoft.DBforPostgreSQL/flexibleServers"}' headers: cache-control: @@ -10531,7 +10531,7 @@ interactions: uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBForPostgreSql/flexibleServers/testvnetserver4postgres?api-version=2020-02-14-preview response: body: - string: '{"sku":{"capacity":2,"name":"Standard_D2s_v3","tier":"GeneralPurpose"},"properties":{"fullyQualifiedDomainName":"testvnetserver4postgres.postgres.database.azure.com","version":"12","minorVersion":"6","standbyCount":0,"haEnabled":"Disabled","administratorLogin":"amusedlollies4","publicNetworkAccess":"Disabled","delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnetetserver4postgres"},"privateDnsZoneArguments":{"privateDnsZoneArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/testvnetserver4postgres.private.postgres.database.azure.com"},"logBackupStorageSku":"Standard_ZRS","haState":"NotEnabled","state":"Ready","availabilityZone":"1","storageProfile":{"storageMB":131072,"backupRetentionDays":7,"geoRedundantBackup":"Disabled"},"earliestRestoreDate":"2021-05-13T06:52:32.0846838+00:00","byokEnforcement":"Disabled","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0}},"location":"East + string: '{"sku":{"capacity":2,"name":"Standard_D2s_v3","tier":"GeneralPurpose"},"properties":{"fullyQualifiedDomainName":"testvnetserver4postgres.postgres.database.azure.com","version":"12","minorVersion":"6","standbyCount":0,"haEnabled":"Disabled","administratorLogin":"amusedlollies4","publicNetworkAccess":"Disabled","delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/clitestvnet3/subnets/Subnettestvnetserver4postgres"},"privateDnsZoneArguments":{"privateDnsZoneArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/testvnetserver4postgres.private.postgres.database.azure.com"},"logBackupStorageSku":"Standard_ZRS","haState":"NotEnabled","state":"Ready","availabilityZone":"1","storageProfile":{"storageMB":131072,"backupRetentionDays":7,"geoRedundantBackup":"Disabled"},"earliestRestoreDate":"2021-05-13T06:52:32.0846838+00:00","byokEnforcement":"Disabled","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0}},"location":"East US 2 EUAP","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBforPostgreSQL/flexibleServers/testvnetserver4postgres","name":"testvnetserver4postgres","type":"Microsoft.DBforPostgreSQL/flexibleServers"}' headers: cache-control: diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_postgres_flexible_server_vnet_server_create.yaml b/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_postgres_flexible_server_vnet_server_create.yaml index c60bca2a977..8ced500416d 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_postgres_flexible_server_vnet_server_create.yaml +++ b/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_postgres_flexible_server_vnet_server_create.yaml @@ -922,10 +922,10 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-resource/16.1.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002?api-version=2021-02-01 response: body: - string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/virtualNetworks/Vnetbclitest-000002'' + string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002'' under resource group ''clitest.rg000001'' was not found. For more details please go to https://aka.ms/ARMResourceNotFoundFix"}}' headers: @@ -971,11 +971,11 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Vnetbclitest-000002\",\r\n \"id\": - \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002\",\r\n + string: "{\r\n \"name\": \"Vnetazuredbclitest-000002\",\r\n \"id\": + \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002\",\r\n \ \"etag\": \"W/\\\"80a4beba-1756-4351-a35d-2d37f60c5d66\\\"\",\r\n \"type\": \"Microsoft.Network/virtualNetworks\",\r\n \"location\": \"eastus2euap\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \"resourceGuid\": @@ -1079,11 +1079,11 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Vnetbclitest-000002\",\r\n \"id\": - \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002\",\r\n + string: "{\r\n \"name\": \"Vnetazuredbclitest-000002\",\r\n \"id\": + \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002\",\r\n \ \"etag\": \"W/\\\"ab18e4e0-b437-4d9f-9436-4a123e8201cb\\\"\",\r\n \"type\": \"Microsoft.Network/virtualNetworks\",\r\n \"location\": \"eastus2euap\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"resourceGuid\": @@ -1909,11 +1909,11 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-resource/16.1.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002/subnets/Subnetbclitest-000002?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002/subnets/Subnetazuredbclitest-000002?api-version=2021-02-01 response: body: string: "{\r\n \"error\": {\r\n \"code\": \"NotFound\",\r\n \"message\": - \"Resource /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002/subnets/Subnetbclitest-000002 + \"Resource /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002/subnets/Subnetazuredbclitest-000002 not found.\",\r\n \"details\": []\r\n }\r\n}" headers: cache-control: @@ -1956,11 +1956,11 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Vnetbclitest-000002\",\r\n \"id\": - \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002\",\r\n + string: "{\r\n \"name\": \"Vnetazuredbclitest-000002\",\r\n \"id\": + \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002\",\r\n \ \"etag\": \"W/\\\"ab18e4e0-b437-4d9f-9436-4a123e8201cb\\\"\",\r\n \"type\": \"Microsoft.Network/virtualNetworks\",\r\n \"location\": \"eastus2euap\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"resourceGuid\": @@ -2000,7 +2000,7 @@ interactions: code: 200 message: OK - request: - body: '{"name": "Subnetbclitest-000002", "properties": {"addressPrefix": + body: '{"name": "Subnetazuredbclitest-000002", "properties": {"addressPrefix": "10.0.0.0/24", "delegations": [{"name": "Microsoft.DBforPostgreSQL/flexibleServers", "properties": {"serviceName": "Microsoft.DBforPostgreSQL/flexibleServers"}}]}}' headers: @@ -2021,15 +2021,15 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002/subnets/Subnetbclitest-000002?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002/subnets/Subnetazuredbclitest-000002?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Subnetbclitest-000002\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002/subnets/Subnetbclitest-000002\",\r\n + string: "{\r\n \"name\": \"Subnetazuredbclitest-000002\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002/subnets/Subnetazuredbclitest-000002\",\r\n \ \"etag\": \"W/\\\"bcdcdcc3-77ae-4b05-a625-b37486b93198\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Updating\",\r\n \"addressPrefix\": \"10.0.0.0/24\",\r\n \ \"delegations\": [\r\n {\r\n \"name\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002/subnets/Subnetbclitest-000002/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002/subnets/Subnetazuredbclitest-000002/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n \ \"etag\": \"W/\\\"bcdcdcc3-77ae-4b05-a625-b37486b93198\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"serviceName\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n @@ -2132,15 +2132,15 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002/subnets/Subnetbclitest-000002?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002/subnets/Subnetazuredbclitest-000002?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Subnetbclitest-000002\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002/subnets/Subnetbclitest-000002\",\r\n + string: "{\r\n \"name\": \"Subnetazuredbclitest-000002\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002/subnets/Subnetazuredbclitest-000002\",\r\n \ \"etag\": \"W/\\\"e85df0a1-2240-4a61-908e-1a63718bf4de\\\"\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"addressPrefix\": \"10.0.0.0/24\",\r\n \ \"delegations\": [\r\n {\r\n \"name\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002/subnets/Subnetbclitest-000002/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002/subnets/Subnetazuredbclitest-000002/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n \ \"etag\": \"W/\\\"e85df0a1-2240-4a61-908e-1a63718bf4de\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"serviceName\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n @@ -2248,23 +2248,23 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002?api-version=2021-02-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002?api-version=2021-02-01 response: body: - string: "{\r\n \"name\": \"Vnetbclitest-000002\",\r\n \"id\": - \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002\",\r\n + string: "{\r\n \"name\": \"Vnetazuredbclitest-000002\",\r\n \"id\": + \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002\",\r\n \ \"etag\": \"W/\\\"e85df0a1-2240-4a61-908e-1a63718bf4de\\\"\",\r\n \"type\": \"Microsoft.Network/virtualNetworks\",\r\n \"location\": \"eastus2euap\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"resourceGuid\": \"dd743783-9815-4cd5-846c-29a209ce4bea\",\r\n \"addressSpace\": {\r\n \"addressPrefixes\": [\r\n \"10.0.0.0/16\"\r\n ]\r\n },\r\n \"subnets\": [\r\n - \ {\r\n \"name\": \"Subnetbclitest-000002\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002/subnets/Subnetbclitest-000002\",\r\n + \ {\r\n \"name\": \"Subnetazuredbclitest-000002\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002/subnets/Subnetazuredbclitest-000002\",\r\n \ \"etag\": \"W/\\\"e85df0a1-2240-4a61-908e-1a63718bf4de\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \ \"addressPrefix\": \"10.0.0.0/24\",\r\n \"delegations\": [\r\n {\r\n \"name\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n - \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002/subnets/Subnetbclitest-000002/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n + \ \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002/subnets/Subnetazuredbclitest-000002/delegations/Microsoft.DBforPostgreSQL/flexibleServers\",\r\n \ \"etag\": \"W/\\\"e85df0a1-2240-4a61-908e-1a63718bf4de\\\"\",\r\n \ \"properties\": {\r\n \"provisioningState\": \"Succeeded\",\r\n \"serviceName\": \"Microsoft.DBforPostgreSQL/flexibleServers\",\r\n @@ -4089,7 +4089,7 @@ interactions: code: 200 message: OK - request: - body: '{"location": "global", "properties": {"virtualNetwork": {"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002"}, + body: '{"location": "global", "properties": {"virtualNetwork": {"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002"}, "registrationEnabled": true}}' headers: Accept: @@ -4111,7 +4111,7 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-mgmt-privatedns/1.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/testdnsname.private.postgres.database.azure.com/virtualNetworkLinks/Vnetbclitest-000002-link?api-version=2018-09-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/testdnsname.private.postgres.database.azure.com/virtualNetworkLinks/Vnetazuredbclitest-000002-link?api-version=2018-09-01 response: body: string: '{}' @@ -4207,10 +4207,10 @@ interactions: User-Agent: - AZURECLI/2.23.0 azsdk-python-mgmt-privatedns/1.0.0 Python/3.7.7 (Windows-10-10.0.19041-SP0) method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/testdnsname.private.postgres.database.azure.com/virtualNetworkLinks/Vnetbclitest-000002-link?api-version=2018-09-01 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/testdnsname.private.postgres.database.azure.com/virtualNetworkLinks/Vnetazuredbclitest-000002-link?api-version=2018-09-01 response: body: - string: '{"id":"\/subscriptions\/00000000-0000-0000-0000-000000000000\/resourceGroups\/clitest.rg000001\/providers\/Microsoft.Network\/privateDnsZones\/testdnsname.private.postgres.database.azure.com\/virtualNetworkLinks\/Vnetbclitest-000002-link","name":"Vnetbclitest-000002-link","type":"Microsoft.Network\/privateDnsZones\/virtualNetworkLinks","etag":"\"bc002fac-0000-0100-0000-609cca3e0000\"","location":"global","properties":{"provisioningState":"Succeeded","registrationEnabled":true,"virtualNetwork":{"id":"\/subscriptions\/00000000-0000-0000-0000-000000000000\/resourceGroups\/clitest.rg000001\/providers\/Microsoft.Network\/virtualNetworks\/Vnetbclitest-000002"},"virtualNetworkLinkState":"InProgress"}}' + string: '{"id":"\/subscriptions\/00000000-0000-0000-0000-000000000000\/resourceGroups\/clitest.rg000001\/providers\/Microsoft.Network\/privateDnsZones\/testdnsname.private.postgres.database.azure.com\/virtualNetworkLinks\/Vnetazuredbclitest-000002-link","name":"Vnetazuredbclitest-000002-link","type":"Microsoft.Network\/privateDnsZones\/virtualNetworkLinks","etag":"\"bc002fac-0000-0100-0000-609cca3e0000\"","location":"global","properties":{"provisioningState":"Succeeded","registrationEnabled":true,"virtualNetwork":{"id":"\/subscriptions\/00000000-0000-0000-0000-000000000000\/resourceGroups\/clitest.rg000001\/providers\/Microsoft.Network\/virtualNetworks\/Vnetazuredbclitest-000002"},"virtualNetworkLinkState":"InProgress"}}' headers: cache-control: - private @@ -4246,7 +4246,7 @@ interactions: "GeneralPurpose"}, "properties": {"administratorLogin": "sourjay5", "administratorLoginPassword": "XC_1c2AhpvZ4hp8ADtWIcQ", "version": "12", "storageProfile": {"backupRetentionDays": 7, "storageMB": 131072}, "haEnabled": "Disabled", "delegatedSubnetArguments": - {"subnetArmResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002/subnets/Subnetbclitest-000002"}, + {"subnetArmResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002/subnets/Subnetazuredbclitest-000002"}, "privateDnsZoneArguments": {"privateDnsZoneArmResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/testdnsname.private.postgres.database.azure.com"}, "createMode": "Default"}}' headers: @@ -4643,7 +4643,7 @@ interactions: uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBForPostgreSql/flexibleServers/azuredbclitest-000002?api-version=2020-02-14-preview response: body: - string: '{"sku":{"capacity":2,"name":"Standard_D2s_v3","tier":"GeneralPurpose"},"properties":{"fullyQualifiedDomainName":"azuredbclitest-000002.postgres.database.azure.com","version":"12","minorVersion":"6","standbyCount":0,"haEnabled":"Disabled","administratorLogin":"sourjay5","publicNetworkAccess":"Disabled","delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002/subnets/Subnetbclitest-000002"},"privateDnsZoneArguments":{"privateDnsZoneArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/testdnsname.private.postgres.database.azure.com"},"logBackupStorageSku":"Standard_ZRS","haState":"NotEnabled","state":"Ready","availabilityZone":"3","storageProfile":{"storageMB":131072,"backupRetentionDays":7,"geoRedundantBackup":"Disabled"},"earliestRestoreDate":"2021-05-13T06:46:27.4950411+00:00","byokEnforcement":"Disabled","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0}},"location":"East + string: '{"sku":{"capacity":2,"name":"Standard_D2s_v3","tier":"GeneralPurpose"},"properties":{"fullyQualifiedDomainName":"azuredbclitest-000002.postgres.database.azure.com","version":"12","minorVersion":"6","standbyCount":0,"haEnabled":"Disabled","administratorLogin":"sourjay5","publicNetworkAccess":"Disabled","delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002/subnets/Subnetazuredbclitest-000002"},"privateDnsZoneArguments":{"privateDnsZoneArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/testdnsname.private.postgres.database.azure.com"},"logBackupStorageSku":"Standard_ZRS","haState":"NotEnabled","state":"Ready","availabilityZone":"3","storageProfile":{"storageMB":131072,"backupRetentionDays":7,"geoRedundantBackup":"Disabled"},"earliestRestoreDate":"2021-05-13T06:46:27.4950411+00:00","byokEnforcement":"Disabled","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0}},"location":"East US 2 EUAP","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBforPostgreSQL/flexibleServers/azuredbclitest-000002","name":"azuredbclitest-000002","type":"Microsoft.DBforPostgreSQL/flexibleServers"}' headers: cache-control: @@ -4878,7 +4878,7 @@ interactions: uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBForPostgreSql/flexibleServers/azuredbclitest-000002?api-version=2020-02-14-preview response: body: - string: '{"sku":{"capacity":2,"name":"Standard_D2s_v3","tier":"GeneralPurpose"},"properties":{"fullyQualifiedDomainName":"azuredbclitest-000002.postgres.database.azure.com","version":"12","minorVersion":"6","standbyCount":0,"haEnabled":"Disabled","administratorLogin":"sourjay5","publicNetworkAccess":"Disabled","delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetbclitest-000002/subnets/Subnetbclitest-000002"},"privateDnsZoneArguments":{"privateDnsZoneArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/testdnsname.private.postgres.database.azure.com"},"logBackupStorageSku":"Standard_ZRS","haState":"NotEnabled","state":"Ready","availabilityZone":"3","storageProfile":{"storageMB":131072,"backupRetentionDays":7,"geoRedundantBackup":"Disabled"},"earliestRestoreDate":"2021-05-13T06:46:40.8862766+00:00","byokEnforcement":"Disabled","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0}},"location":"East + string: '{"sku":{"capacity":2,"name":"Standard_D2s_v3","tier":"GeneralPurpose"},"properties":{"fullyQualifiedDomainName":"azuredbclitest-000002.postgres.database.azure.com","version":"12","minorVersion":"6","standbyCount":0,"haEnabled":"Disabled","administratorLogin":"sourjay5","publicNetworkAccess":"Disabled","delegatedSubnetArguments":{"subnetArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/Vnetazuredbclitest-000002/subnets/Subnetazuredbclitest-000002"},"privateDnsZoneArguments":{"privateDnsZoneArmResourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/privateDnsZones/testdnsname.private.postgres.database.azure.com"},"logBackupStorageSku":"Standard_ZRS","haState":"NotEnabled","state":"Ready","availabilityZone":"3","storageProfile":{"storageMB":131072,"backupRetentionDays":7,"geoRedundantBackup":"Disabled"},"earliestRestoreDate":"2021-05-13T06:46:40.8862766+00:00","byokEnforcement":"Disabled","maintenanceWindow":{"customWindow":"Disabled","dayOfWeek":0,"startHour":0,"startMinute":0}},"location":"East US 2 EUAP","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.DBforPostgreSQL/flexibleServers/azuredbclitest-000002","name":"azuredbclitest-000002","type":"Microsoft.DBforPostgreSQL/flexibleServers"}' headers: cache-control: diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/test_rdbms_flexible_commands.py b/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/test_rdbms_flexible_commands.py index 51c72c770f8..58877904bfd 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/test_rdbms_flexible_commands.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/test_rdbms_flexible_commands.py @@ -441,7 +441,7 @@ def _test_flexible_server_vnet_server_create(self, database_engine, resource_gro self.assertEqual(show_result['delegatedSubnetArguments']['subnetArmResourceId'], '/subscriptions/{}/resourceGroups/{}/providers/Microsoft.Network/virtualNetworks/{}/subnets/{}'.format( - self.get_subscription_id(), resource_group, 'Vnet' + server[6:], 'Subnet' + server[6:])) + self.get_subscription_id(), resource_group, 'Vnet' + server, 'Subnet' + server)) if database_engine == 'postgres': self.assertIn('testdnsname.private.postgres.database.azure.com', show_result['privateDnsZoneArguments']['privateDnsZoneArmResourceId']) @@ -457,7 +457,7 @@ def _test_flexible_server_vnet_ha_server_create(self, database_engine, resource_ self.assertEqual(show_result['delegatedSubnetArguments']['subnetArmResourceId'], '/subscriptions/{}/resourceGroups/{}/providers/Microsoft.Network/virtualNetworks/{}/subnets/{}'.format( - self.get_subscription_id(), resource_group, 'Vnet' + server[6:], 'Subnet' + server[6:])) + self.get_subscription_id(), resource_group, 'Vnet' + server, 'Subnet' + server)) def _test_flexible_server_vnet_server_update_scale_up(self, database_engine, resource_group, server): @@ -842,7 +842,7 @@ def _test_flexible_server_vnet_mgmt_supplied_vnet(self, database_engine, resourc # create vnet and subnet. When vnet name is supplied, the subnet created will be given the default name. vnet_result = self.cmd('network vnet create -n {} -g {} -l {} --address-prefix {} --subnet-name {} --subnet-prefix {}' - .format(vnet_name, resource_group, location, address_prefix, 'Subnet' + servers[0][6:], subnet_prefix_1)).get_output_in_json() + .format(vnet_name, resource_group, location, address_prefix, 'Subnet' + servers[0], subnet_prefix_1)).get_output_in_json() # create server - Delegation should be added. self.cmd('{} flexible-server create -g {} -n {} --vnet {} -l {}' @@ -861,11 +861,11 @@ def _test_flexible_server_vnet_mgmt_supplied_vnet(self, database_engine, resourc self.assertEqual(show_result_1['delegatedSubnetArguments']['subnetArmResourceId'], '/subscriptions/{}/resourceGroups/{}/providers/Microsoft.Network/virtualNetworks/{}/subnets/{}'.format( - self.get_subscription_id(), resource_group, vnet_name, 'Subnet' + servers[0][6:])) + self.get_subscription_id(), resource_group, vnet_name, 'Subnet' + servers[0])) self.assertEqual(show_result_2['delegatedSubnetArguments']['subnetArmResourceId'], '/subscriptions/{}/resourceGroups/{}/providers/Microsoft.Network/virtualNetworks/{}/subnets/{}'.format( - self.get_subscription_id(), resource_group, vnet_name_2, 'Subnet' + servers[1][6:])) + self.get_subscription_id(), resource_group, vnet_name_2, 'Subnet' + servers[1])) # delete all servers self.cmd('{} flexible-server delete -g {} -n {} --yes'.format(database_engine, resource_group, servers[0]), @@ -914,7 +914,7 @@ def _test_flexible_server_vnet_mgmt_supplied_vname_and_subnetname(self, database self.assertEqual(show_result_2['delegatedSubnetArguments']['subnetArmResourceId'], '/subscriptions/{}/resourceGroups/{}/providers/Microsoft.Network/virtualNetworks/{}/subnets/{}'.format( - self.get_subscription_id(), resource_group, vnet_name_2, 'Subnet' + servers[1][6:])) + self.get_subscription_id(), resource_group, vnet_name_2, 'Subnet' + servers[1])) # delete all servers self.cmd('{} flexible-server delete -g {} -n {} --yes'.format(database_engine, resource_group, servers[0]), From 2adbd577d8528d11c35cc3945250e2b42cec6435 Mon Sep 17 00:00:00 2001 From: Daeun Yim Date: Tue, 1 Jun 2021 20:20:45 -0700 Subject: [PATCH 04/10] add param explanation --- src/azure-cli/azure/cli/command_modules/rdbms/_params.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/_params.py b/src/azure-cli/azure/cli/command_modules/rdbms/_params.py index 2c4bbec8614..1db19c6542e 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/_params.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/_params.py @@ -474,7 +474,7 @@ def _flexible_server_params(command_group): c.argument('administrator_login', options_list=['--admin-user', '-u'], arg_group='Authentication', arg_type=administrator_login_arg_type, help='Administrator username for the server.') c.argument('administrator_login_password', options_list=['--admin-password', '-p'], arg_group='Authentication', help='The password of the administrator.') - c.argument('sql_file_path', options_list=['--sql-file'], help='The path of the sql file. The sql file should be already in the repository') + c.argument('sql_file_path', options_list=['--sql-file'], help='The path of the sql file. The sql file should be already in the root folder of the repository') c.argument('action_name', options_list=['--action-name'], help='The name of the github action') c.argument('repository', options_list=['--repo'], help='The name of your github username and repository e.g., Azure/azure-cli ') c.argument('branch', options_list=['--branch'], help='The name of the branch you want upload github action file. The default will be your current branch.') From e498e7a4ead0ea52e69cb794bff316a5bd0b0037 Mon Sep 17 00:00:00 2001 From: Daeun Yim Date: Wed, 2 Jun 2021 07:55:40 -0700 Subject: [PATCH 05/10] Fix typo --- .../rdbms/templates/postgresql_githubaction_template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/templates/postgresql_githubaction_template.yaml b/src/azure-cli/azure/cli/command_modules/rdbms/templates/postgresql_githubaction_template.yaml index e07a5d4a6f2..47027db029f 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/templates/postgresql_githubaction_template.yaml +++ b/src/azure-cli/azure/cli/command_modules/rdbms/templates/postgresql_githubaction_template.yaml @@ -11,4 +11,4 @@ jobs: with: server-name: POSTGRESQL_SERVER_NAME connection-string: ${{ secrets.AZURE_POSTGRESQL_CONNECTION_STRING }} - sql-file: POSTGRESQL_FILE_NAME + plsql-file: POSTGRESQL_FILE_NAME From 7068ab78b143ff462250b6dbb60ec4a834ffde22 Mon Sep 17 00:00:00 2001 From: Daeun Yim Date: Wed, 2 Jun 2021 15:24:29 -0700 Subject: [PATCH 06/10] Add functionalities --- .../azure/cli/command_modules/rdbms/_flexible_server_util.py | 2 +- src/azure-cli/azure/cli/command_modules/rdbms/_params.py | 2 +- .../rdbms/templates/mysql_githubaction_template.yaml | 1 - .../rdbms/templates/postgresql_githubaction_template.yaml | 1 - src/azure-cli/setup.py | 2 ++ 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/_flexible_server_util.py b/src/azure-cli/azure/cli/command_modules/rdbms/_flexible_server_util.py index e2ec3260dff..090765c45d1 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/_flexible_server_util.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/_flexible_server_util.py @@ -403,7 +403,7 @@ def fill_action_template(cmd, database_engine, server, database_name, administra template['jobs']['build']['steps'][2]['with']['server-name'] = server.fully_qualified_domain_name template['jobs']['build']['steps'][2]['with']['sql-file'] = file_name with open(action_dir + action_name + '.yml', 'w', encoding='utf8') as yml_file: - yml_file.write("on: [workflow_dispatch]\n") + yml_file.write("on: [push, workflow_dispatch]\n") yml_file.write(yaml.dump(template)) diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/_params.py b/src/azure-cli/azure/cli/command_modules/rdbms/_params.py index 1db19c6542e..2c4bbec8614 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/_params.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/_params.py @@ -474,7 +474,7 @@ def _flexible_server_params(command_group): c.argument('administrator_login', options_list=['--admin-user', '-u'], arg_group='Authentication', arg_type=administrator_login_arg_type, help='Administrator username for the server.') c.argument('administrator_login_password', options_list=['--admin-password', '-p'], arg_group='Authentication', help='The password of the administrator.') - c.argument('sql_file_path', options_list=['--sql-file'], help='The path of the sql file. The sql file should be already in the root folder of the repository') + c.argument('sql_file_path', options_list=['--sql-file'], help='The path of the sql file. The sql file should be already in the repository') c.argument('action_name', options_list=['--action-name'], help='The name of the github action') c.argument('repository', options_list=['--repo'], help='The name of your github username and repository e.g., Azure/azure-cli ') c.argument('branch', options_list=['--branch'], help='The name of the branch you want upload github action file. The default will be your current branch.') diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/templates/mysql_githubaction_template.yaml b/src/azure-cli/azure/cli/command_modules/rdbms/templates/mysql_githubaction_template.yaml index fc1f89967b4..65d71207f84 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/templates/mysql_githubaction_template.yaml +++ b/src/azure-cli/azure/cli/command_modules/rdbms/templates/mysql_githubaction_template.yaml @@ -1,4 +1,3 @@ -on: [push, workflow_dispatch] jobs: build: runs-on: ubuntu-latest diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/templates/postgresql_githubaction_template.yaml b/src/azure-cli/azure/cli/command_modules/rdbms/templates/postgresql_githubaction_template.yaml index 47027db029f..84c9c1b904c 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/templates/postgresql_githubaction_template.yaml +++ b/src/azure-cli/azure/cli/command_modules/rdbms/templates/postgresql_githubaction_template.yaml @@ -1,4 +1,3 @@ -on: [push, workflow_dispatch] jobs: build: runs-on: ubuntu-latest diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index ed47564fc16..1f740e36556 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -198,6 +198,8 @@ 'azure.cli.command_modules.rdbms': [ 'randomname/adjectives.txt', 'randomname/nouns.txt' + 'templates/mysql_githubaction_template.yaml' + 'templates/postgresql_githubaction_template.yaml' ] }, cmdclass=cmdclass From 8eaad03051c934e830335917c7291533945f20a1 Mon Sep 17 00:00:00 2001 From: Daeun Yim Date: Wed, 2 Jun 2021 16:51:27 -0700 Subject: [PATCH 07/10] update functionalities --- .../rdbms/_flexible_server_util.py | 41 +++++++++++++------ .../rdbms/flexible_server_custom_common.py | 2 +- .../mysql_githubaction_template.yaml | 2 +- .../postgresql_githubaction_template.yaml | 2 +- 4 files changed, 31 insertions(+), 16 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/_flexible_server_util.py b/src/azure-cli/azure/cli/command_modules/rdbms/_flexible_server_util.py index 090765c45d1..db38ba0eeb7 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/_flexible_server_util.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/_flexible_server_util.py @@ -13,13 +13,15 @@ import string import yaml from knack.log import get_logger +from msrestazure.tools import parse_resource_id +from msrestazure.azure_exceptions import CloudError +from azure.cli.core.azclierror import AuthenticationError from azure.core.paging import ItemPaged from azure.cli.core.commands.client_factory import get_subscription_id from azure.cli.core.commands import LongRunningOperation, _is_poller from azure.cli.core.azclierror import RequiredArgumentMissingError, InvalidArgumentValueError from azure.cli.command_modules.role.custom import create_service_principal_for_rbac from azure.mgmt.resource.resources.models import ResourceGroup -from msrestazure.tools import parse_resource_id from ._client_factory import resource_client_factory, cf_mysql_flexible_location_capabilities, cf_postgres_flexible_location_capabilities logger = get_logger(__name__) @@ -337,6 +339,7 @@ def run_subprocess_get_output(command): def register_credential_secrets(cmd, database_engine, server, repository): + logger.warning('Adding secret "AZURE_CREDENTIALS" to github repository') resource_group = parse_resource_id(server.id)["resource_group"] provider = "DBforMySQL" if database_engine == "postgresql": @@ -362,13 +365,14 @@ def register_credential_secrets(cmd, database_engine, server, repository): os.remove(credential_file) -def register_connection_secrets(cmd, database_engine, server, database_name, administrator_login, administrator_login_password, repository): +def register_connection_secrets(cmd, database_engine, server, database_name, administrator_login, administrator_login_password, repository, connection_string_name): + logger.warning("Added secret %s to github repository", connection_string_name) if database_engine == 'postgresql': connection_string = "host={} port=5432 dbname={} user={} password={} sslmode=require".format(server.fully_qualified_domain_name, database_name, administrator_login, administrator_login_password) - run_subprocess('gh secret set {} --repo {} -b"{}"'.format(AZURE_POSTGRESQL_CONNECTION_STRING, repository, connection_string)) + run_subprocess('gh secret set {} --repo {} -b"{}"'.format(connection_string_name, repository, connection_string)) elif database_engine == 'mysql': connection_string = "Server={}; Port=3306; Database={}; Uid={}; Pwd={}; SslMode=Preferred;".format(server.fully_qualified_domain_name, database_name, administrator_login, administrator_login_password) - run_subprocess('gh secret set {} --repo {} -b"{}"'.format(AZURE_MYSQL_CONNECTION_STRING, repository, connection_string)) + run_subprocess('gh secret set {} --repo {} -b"{}"'.format(connection_string_name, repository, connection_string)) def fill_action_template(cmd, database_engine, server, database_name, administrator_login, administrator_login_password, file_name, action_name, repository): @@ -379,29 +383,40 @@ def fill_action_template(cmd, database_engine, server, database_name, administra process = run_subprocess_get_output("gh secret list --repo {}".format(repository)) github_secrets = process.stdout.read().strip().decode('UTF-8') - connection_string = AZURE_POSTGRESQL_CONNECTION_STRING if database_engine == 'postgresql' else AZURE_MYSQL_CONNECTION_STRING + # connection_string = AZURE_POSTGRESQL_CONNECTION_STRING if database_engine == 'postgresql' else AZURE_MYSQL_CONNECTION_STRING if AZURE_CREDENTIALS not in github_secrets: - register_credential_secrets(cmd, - database_engine=database_engine, - server=server, - repository=repository) - - if connection_string not in github_secrets: + try: + register_credential_secrets(cmd, + database_engine=database_engine, + server=server, + repository=repository) + except CloudError: + raise AuthenticationError('You do not have authorization to create a service principal to run azure service in github actions. \n' + 'Please create a service principal that has access to the database server and add "AZURE_CREDENTIALS" secret to your github repository. \n' + 'Follow the instruction here "aka.ms/github-actions-azure-credentials".') + + connection_string_name = server.name.upper().replace("-", "_") + "_" + database_name.upper().replace("-", "_") + "_" + database_engine.upper() + "_CONNECTION_STRING" + if connection_string_name not in github_secrets: register_connection_secrets(cmd, database_engine=database_engine, server=server, database_name=database_name, administrator_login=administrator_login, administrator_login_password=administrator_login_password, - repository=repository) + repository=repository, + connection_string_name=connection_string_name) current_location = os.path.dirname(__file__) with open(current_location + "/templates/" + database_engine + "_githubaction_template.yaml", "r") as template_file: template = yaml.safe_load(template_file) template['jobs']['build']['steps'][2]['with']['server-name'] = server.fully_qualified_domain_name - template['jobs']['build']['steps'][2]['with']['sql-file'] = file_name + if database_engine == 'postgresql': + template['jobs']['build']['steps'][2]['with']['plsql-file'] = file_name + else: + template['jobs']['build']['steps'][2]['with']['sql-file'] = file_name + template['jobs']['build']['steps'][2]['with']['connection-string'] = "${{ secrets." + connection_string_name + " }}" with open(action_dir + action_name + '.yml', 'w', encoding='utf8') as yml_file: yml_file.write("on: [push, workflow_dispatch]\n") yml_file.write(yaml.dump(template)) diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_common.py b/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_common.py index df7bc56ea07..066f7d58f38 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_common.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_common.py @@ -203,7 +203,7 @@ def github_actions_setup(cmd, client, resource_group_name, server_name, database def github_actions_run(action_name, branch): gitcli_check_and_login() - logger.warning("Created event for %s.yml in branch %s", action_name, branch) + logger.warning("Created an event for %s.yml in branch %s", action_name, branch) run_subprocess("gh workflow run {}.yml --ref {}".format(action_name, branch)) diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/templates/mysql_githubaction_template.yaml b/src/azure-cli/azure/cli/command_modules/rdbms/templates/mysql_githubaction_template.yaml index 65d71207f84..16ac1b68943 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/templates/mysql_githubaction_template.yaml +++ b/src/azure-cli/azure/cli/command_modules/rdbms/templates/mysql_githubaction_template.yaml @@ -9,5 +9,5 @@ jobs: - uses: azure/mysql@v1 with: server-name: MYSQL_SERVER_NAME - connection-string: ${{ secrets.AZURE_MYSQL_CONNECTION_STRING }} + connection-string: MYSQL_CONNECTION_STRING sql-file: MYSQL_FILE_NAME diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/templates/postgresql_githubaction_template.yaml b/src/azure-cli/azure/cli/command_modules/rdbms/templates/postgresql_githubaction_template.yaml index 84c9c1b904c..2244724e5f5 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/templates/postgresql_githubaction_template.yaml +++ b/src/azure-cli/azure/cli/command_modules/rdbms/templates/postgresql_githubaction_template.yaml @@ -9,5 +9,5 @@ jobs: - uses: azure/postgresql@v1 with: server-name: POSTGRESQL_SERVER_NAME - connection-string: ${{ secrets.AZURE_POSTGRESQL_CONNECTION_STRING }} + connection-string: POSTGRESQL_CONNECTION_STRING plsql-file: POSTGRESQL_FILE_NAME From 35a72f8108ca79d0c7698ec763895d9e1ab63fee Mon Sep 17 00:00:00 2001 From: Daeun Yim Date: Wed, 2 Jun 2021 17:09:42 -0700 Subject: [PATCH 08/10] fix setup py --- src/azure-cli/setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index 1f740e36556..108c1c8b1e1 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -197,8 +197,8 @@ ], 'azure.cli.command_modules.rdbms': [ 'randomname/adjectives.txt', - 'randomname/nouns.txt' - 'templates/mysql_githubaction_template.yaml' + 'randomname/nouns.txt', + 'templates/mysql_githubaction_template.yaml', 'templates/postgresql_githubaction_template.yaml' ] }, From f7af3d3c0429ff8626e9807d9a931fb1be87880d Mon Sep 17 00:00:00 2001 From: Daeun Yim Date: Wed, 2 Jun 2021 17:36:49 -0700 Subject: [PATCH 09/10] delete automatic action run --- .../cli/command_modules/rdbms/flexible_server_custom_common.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_common.py b/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_common.py index 066f7d58f38..cf34d45ad7c 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_common.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_common.py @@ -195,7 +195,6 @@ def github_actions_setup(cmd, client, resource_group_name, server_name, database if allow_push: logger.warning("Pushing the created action file to origin %s branch", branch) run_subprocess("git push origin {}".format(branch)) - github_actions_run(action_name, branch) else: logger.warning('You did not set --allow-push parameter. Please push the prepared file %s to your remote repo and run "deploy run" command to activate the workflow.', action_path) From f03edfc05f92c303f356911d03e1c85e22abe804 Mon Sep 17 00:00:00 2001 From: Daeun Yim <69321306+DaeunYim@users.noreply.github.com> Date: Wed, 2 Jun 2021 23:52:02 -0700 Subject: [PATCH 10/10] Update running condition --- .../azure/cli/command_modules/rdbms/_flexible_server_util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/_flexible_server_util.py b/src/azure-cli/azure/cli/command_modules/rdbms/_flexible_server_util.py index db38ba0eeb7..06a4cc73296 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/_flexible_server_util.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/_flexible_server_util.py @@ -418,7 +418,7 @@ def fill_action_template(cmd, database_engine, server, database_name, administra template['jobs']['build']['steps'][2]['with']['sql-file'] = file_name template['jobs']['build']['steps'][2]['with']['connection-string'] = "${{ secrets." + connection_string_name + " }}" with open(action_dir + action_name + '.yml', 'w', encoding='utf8') as yml_file: - yml_file.write("on: [push, workflow_dispatch]\n") + yml_file.write("on: [workflow_dispatch]\n") yml_file.write(yaml.dump(template))