From 54b24d935cb05dcd551392cf323e4e0cb2ac1996 Mon Sep 17 00:00:00 2001 From: Alan Ren Date: Wed, 30 Sep 2020 23:53:51 -0700 Subject: [PATCH] asde deployment update (#12662) * repository update * plan id * package update * replace dacpac with package --- .../edge/deploy-sql-edge-azure.ipynb | 32 ++++++++-------- .../edge/deploy-sql-edge-local.ipynb | 2 +- .../edge/deploy-sql-edge-multi-device.ipynb | 30 +++++++-------- .../edge/deploy-sql-edge-remote.ipynb | 2 +- .../edge/deploy-sql-edge-single-device.ipynb | 34 ++++++++--------- extensions/asde-deployment/package.json | 37 ++++++++++++------- extensions/asde-deployment/package.nls.json | 5 ++- 7 files changed, 76 insertions(+), 66 deletions(-) diff --git a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-azure.ipynb b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-azure.ipynb index e1201f82c2..7ec0b557ae 100644 --- a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-azure.ipynb +++ b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-azure.ipynb @@ -29,7 +29,7 @@ "1. Create an Azure Edge VM as a virtual IoT device, you can go the \"Default Settings\" cell and adjust the vm_size variable based on your needs. Available sizes and pricing information can be found [here](https://docs.microsoft.com/azure/virtual-machines/linux/sizes).\n", "1. Create an Azure IoT hub, you can go to the \"Default Settings\" cell and adjust value of the following variables based on your needs: iot_hub_sku and iot_hub_units. Available SKUs and pricing information can be found [here](https://azure.microsoft.com/pricing/details/iot-hub/).\n", "1. Add the device to the IoT hub\n", - "1. Deploy SQL Edge module to the device with optional dacpac\n", + "1. Deploy SQL Edge module to the device with optional package file\n", "1. Enable connecting to the SQL Edge instance on the device\n", "\n", "### Dependencies\n", @@ -126,7 +126,7 @@ "sa_password = os.environ[\"AZDATA_NB_VAR_SA_PASSWORD\"]\n", "vm_admin = os.environ[\"AZDATA_NB_VAR_ASDE_VM_ADMIN\"]\n", "vm_password = os.environ[\"AZDATA_NB_VAR_ASDE_VM_PASSWORD\"]\n", - "dacpac_path = os.environ[\"AZDATA_NB_VAR_ASDE_DACPAC_PATH\"]\n", + "package_path = os.environ[\"AZDATA_NB_VAR_ASDE_PACKAGE_PATH\"]\n", "sql_port = os.environ[\"AZDATA_NB_VAR_ASDE_SQL_PORT\"]\n", "new_rg_flag = os.environ[\"AZDATA_NB_VAR_ASDE_NEW_RESOURCEGROUP\"]\n", "new_rg_name = os.environ[\"AZDATA_NB_VAR_ASDE_NEW_RESOURCEGROUP_NAME\"]\n", @@ -140,7 +140,7 @@ "print(f'VM admin password: ******')\n", "print(f'SQL Server port: {sql_port}')\n", "print(f'SQL Server sa password: ******')\n", - "print(f'Dacpac path: {dacpac_path}')" + "print(f'Package path: {package_path}')" ], "metadata": { "azdata_cell_guid": "dde9388b-f623-4d62-bb74-36a05f5d2ea3", @@ -176,7 +176,7 @@ "subnet_address_prefix = '10.0.0.0/24'\n", "vnet_address_prefix = '10.0.0.0/16'\n", "azure_storage_account = f'sa{suffix}'\n", - "storage_account_container = 'sqldatabasedacpac'\n", + "storage_account_container = 'sqldatabasepackage'\n", "sql_lcid = '1033'\n", "sql_collation = 'SQL_Latin1_General_CP1_CI_AS'" ], @@ -270,7 +270,7 @@ { "cell_type": "markdown", "source": [ - "### Create storage account and storage account container, then upload the dacpac" + "### Create storage account and storage account container, then upload the package" ], "metadata": { "azdata_cell_guid": "90ec2b26-0c4a-4aa4-b397-f16b09b454ea" @@ -280,11 +280,11 @@ "cell_type": "code", "source": [ "storage_account_created = False\n", - "if dacpac_path == \"\":\n", - " print(f'Dacpac zip file not provided')\n", + "if package_path == \"\":\n", + " print(f'Package file not provided')\n", " blob_sas = ''\n", "else: \n", - " dacpac_name = ntpath.basename(dacpac_path)\n", + " package_name = ntpath.basename(package_path)\n", " storage_accounts = run_command(f'az storage account list --resource-group {azure_resource_group} --subscription {azure_subscription_id}', returnObject=True)\n", " storage_accounts = [storage_account for storage_account in storage_accounts if storage_account['name'] == azure_storage_account]\n", " if len(storage_accounts) == 0:\n", @@ -300,14 +300,14 @@ " else:\n", " run_command(f'az storage container create --name {storage_account_container} --account-key {storage_account_key} --account-name {azure_storage_account} --auth-mode key')\n", "\n", - " blob_exists = run_command(f'az storage blob exists --container-name {storage_account_container} --name \\\"{dacpac_name}\\\" --account-key {storage_account_key} --account-name {azure_storage_account} --auth-mode key', returnObject=True)['exists']\n", + " blob_exists = run_command(f'az storage blob exists --container-name {storage_account_container} --name \\\"{package_name}\\\" --account-key {storage_account_key} --account-name {azure_storage_account} --auth-mode key', returnObject=True)['exists']\n", " if blob_exists:\n", - " print(f'blob \\\"{dacpac_name}\\\" already exists.')\n", + " print(f'blob \\\"{package_name}\\\" already exists.')\n", " else:\n", - " run_command(f'az storage blob upload --account-name {azure_storage_account} --container-name {storage_account_container} --name {dacpac_name} --file \\\"{dacpac_path}\\\" --account-key {storage_account_key} --auth-mode key')\n", + " run_command(f'az storage blob upload --account-name {azure_storage_account} --container-name {storage_account_container} --name {package_name} --file \\\"{package_path}\\\" --account-key {storage_account_key} --auth-mode key')\n", " now = time.localtime()\n", " expiry = f'{(now.tm_year + 1)}-{now.tm_mon}-{now.tm_mday}'\n", - " blob_sas = run_command(f'az storage blob generate-sas --container-name {storage_account_container} --name \\\"{dacpac_name}\\\" --account-name {azure_storage_account} --account-key {storage_account_key} --auth-mode key --full-uri --https-only --permissions r --expiry {expiry}', returnObject=True)" + " blob_sas = run_command(f'az storage blob generate-sas --container-name {storage_account_container} --name \\\"{package_name}\\\" --account-name {azure_storage_account} --account-key {storage_account_key} --auth-mode key --full-uri --https-only --permissions r --expiry {expiry}', returnObject=True)" ], "metadata": { "azdata_cell_guid": "7ab2b3ec-0832-40b3-98c0-4aa87320e7ce", @@ -475,8 +475,8 @@ { "cell_type": "code", "source": [ - "manifest = '{\\\"modulesContent\\\":{\\\"$edgeAgent\\\":{\\\"properties.desired\\\":{\\\"modules\\\":{\\\"AzureSQLEdge\\\":{\\\"settings\\\":{\\\"image\\\":\\\"mcr.microsoft.com/azure-sql-edge-developer\\\",\\\"createOptions\\\":\\\"{\\\\\\\"HostConfig\\\\\\\":{\\\\\\\"CapAdd\\\\\\\":[\\\\\\\"SYS_PTRACE\\\\\\\"],\\\\\\\"Binds\\\\\\\":[\\\\\\\"sqlvolume:/sqlvolume\\\\\\\"],\\\\\\\"PortBindings\\\\\\\":{\\\\\\\"1433/tcp\\\\\\\":[{\\\\\\\"HostPort\\\\\\\":\\\\\\\"\\\\\\\"}]},\\\\\\\"Mounts\\\\\\\":[{\\\\\\\"Type\\\\\\\":\\\\\\\"volume\\\\\\\",\\\\\\\"Source\\\\\\\":\\\\\\\"sqlvolume\\\\\\\",\\\\\\\"Target\\\\\\\":\\\\\\\"/var/opt/mssql\\\\\\\"}]},\\\\\\\"User\\\\\\\":\\\\\\\"0:0\\\\\\\",\\\\\\\"Env\\\\\\\":[\\\\\\\"MSSQL_AGENT_ENABLED=TRUE\\\\\\\",\\\\\\\"ClientTransportType=AMQP_TCP_Only\\\\\\\",\\\\\\\"MSSQL_PID=Developer\\\\\\\"]}\\\"},\\\"type\\\":\\\"docker\\\",\\\"version\\\":\\\"1.0\\\",\\\"env\\\":{\\\"ACCEPT_EULA\\\":{\\\"value\\\":\\\"Y\\\"},\\\"SA_PASSWORD\\\":{\\\"value\\\":\\\"\\\"},\\\"MSSQL_LCID\\\":{\\\"value\\\":\\\"\\\"},\\\"MSSQL_COLLATION\\\":{\\\"value\\\":\\\"\\\"}},\\\"status\\\":\\\"running\\\",\\\"restartPolicy\\\":\\\"always\\\"}},\\\"runtime\\\":{\\\"settings\\\":{\\\"minDockerVersion\\\":\\\"v1.25\\\"},\\\"type\\\":\\\"docker\\\"},\\\"schemaVersion\\\":\\\"1.0\\\",\\\"systemModules\\\":{\\\"edgeAgent\\\":{\\\"settings\\\":{\\\"image\\\":\\\"mcr.microsoft.com/azureiotedge-agent:1.0\\\",\\\"createOptions\\\":\\\"\\\"},\\\"type\\\":\\\"docker\\\"},\\\"edgeHub\\\":{\\\"settings\\\":{\\\"image\\\":\\\"mcr.microsoft.com/azureiotedge-hub:1.0\\\",\\\"createOptions\\\":\\\"{\\\\\\\"HostConfig\\\\\\\":{\\\\\\\"PortBindings\\\\\\\":{\\\\\\\"443/tcp\\\\\\\":[{\\\\\\\"HostPort\\\\\\\":\\\\\\\"443\\\\\\\"}],\\\\\\\"5671/tcp\\\\\\\":[{\\\\\\\"HostPort\\\\\\\":\\\\\\\"5671\\\\\\\"}],\\\\\\\"8883/tcp\\\\\\\":[{\\\\\\\"HostPort\\\\\\\":\\\\\\\"8883\\\\\\\"}]}}}\\\"},\\\"type\\\":\\\"docker\\\",\\\"status\\\":\\\"running\\\",\\\"restartPolicy\\\":\\\"always\\\"}}}},\\\"$edgeHub\\\":{\\\"properties.desired\\\":{\\\"routes\\\":{},\\\"schemaVersion\\\":\\\"1.0\\\",\\\"storeAndForwardConfiguration\\\":{\\\"timeToLiveSecs\\\":7200}}},\\\"AzureSQLEdge\\\":{\\\"properties.desired\\\":{\\\"SqlPackage\\\":\\\"\\\",\\\"ASAJobInfo\\\":\\\"\\\"}}}}'\n", - "manifest = manifest.replace('', blob_sas).replace('',sa_password).replace('',sql_lcid).replace('',sql_port).replace('',sql_collation)\n", + "manifest = '{\\\"modulesContent\\\":{\\\"$edgeAgent\\\":{\\\"properties.desired\\\":{\\\"modules\\\":{\\\"AzureSQLEdge\\\":{\\\"settings\\\":{\\\"image\\\":\\\"mcr.microsoft.com/azure-sql-edge\\\",\\\"createOptions\\\":\\\"{\\\\\\\"HostConfig\\\\\\\":{\\\\\\\"CapAdd\\\\\\\":[\\\\\\\"SYS_PTRACE\\\\\\\"],\\\\\\\"Binds\\\\\\\":[\\\\\\\"sqlvolume:/sqlvolume\\\\\\\"],\\\\\\\"PortBindings\\\\\\\":{\\\\\\\"1433/tcp\\\\\\\":[{\\\\\\\"HostPort\\\\\\\":\\\\\\\"\\\\\\\"}]},\\\\\\\"Mounts\\\\\\\":[{\\\\\\\"Type\\\\\\\":\\\\\\\"volume\\\\\\\",\\\\\\\"Source\\\\\\\":\\\\\\\"sqlvolume\\\\\\\",\\\\\\\"Target\\\\\\\":\\\\\\\"/var/opt/mssql\\\\\\\"}]},\\\\\\\"User\\\\\\\":\\\\\\\"0:0\\\\\\\",\\\\\\\"Env\\\\\\\":[\\\\\\\"MSSQL_AGENT_ENABLED=TRUE\\\\\\\",\\\\\\\"ClientTransportType=AMQP_TCP_Only\\\\\\\",\\\\\\\"PlanId=asde-developer-on-iot-edge\\\\\\\"]}\\\"},\\\"type\\\":\\\"docker\\\",\\\"version\\\":\\\"1.0\\\",\\\"env\\\":{\\\"ACCEPT_EULA\\\":{\\\"value\\\":\\\"Y\\\"},\\\"SA_PASSWORD\\\":{\\\"value\\\":\\\"\\\"},\\\"MSSQL_LCID\\\":{\\\"value\\\":\\\"\\\"},\\\"MSSQL_COLLATION\\\":{\\\"value\\\":\\\"\\\"},\\\"MSSQL_PACKAGE\\\":{\\\"value\\\":\\\"\\\"}},\\\"status\\\":\\\"running\\\",\\\"restartPolicy\\\":\\\"always\\\"}},\\\"runtime\\\":{\\\"settings\\\":{\\\"minDockerVersion\\\":\\\"v1.25\\\"},\\\"type\\\":\\\"docker\\\"},\\\"schemaVersion\\\":\\\"1.0\\\",\\\"systemModules\\\":{\\\"edgeAgent\\\":{\\\"settings\\\":{\\\"image\\\":\\\"mcr.microsoft.com/azureiotedge-agent:1.0\\\",\\\"createOptions\\\":\\\"\\\"},\\\"type\\\":\\\"docker\\\"},\\\"edgeHub\\\":{\\\"settings\\\":{\\\"image\\\":\\\"mcr.microsoft.com/azureiotedge-hub:1.0\\\",\\\"createOptions\\\":\\\"{\\\\\\\"HostConfig\\\\\\\":{\\\\\\\"PortBindings\\\\\\\":{\\\\\\\"443/tcp\\\\\\\":[{\\\\\\\"HostPort\\\\\\\":\\\\\\\"443\\\\\\\"}],\\\\\\\"5671/tcp\\\\\\\":[{\\\\\\\"HostPort\\\\\\\":\\\\\\\"5671\\\\\\\"}],\\\\\\\"8883/tcp\\\\\\\":[{\\\\\\\"HostPort\\\\\\\":\\\\\\\"8883\\\\\\\"}]}}}\\\"},\\\"type\\\":\\\"docker\\\",\\\"status\\\":\\\"running\\\",\\\"restartPolicy\\\":\\\"always\\\"}}}},\\\"$edgeHub\\\":{\\\"properties.desired\\\":{\\\"routes\\\":{},\\\"schemaVersion\\\":\\\"1.0\\\",\\\"storeAndForwardConfiguration\\\":{\\\"timeToLiveSecs\\\":7200}}},\\\"AzureSQLEdge\\\":{\\\"properties.desired\\\":{\\\"ASAJobInfo\\\":\\\"\\\"}}}}'\n", + "manifest = manifest.replace('', blob_sas).replace('',sa_password).replace('',sql_lcid).replace('',sql_port).replace('',sql_collation)\n", "file_name = f'{uuid.uuid4().hex}.json'\n", "manifest_file = open(file_name, 'w')\n", "manifest_file.write(manifest)\n", @@ -525,7 +525,7 @@ "source": [ "if storage_account_created:\r\n", " delete_storage_account_command = \"run_command(f'az storage account delete -n {azure_storage_account} -g {azure_resource_group} --yes')\"\r\n", - " display(HTML('NOTE: A storage account was created to host the dacpac file, you can delete it after the database is created and populated successfully. To delete the storage account, copy the following code to a new code cell and run the cell.'))\r\n", + " display(HTML('NOTE: A storage account was created to host the package file, you can delete it after the database is created and populated successfully. To delete the storage account, copy the following code to a new code cell and run the cell.'))\r\n", " display(HTML(''+delete_storage_account_command+''))" ], "metadata": { @@ -538,4 +538,4 @@ "execution_count": null } ] -} \ No newline at end of file +} diff --git a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-local.ipynb b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-local.ipynb index 70ac6405bd..bf5c6965b8 100644 --- a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-local.ipynb +++ b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-local.ipynb @@ -193,7 +193,7 @@ { "cell_type": "code", "source": [ - "template = Template(f'docker run -e ACCEPT_EULA=Y -e \"SA_PASSWORD=$password\" -p {sql_port}:1433 --name {container_name} -d {docker_registry}/{docker_repository}:{docker_imagetag}')\n", + "template = Template(f'docker run -e ACCEPT_EULA=Y -e \"SA_PASSWORD=$password\" -e \"MSSQL_PID=Developer\" -p {sql_port}:1433 --name {container_name} -d {docker_registry}/{docker_repository}:{docker_imagetag}')\n", "cmd = template.substitute(password=sql_password)\n", "run_command(template.substitute(password='******'))" ], diff --git a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-multi-device.ipynb b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-multi-device.ipynb index e30e25301e..d839543cf0 100644 --- a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-multi-device.ipynb +++ b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-multi-device.ipynb @@ -118,7 +118,7 @@ "azure_subscription_id = os.environ[\"AZDATA_NB_VAR_ASDE_SUBSCRIPTIONID\"]\n", "azure_resource_group = os.environ[\"AZDATA_NB_VAR_ASDE_RESOURCEGROUP\"]\n", "sa_password = os.environ[\"AZDATA_NB_VAR_SA_PASSWORD\"]\n", - "dacpac_path = os.environ[\"AZDATA_NB_VAR_ASDE_DACPAC_PATH\"]\n", + "package_path = os.environ[\"AZDATA_NB_VAR_ASDE_PACKAGE_PATH\"]\n", "sql_port = os.environ[\"AZDATA_NB_VAR_ASDE_SQL_PORT\"]\n", "iot_hub_name = os.environ[\"AZDATA_NB_VAR_ASDE_HUBNAME\"]\n", "target_condition = os.environ[\"AZDATA_NB_VAR_ASDE_TARGET_CONDITION\"]\n", @@ -128,7 +128,7 @@ "print(f'Target condition: {target_condition}')\n", "print(f'Azure SQL Edge instance port: {sql_port}')\n", "print(f'Azure SQL Edge instance sa password: ******')\n", - "print(f'Dacpac path: {dacpac_path}')" + "print(f'Package path: {package_path}')" ], "metadata": { "azdata_cell_guid": "dde9388b-f623-4d62-bb74-36a05f5d2ea3", @@ -154,7 +154,7 @@ "suffix = time.strftime(\"%y%m%d%H%M%S\", time.localtime())\n", "azure_storage_account = f'sa{suffix}'\n", "deployment_id = f'asde{suffix}'\n", - "storage_account_container = 'sqldatabasedacpac'\n", + "storage_account_container = 'sqldatabasepackage'\n", "sql_lcid = '1033'\n", "sql_collation = 'SQL_Latin1_General_CP1_CI_AS'\n", "deployment_priority = 10" @@ -247,7 +247,7 @@ { "cell_type": "markdown", "source": [ - "### Create storage account and storage account container, then upload the dacpac" + "### Create storage account and storage account container, then upload the package" ], "metadata": { "azdata_cell_guid": "90ec2b26-0c4a-4aa4-b397-f16b09b454ea" @@ -257,11 +257,11 @@ "cell_type": "code", "source": [ "storage_account_created = False\n", - "if dacpac_path == \"\":\n", - " print(f'Dacpac zip file not provided')\n", + "if package_path == \"\":\n", + " print(f'Package file not provided')\n", " blob_sas = ''\n", "else:\n", - " dacpac_name = ntpath.basename(dacpac_path)\n", + " package_name = ntpath.basename(package_path)\n", " storage_accounts = run_command(f'az storage account list --resource-group {azure_resource_group} --subscription {azure_subscription_id}', returnObject=True)\n", " storage_accounts = [storage_account for storage_account in storage_accounts if storage_account['name'] == azure_storage_account]\n", " if len(storage_accounts) == 0:\n", @@ -277,14 +277,14 @@ " else:\n", " run_command(f'az storage container create --name {storage_account_container} --account-key {storage_account_key} --account-name {azure_storage_account} --auth-mode key')\n", "\n", - " blob_exists = run_command(f'az storage blob exists --container-name {storage_account_container} --name \\\"{dacpac_name}\\\" --account-key {storage_account_key} --account-name {azure_storage_account} --auth-mode key', returnObject=True)['exists']\n", + " blob_exists = run_command(f'az storage blob exists --container-name {storage_account_container} --name \\\"{package_name}\\\" --account-key {storage_account_key} --account-name {azure_storage_account} --auth-mode key', returnObject=True)['exists']\n", " if blob_exists:\n", - " print(f'blob \\\"{dacpac_name}\\\" already exists.')\n", + " print(f'blob \\\"{package_name}\\\" already exists.')\n", " else:\n", - " run_command(f'az storage blob upload --account-name {azure_storage_account} --container-name {storage_account_container} --name {dacpac_name} --file \\\"{dacpac_path}\\\" --account-key {storage_account_key} --auth-mode key')\n", + " run_command(f'az storage blob upload --account-name {azure_storage_account} --container-name {storage_account_container} --name {package_name} --file \\\"{package_path}\\\" --account-key {storage_account_key} --auth-mode key')\n", " now = time.localtime()\n", " expiry = f'{(now.tm_year + 1)}-{now.tm_mon}-{now.tm_mday}'\n", - " blob_sas = run_command(f'az storage blob generate-sas --container-name {storage_account_container} --name \\\"{dacpac_name}\\\" --account-name {azure_storage_account} --account-key {storage_account_key} --auth-mode key --full-uri --https-only --permissions r --expiry {expiry}', returnObject=True)" + " blob_sas = run_command(f'az storage blob generate-sas --container-name {storage_account_container} --name \\\"{package_name}\\\" --account-name {azure_storage_account} --account-key {storage_account_key} --auth-mode key --full-uri --https-only --permissions r --expiry {expiry}', returnObject=True)" ], "metadata": { "azdata_cell_guid": "7ab2b3ec-0832-40b3-98c0-4aa87320e7ce", @@ -307,8 +307,8 @@ { "cell_type": "code", "source": [ - "manifest = '{\\\"modulesContent\\\":{\\\"$edgeAgent\\\":{\\\"properties.desired\\\":{\\\"modules\\\":{\\\"AzureSQLEdge\\\":{\\\"settings\\\":{\\\"image\\\":\\\"mcr.microsoft.com/azure-sql-edge-developer\\\",\\\"createOptions\\\":\\\"{\\\\\\\"HostConfig\\\\\\\":{\\\\\\\"CapAdd\\\\\\\":[\\\\\\\"SYS_PTRACE\\\\\\\"],\\\\\\\"Binds\\\\\\\":[\\\\\\\"sqlvolume:/sqlvolume\\\\\\\"],\\\\\\\"PortBindings\\\\\\\":{\\\\\\\"1433/tcp\\\\\\\":[{\\\\\\\"HostPort\\\\\\\":\\\\\\\"\\\\\\\"}]},\\\\\\\"Mounts\\\\\\\":[{\\\\\\\"Type\\\\\\\":\\\\\\\"volume\\\\\\\",\\\\\\\"Source\\\\\\\":\\\\\\\"sqlvolume\\\\\\\",\\\\\\\"Target\\\\\\\":\\\\\\\"/var/opt/mssql\\\\\\\"}]},\\\\\\\"User\\\\\\\":\\\\\\\"0:0\\\\\\\",\\\\\\\"Env\\\\\\\":[\\\\\\\"MSSQL_AGENT_ENABLED=TRUE\\\\\\\",\\\\\\\"ClientTransportType=AMQP_TCP_Only\\\\\\\",\\\\\\\"MSSQL_PID=Developer\\\\\\\"]}\\\"},\\\"type\\\":\\\"docker\\\",\\\"version\\\":\\\"1.0\\\",\\\"env\\\":{\\\"ACCEPT_EULA\\\":{\\\"value\\\":\\\"Y\\\"},\\\"SA_PASSWORD\\\":{\\\"value\\\":\\\"\\\"},\\\"MSSQL_LCID\\\":{\\\"value\\\":\\\"\\\"},\\\"MSSQL_COLLATION\\\":{\\\"value\\\":\\\"\\\"}},\\\"status\\\":\\\"running\\\",\\\"restartPolicy\\\":\\\"always\\\"}},\\\"runtime\\\":{\\\"settings\\\":{\\\"minDockerVersion\\\":\\\"v1.25\\\"},\\\"type\\\":\\\"docker\\\"},\\\"schemaVersion\\\":\\\"1.0\\\",\\\"systemModules\\\":{\\\"edgeAgent\\\":{\\\"settings\\\":{\\\"image\\\":\\\"mcr.microsoft.com/azureiotedge-agent:1.0\\\",\\\"createOptions\\\":\\\"\\\"},\\\"type\\\":\\\"docker\\\"},\\\"edgeHub\\\":{\\\"settings\\\":{\\\"image\\\":\\\"mcr.microsoft.com/azureiotedge-hub:1.0\\\",\\\"createOptions\\\":\\\"{\\\\\\\"HostConfig\\\\\\\":{\\\\\\\"PortBindings\\\\\\\":{\\\\\\\"443/tcp\\\\\\\":[{\\\\\\\"HostPort\\\\\\\":\\\\\\\"443\\\\\\\"}],\\\\\\\"5671/tcp\\\\\\\":[{\\\\\\\"HostPort\\\\\\\":\\\\\\\"5671\\\\\\\"}],\\\\\\\"8883/tcp\\\\\\\":[{\\\\\\\"HostPort\\\\\\\":\\\\\\\"8883\\\\\\\"}]}}}\\\"},\\\"type\\\":\\\"docker\\\",\\\"status\\\":\\\"running\\\",\\\"restartPolicy\\\":\\\"always\\\"}}}},\\\"$edgeHub\\\":{\\\"properties.desired\\\":{\\\"routes\\\":{},\\\"schemaVersion\\\":\\\"1.0\\\",\\\"storeAndForwardConfiguration\\\":{\\\"timeToLiveSecs\\\":7200}}},\\\"AzureSQLEdge\\\":{\\\"properties.desired\\\":{\\\"SqlPackage\\\":\\\"\\\",\\\"ASAJobInfo\\\":\\\"\\\"}}}}'\n", - "manifest = manifest.replace('', blob_sas).replace('',sa_password).replace('',sql_lcid).replace('',sql_port).replace('',sql_collation)\n", + "manifest = '{\\\"modulesContent\\\":{\\\"$edgeAgent\\\":{\\\"properties.desired\\\":{\\\"modules\\\":{\\\"AzureSQLEdge\\\":{\\\"settings\\\":{\\\"image\\\":\\\"mcr.microsoft.com/azure-sql-edge\\\",\\\"createOptions\\\":\\\"{\\\\\\\"HostConfig\\\\\\\":{\\\\\\\"CapAdd\\\\\\\":[\\\\\\\"SYS_PTRACE\\\\\\\"],\\\\\\\"Binds\\\\\\\":[\\\\\\\"sqlvolume:/sqlvolume\\\\\\\"],\\\\\\\"PortBindings\\\\\\\":{\\\\\\\"1433/tcp\\\\\\\":[{\\\\\\\"HostPort\\\\\\\":\\\\\\\"\\\\\\\"}]},\\\\\\\"Mounts\\\\\\\":[{\\\\\\\"Type\\\\\\\":\\\\\\\"volume\\\\\\\",\\\\\\\"Source\\\\\\\":\\\\\\\"sqlvolume\\\\\\\",\\\\\\\"Target\\\\\\\":\\\\\\\"/var/opt/mssql\\\\\\\"}]},\\\\\\\"User\\\\\\\":\\\\\\\"0:0\\\\\\\",\\\\\\\"Env\\\\\\\":[\\\\\\\"MSSQL_AGENT_ENABLED=TRUE\\\\\\\",\\\\\\\"ClientTransportType=AMQP_TCP_Only\\\\\\\",\\\\\\\"PlanId=asde-developer-on-iot-edge\\\\\\\"]}\\\"},\\\"type\\\":\\\"docker\\\",\\\"version\\\":\\\"1.0\\\",\\\"env\\\":{\\\"ACCEPT_EULA\\\":{\\\"value\\\":\\\"Y\\\"},\\\"SA_PASSWORD\\\":{\\\"value\\\":\\\"\\\"},\\\"MSSQL_LCID\\\":{\\\"value\\\":\\\"\\\"},\\\"MSSQL_COLLATION\\\":{\\\"value\\\":\\\"\\\"},\\\"MSSQL_PACKAGE\\\":{\\\"value\\\":\\\"\\\"}},\\\"status\\\":\\\"running\\\",\\\"restartPolicy\\\":\\\"always\\\"}},\\\"runtime\\\":{\\\"settings\\\":{\\\"minDockerVersion\\\":\\\"v1.25\\\"},\\\"type\\\":\\\"docker\\\"},\\\"schemaVersion\\\":\\\"1.0\\\",\\\"systemModules\\\":{\\\"edgeAgent\\\":{\\\"settings\\\":{\\\"image\\\":\\\"mcr.microsoft.com/azureiotedge-agent:1.0\\\",\\\"createOptions\\\":\\\"\\\"},\\\"type\\\":\\\"docker\\\"},\\\"edgeHub\\\":{\\\"settings\\\":{\\\"image\\\":\\\"mcr.microsoft.com/azureiotedge-hub:1.0\\\",\\\"createOptions\\\":\\\"{\\\\\\\"HostConfig\\\\\\\":{\\\\\\\"PortBindings\\\\\\\":{\\\\\\\"443/tcp\\\\\\\":[{\\\\\\\"HostPort\\\\\\\":\\\\\\\"443\\\\\\\"}],\\\\\\\"5671/tcp\\\\\\\":[{\\\\\\\"HostPort\\\\\\\":\\\\\\\"5671\\\\\\\"}],\\\\\\\"8883/tcp\\\\\\\":[{\\\\\\\"HostPort\\\\\\\":\\\\\\\"8883\\\\\\\"}]}}}\\\"},\\\"type\\\":\\\"docker\\\",\\\"status\\\":\\\"running\\\",\\\"restartPolicy\\\":\\\"always\\\"}}}},\\\"$edgeHub\\\":{\\\"properties.desired\\\":{\\\"routes\\\":{},\\\"schemaVersion\\\":\\\"1.0\\\",\\\"storeAndForwardConfiguration\\\":{\\\"timeToLiveSecs\\\":7200}}},\\\"AzureSQLEdge\\\":{\\\"properties.desired\\\":{\\\"ASAJobInfo\\\":\\\"\\\"}}}}'\n", + "manifest = manifest.replace('', blob_sas).replace('',sa_password).replace('',sql_lcid).replace('',sql_port).replace('',sql_collation)\n", "file_name = f'{uuid.uuid4().hex}.json'\n", "manifest_file = open(file_name, 'w')\n", "manifest_file.write(manifest)\n", @@ -331,7 +331,7 @@ "from IPython.display import *\r\n", "if storage_account_created:\r\n", " delete_storage_account_command = \"run_command(f'az storage account delete -n {azure_storage_account} -g {azure_resource_group} --yes')\"\r\n", - " display(HTML('NOTE: A storage account was created to host the dacpac file, you can delete it after the database is created and populated successfully. To delete the storage account, copy the following code to a new code cell and run the cell.'))\r\n", + " display(HTML('NOTE: A storage account was created to host the package file, you can delete it after the database is created and populated successfully. To delete the storage account, copy the following code to a new code cell and run the cell.'))\r\n", " display(HTML(''+delete_storage_account_command+''))" ], "metadata": { @@ -344,4 +344,4 @@ "execution_count": null } ] -} \ No newline at end of file +} diff --git a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-remote.ipynb b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-remote.ipynb index e3c9988990..d2756fb0ea 100644 --- a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-remote.ipynb +++ b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-remote.ipynb @@ -261,7 +261,7 @@ { "cell_type": "code", "source": [ - "cmd = f'docker run -e ACCEPT_EULA=Y -e \"SA_PASSWORD={sql_password}\" -p {sql_port}:1433 --name {container_name} -d {docker_registry}/{docker_repository}:{docker_imagetag}'\n", + "cmd = f'docker run -e ACCEPT_EULA=Y -e \"SA_PASSWORD={sql_password}\" -e \"MSSQL_PID=Developer\" -p {sql_port}:1433 --name {container_name} -d {docker_registry}/{docker_repository}:{docker_imagetag}'\n", "run_command_remote()" ], "metadata": { diff --git a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-single-device.ipynb b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-single-device.ipynb index 9509554ba8..d0b3840e23 100644 --- a/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-single-device.ipynb +++ b/extensions/asde-deployment/notebooks/edge/deploy-sql-edge-single-device.ipynb @@ -26,8 +26,8 @@ "![Microsoft](https://raw.githubusercontent.com/microsoft/azuredatastudio/main/extensions/resource-deployment/images/microsoft-small-logo.png)\n", "## Deploy Azure SQL Edge to an existing device via IoT hub\n", "This notebook will walk you through process of deploying Azure SQL Edge to an existing device of an IoT hub:\n", - "1. Deploy Azure SQL Edge module to the device with optional dacpac\n", - "1. If a dacpac is selected, a storage account will be created to host the dacpac file\n", + "1. Deploy Azure SQL Edge module to the device with optional package\n", + "1. If a package is selected, a storage account will be created to host the package file\n", "1. Enable connecting to the Azure SQL Edge instance on the device\n", "\n", "### Dependencies\n", @@ -121,7 +121,7 @@ "azure_subscription_id = os.environ[\"AZDATA_NB_VAR_ASDE_SUBSCRIPTIONID\"]\n", "azure_resource_group = os.environ[\"AZDATA_NB_VAR_ASDE_RESOURCEGROUP\"]\n", "sa_password = os.environ[\"AZDATA_NB_VAR_SA_PASSWORD\"]\n", - "dacpac_path = os.environ[\"AZDATA_NB_VAR_ASDE_DACPAC_PATH\"]\n", + "package_path = os.environ[\"AZDATA_NB_VAR_ASDE_PACKAGE_PATH\"]\n", "sql_port = os.environ[\"AZDATA_NB_VAR_ASDE_SQL_PORT\"]\n", "iot_hub_name = os.environ[\"AZDATA_NB_VAR_ASDE_HUBNAME\"]\n", "iot_device_id = os.environ[\"AZDATA_NB_VAR_ASDE_DEVICE_ID\"]\n", @@ -133,7 +133,7 @@ "print(f'Device IP address: {ip_address}')\n", "print(f'Azure SQL Edge instance port: {sql_port}')\n", "print(f'Azure SQL Edge instance sa password: ******')\n", - "print(f'Dacpac path: {dacpac_path}')" + "print(f'Package path: {package_path}')" ], "metadata": { "azdata_cell_guid": "dde9388b-f623-4d62-bb74-36a05f5d2ea3", @@ -158,7 +158,7 @@ "source": [ "suffix = time.strftime(\"%y%m%d%H%M%S\", time.localtime())\n", "azure_storage_account = f'sa{suffix}'\n", - "storage_account_container = 'sqldatabasedacpac'\n", + "storage_account_container = 'sqldatabasepackage'\n", "sql_lcid = '1033'\n", "sql_collation = 'SQL_Latin1_General_CP1_CI_AS'" ], @@ -255,7 +255,7 @@ { "cell_type": "markdown", "source": [ - "### Create storage account and storage account container, then upload the dacpac" + "### Create storage account and storage account container, then upload the package" ], "metadata": { "azdata_cell_guid": "90ec2b26-0c4a-4aa4-b397-f16b09b454ea" @@ -265,11 +265,11 @@ "cell_type": "code", "source": [ "storage_account_created = False\n", - "if dacpac_path == \"\":\n", - " print(f'Dacpac zip file not provided')\n", + "if package_path == \"\":\n", + " print(f'Package file not provided')\n", " blob_sas = ''\n", "else:\n", - " dacpac_name = ntpath.basename(dacpac_path)\n", + " package_name = ntpath.basename(package_path)\n", " storage_accounts = run_command(f'az storage account list --resource-group {azure_resource_group} --subscription {azure_subscription_id}', returnObject=True)\n", " storage_accounts = [storage_account for storage_account in storage_accounts if storage_account['name'] == azure_storage_account]\n", " if len(storage_accounts) == 0:\n", @@ -285,14 +285,14 @@ " else:\n", " run_command(f'az storage container create --name {storage_account_container} --account-key {storage_account_key} --account-name {azure_storage_account} --auth-mode key')\n", "\n", - " blob_exists = run_command(f'az storage blob exists --container-name {storage_account_container} --name \\\"{dacpac_name}\\\" --account-key {storage_account_key} --account-name {azure_storage_account} --auth-mode key', returnObject=True)['exists']\n", + " blob_exists = run_command(f'az storage blob exists --container-name {storage_account_container} --name \\\"{package_name}\\\" --account-key {storage_account_key} --account-name {azure_storage_account} --auth-mode key', returnObject=True)['exists']\n", " if blob_exists:\n", - " print(f'blob \\\"{dacpac_name}\\\" already exists.')\n", + " print(f'blob \\\"{package_name}\\\" already exists.')\n", " else:\n", - " run_command(f'az storage blob upload --account-name {azure_storage_account} --container-name {storage_account_container} --name {dacpac_name} --file \\\"{dacpac_path}\\\" --account-key {storage_account_key} --auth-mode key')\n", + " run_command(f'az storage blob upload --account-name {azure_storage_account} --container-name {storage_account_container} --name {package_name} --file \\\"{package_path}\\\" --account-key {storage_account_key} --auth-mode key')\n", " now = time.localtime()\n", " expiry = f'{(now.tm_year + 1)}-{now.tm_mon}-{now.tm_mday}'\n", - " blob_sas = run_command(f'az storage blob generate-sas --container-name {storage_account_container} --name \\\"{dacpac_name}\\\" --account-name {azure_storage_account} --account-key {storage_account_key} --auth-mode key --full-uri --https-only --permissions r --expiry {expiry}', returnObject=True)" + " blob_sas = run_command(f'az storage blob generate-sas --container-name {storage_account_container} --name \\\"{package_name}\\\" --account-name {azure_storage_account} --account-key {storage_account_key} --auth-mode key --full-uri --https-only --permissions r --expiry {expiry}', returnObject=True)" ], "metadata": { "azdata_cell_guid": "7ab2b3ec-0832-40b3-98c0-4aa87320e7ce", @@ -315,8 +315,8 @@ { "cell_type": "code", "source": [ - "manifest = '{\\\"modulesContent\\\":{\\\"$edgeAgent\\\":{\\\"properties.desired\\\":{\\\"modules\\\":{\\\"AzureSQLEdge\\\":{\\\"settings\\\":{\\\"image\\\":\\\"mcr.microsoft.com/azure-sql-edge-developer\\\",\\\"createOptions\\\":\\\"{\\\\\\\"HostConfig\\\\\\\":{\\\\\\\"CapAdd\\\\\\\":[\\\\\\\"SYS_PTRACE\\\\\\\"],\\\\\\\"Binds\\\\\\\":[\\\\\\\"sqlvolume:/sqlvolume\\\\\\\"],\\\\\\\"PortBindings\\\\\\\":{\\\\\\\"1433/tcp\\\\\\\":[{\\\\\\\"HostPort\\\\\\\":\\\\\\\"\\\\\\\"}]},\\\\\\\"Mounts\\\\\\\":[{\\\\\\\"Type\\\\\\\":\\\\\\\"volume\\\\\\\",\\\\\\\"Source\\\\\\\":\\\\\\\"sqlvolume\\\\\\\",\\\\\\\"Target\\\\\\\":\\\\\\\"/var/opt/mssql\\\\\\\"}]},\\\\\\\"User\\\\\\\":\\\\\\\"0:0\\\\\\\",\\\\\\\"Env\\\\\\\":[\\\\\\\"MSSQL_AGENT_ENABLED=TRUE\\\\\\\",\\\\\\\"ClientTransportType=AMQP_TCP_Only\\\\\\\",\\\\\\\"MSSQL_PID=Developer\\\\\\\"]}\\\"},\\\"type\\\":\\\"docker\\\",\\\"version\\\":\\\"1.0\\\",\\\"env\\\":{\\\"ACCEPT_EULA\\\":{\\\"value\\\":\\\"Y\\\"},\\\"SA_PASSWORD\\\":{\\\"value\\\":\\\"\\\"},\\\"MSSQL_LCID\\\":{\\\"value\\\":\\\"\\\"},\\\"MSSQL_COLLATION\\\":{\\\"value\\\":\\\"\\\"}},\\\"status\\\":\\\"running\\\",\\\"restartPolicy\\\":\\\"always\\\"}},\\\"runtime\\\":{\\\"settings\\\":{\\\"minDockerVersion\\\":\\\"v1.25\\\"},\\\"type\\\":\\\"docker\\\"},\\\"schemaVersion\\\":\\\"1.0\\\",\\\"systemModules\\\":{\\\"edgeAgent\\\":{\\\"settings\\\":{\\\"image\\\":\\\"mcr.microsoft.com/azureiotedge-agent:1.0\\\",\\\"createOptions\\\":\\\"\\\"},\\\"type\\\":\\\"docker\\\"},\\\"edgeHub\\\":{\\\"settings\\\":{\\\"image\\\":\\\"mcr.microsoft.com/azureiotedge-hub:1.0\\\",\\\"createOptions\\\":\\\"{\\\\\\\"HostConfig\\\\\\\":{\\\\\\\"PortBindings\\\\\\\":{\\\\\\\"443/tcp\\\\\\\":[{\\\\\\\"HostPort\\\\\\\":\\\\\\\"443\\\\\\\"}],\\\\\\\"5671/tcp\\\\\\\":[{\\\\\\\"HostPort\\\\\\\":\\\\\\\"5671\\\\\\\"}],\\\\\\\"8883/tcp\\\\\\\":[{\\\\\\\"HostPort\\\\\\\":\\\\\\\"8883\\\\\\\"}]}}}\\\"},\\\"type\\\":\\\"docker\\\",\\\"status\\\":\\\"running\\\",\\\"restartPolicy\\\":\\\"always\\\"}}}},\\\"$edgeHub\\\":{\\\"properties.desired\\\":{\\\"routes\\\":{},\\\"schemaVersion\\\":\\\"1.0\\\",\\\"storeAndForwardConfiguration\\\":{\\\"timeToLiveSecs\\\":7200}}},\\\"AzureSQLEdge\\\":{\\\"properties.desired\\\":{\\\"SqlPackage\\\":\\\"\\\",\\\"ASAJobInfo\\\":\\\"\\\"}}}}'\n", - "manifest = manifest.replace('', blob_sas).replace('',sa_password).replace('',sql_lcid).replace('',sql_port).replace('',sql_collation)\n", + "manifest = '{\\\"modulesContent\\\":{\\\"$edgeAgent\\\":{\\\"properties.desired\\\":{\\\"modules\\\":{\\\"AzureSQLEdge\\\":{\\\"settings\\\":{\\\"image\\\":\\\"mcr.microsoft.com/azure-sql-edge\\\",\\\"createOptions\\\":\\\"{\\\\\\\"HostConfig\\\\\\\":{\\\\\\\"CapAdd\\\\\\\":[\\\\\\\"SYS_PTRACE\\\\\\\"],\\\\\\\"Binds\\\\\\\":[\\\\\\\"sqlvolume:/sqlvolume\\\\\\\"],\\\\\\\"PortBindings\\\\\\\":{\\\\\\\"1433/tcp\\\\\\\":[{\\\\\\\"HostPort\\\\\\\":\\\\\\\"\\\\\\\"}]},\\\\\\\"Mounts\\\\\\\":[{\\\\\\\"Type\\\\\\\":\\\\\\\"volume\\\\\\\",\\\\\\\"Source\\\\\\\":\\\\\\\"sqlvolume\\\\\\\",\\\\\\\"Target\\\\\\\":\\\\\\\"/var/opt/mssql\\\\\\\"}]},\\\\\\\"User\\\\\\\":\\\\\\\"0:0\\\\\\\",\\\\\\\"Env\\\\\\\":[\\\\\\\"MSSQL_AGENT_ENABLED=TRUE\\\\\\\",\\\\\\\"ClientTransportType=AMQP_TCP_Only\\\\\\\",\\\\\\\"PlanId=asde-developer-on-iot-edge\\\\\\\"]}\\\"},\\\"type\\\":\\\"docker\\\",\\\"version\\\":\\\"1.0\\\",\\\"env\\\":{\\\"ACCEPT_EULA\\\":{\\\"value\\\":\\\"Y\\\"},\\\"SA_PASSWORD\\\":{\\\"value\\\":\\\"\\\"},\\\"MSSQL_LCID\\\":{\\\"value\\\":\\\"\\\"},\\\"MSSQL_COLLATION\\\":{\\\"value\\\":\\\"\\\"},\\\"MSSQL_PACKAGE\\\":{\\\"value\\\":\\\"\\\"}},\\\"status\\\":\\\"running\\\",\\\"restartPolicy\\\":\\\"always\\\"}},\\\"runtime\\\":{\\\"settings\\\":{\\\"minDockerVersion\\\":\\\"v1.25\\\"},\\\"type\\\":\\\"docker\\\"},\\\"schemaVersion\\\":\\\"1.0\\\",\\\"systemModules\\\":{\\\"edgeAgent\\\":{\\\"settings\\\":{\\\"image\\\":\\\"mcr.microsoft.com/azureiotedge-agent:1.0\\\",\\\"createOptions\\\":\\\"\\\"},\\\"type\\\":\\\"docker\\\"},\\\"edgeHub\\\":{\\\"settings\\\":{\\\"image\\\":\\\"mcr.microsoft.com/azureiotedge-hub:1.0\\\",\\\"createOptions\\\":\\\"{\\\\\\\"HostConfig\\\\\\\":{\\\\\\\"PortBindings\\\\\\\":{\\\\\\\"443/tcp\\\\\\\":[{\\\\\\\"HostPort\\\\\\\":\\\\\\\"443\\\\\\\"}],\\\\\\\"5671/tcp\\\\\\\":[{\\\\\\\"HostPort\\\\\\\":\\\\\\\"5671\\\\\\\"}],\\\\\\\"8883/tcp\\\\\\\":[{\\\\\\\"HostPort\\\\\\\":\\\\\\\"8883\\\\\\\"}]}}}\\\"},\\\"type\\\":\\\"docker\\\",\\\"status\\\":\\\"running\\\",\\\"restartPolicy\\\":\\\"always\\\"}}}},\\\"$edgeHub\\\":{\\\"properties.desired\\\":{\\\"routes\\\":{},\\\"schemaVersion\\\":\\\"1.0\\\",\\\"storeAndForwardConfiguration\\\":{\\\"timeToLiveSecs\\\":7200}}},\\\"AzureSQLEdge\\\":{\\\"properties.desired\\\":{\\\"ASAJobInfo\\\":\\\"\\\"}}}}'\n", + "manifest = manifest.replace('', blob_sas).replace('',sa_password).replace('',sql_lcid).replace('',sql_port).replace('',sql_collation)\n", "file_name = f'{uuid.uuid4().hex}.json'\n", "manifest_file = open(file_name, 'w')\n", "manifest_file.write(manifest)\n", @@ -368,7 +368,7 @@ "source": [ "if storage_account_created:\r\n", " delete_storage_account_command = \"run_command(f'az storage account delete -n {azure_storage_account} -g {azure_resource_group} --yes')\"\r\n", - " display(HTML('NOTE: A storage account was created to host the dacpac file, you can delete it after the database is created and populated successfully. To delete the storage account, copy the following code to a new code cell and run the cell.'))\r\n", + " display(HTML('NOTE: A storage account was created to host the package file, you can delete it after the database is created and populated successfully. To delete the storage account, copy the following code to a new code cell and run the cell.'))\r\n", " display(HTML(''+delete_storage_account_command+''))" ], "metadata": { @@ -381,4 +381,4 @@ "execution_count": null } ] -} \ No newline at end of file +} diff --git a/extensions/asde-deployment/package.json b/extensions/asde-deployment/package.json index ce21425656..d8dad3d063 100644 --- a/extensions/asde-deployment/package.json +++ b/extensions/asde-deployment/package.json @@ -113,7 +113,7 @@ "label": "%docker-repository-field%", "variableName": "AZDATA_NB_VAR_DOCKER_REPOSITORY", "type": "text", - "defaultValue": "azure-sql-edge-developer", + "defaultValue": "azure-sql-edge", "required": true }, { @@ -234,7 +234,7 @@ "label": "%docker-repository-field%", "variableName": "AZDATA_NB_VAR_DOCKER_REPOSITORY", "type": "text", - "defaultValue": "azure-sql-edge-developer", + "defaultValue": "azure-sql-edge", "required": true }, { @@ -363,14 +363,17 @@ "required": true }, { - "label": "%dacpac_path%", - "variableName": "AZDATA_NB_VAR_ASDE_DACPAC_PATH", + "label": "%package_path%", + "description": "%package_path_description%", + "variableName": "AZDATA_NB_VAR_ASDE_PACKAGE_PATH", "type": "file_picker", "required": false, "filter": { - "displayName": "%dacpac-zip-files%", + "displayName": "%package-files%", "fileTypes": [ - "zip" + "zip", + "bacpac", + "dacpac" ] } } @@ -450,14 +453,17 @@ "required": true }, { - "label": "%dacpac_path%", - "variableName": "AZDATA_NB_VAR_ASDE_DACPAC_PATH", + "label": "%package_path%", + "description": "%package_path_description%", + "variableName": "AZDATA_NB_VAR_ASDE_PACKAGE_PATH", "type": "file_picker", "required": false, "filter": { - "displayName": "%dacpac-zip-files%", + "displayName": "%package-files%", "fileTypes": [ - "zip" + "zip", + "bacpac", + "dacpac" ] } } @@ -540,14 +546,17 @@ "required": true }, { - "label": "%dacpac_path%", - "variableName": "AZDATA_NB_VAR_ASDE_DACPAC_PATH", + "label": "%package_path%", + "description": "%package_path_description%", + "variableName": "AZDATA_NB_VAR_ASDE_PACKAGE_PATH", "type": "file_picker", "required": false, "filter": { - "displayName": "%dacpac-zip-files%", + "displayName": "%package-files%", "fileTypes": [ - "zip" + "zip", + "bacpac", + "dacpac" ] } } diff --git a/extensions/asde-deployment/package.nls.json b/extensions/asde-deployment/package.nls.json index e37699bb2f..4c4823fda3 100644 --- a/extensions/asde-deployment/package.nls.json +++ b/extensions/asde-deployment/package.nls.json @@ -33,10 +33,11 @@ "vm_admin": "VM admin username", "vm_password": "VM admin password", "vm_password_confirm": "Confirm VM admin password", - "dacpac_path": "Dacpac zip file", + "package_path": "Package file", + "package_path_description": "Path of the SQL Server package file(dacpac, bacpac) or compressed package file.", "azure-info-section-title": "Azure information", "sqlserver-info-section-title": "Azure SQL Edge information", - "dacpac-zip-files": "Dacpac zip files", + "package-files": "SQL Server Package files", "sql-edge-azure-single-device-display-name": "Existing device of an Azure IoT Hub", "sql-edge-azure-single-device-title": "Deploy Azure SQL Edge to an existing device", "iot-hub-name": "IoT Hub name",