diff --git a/extensions/arc/notebooks/arcDeployment/deploy.arc.control.plane.ipynb b/extensions/arc/notebooks/arcDeployment/deploy.arc.control.plane.ipynb index a6cdc9c919..00bc359754 100644 --- a/extensions/arc/notebooks/arcDeployment/deploy.arc.control.plane.ipynb +++ b/extensions/arc/notebooks/arcDeployment/deploy.arc.control.plane.ipynb @@ -90,7 +90,7 @@ "cell_type": "markdown", "source": [ "### **Set variables**\n", - "Generated by Azure Data Studio using the values collected in the Azure Arc Data controller create wizard" + "Generated by Azure Data Studio using the values collected in the Azure Arc Data Controller create wizard" ], "metadata": { "azdata_cell_guid": "4b266b2d-bd1b-4565-92c9-3fc146cdce6d" @@ -133,7 +133,7 @@ " arc_admin_password = os.environ[\"AZDATA_NB_VAR_ARC_ADMIN_PASSWORD\"]\n", "else:\n", " if arc_admin_password == \"\":\n", - " arc_admin_password = getpass.getpass(prompt = 'Azure Arc Data controller password')\n", + " arc_admin_password = getpass.getpass(prompt = 'Azure Arc Data Controller password')\n", " if arc_admin_password == \"\":\n", " sys.exit(f'Password is required.')\n", " confirm_password = getpass.getpass(prompt = 'Confirm password')\n", @@ -173,7 +173,7 @@ { "cell_type": "markdown", "source": [ - "### **Create Azure Arc Data controller**" + "### **Create Azure Arc Data Controller**" ], "metadata": { "azdata_cell_guid": "efe78cd3-ed73-4c9b-b586-fdd6c07dd37f" @@ -182,14 +182,14 @@ { "cell_type": "code", "source": [ - "print (f'Creating Azure Arc controller: {arc_data_controller_name} using configuration {arc_cluster_context}')\n", + "print (f'Creating Azure Arc Data Controller: {arc_data_controller_name} using configuration {arc_cluster_context}')\n", "os.environ[\"ACCEPT_EULA\"] = 'yes'\n", "os.environ[\"AZDATA_USERNAME\"] = arc_admin_username\n", "os.environ[\"AZDATA_PASSWORD\"] = arc_admin_password\n", "if os.name == 'nt':\n", " print(f'If you don\\'t see output produced by azdata, you can run the following command in a terminal window to check the deployment status:\\n\\t {os.environ[\"AZDATA_NB_VAR_KUBECTL\"]} get pods -n {arc_data_controller_namespace}')\n", "run_command(f'azdata arc dc create --connectivity-mode {arc_data_controller_connectivity_mode} -n {arc_data_controller_name} -ns {arc_data_controller_namespace} -s {arc_subscription} -g {arc_resource_group} -l {arc_data_controller_location} -sc {arc_data_controller_storage_class} --profile-name {arc_profile}')\n", - "print(f'Azure Arc Data controller cluster: {arc_data_controller_name} created.') " + "print(f'Azure Arc Data Controller: {arc_data_controller_name} created.') " ], "metadata": { "azdata_cell_guid": "373947a1-90b9-49ee-86f4-17a4c7d4ca76", @@ -201,7 +201,7 @@ { "cell_type": "markdown", "source": [ - "### **Setting context to created Azure Arc Data controller**" + "### **Setting context to created Azure Arc Data Controller**" ], "metadata": { "azdata_cell_guid": "a3ddc701-811d-4058-b3fb-b7295fcf50ae" @@ -210,7 +210,7 @@ { "cell_type": "code", "source": [ - "# Setting context to data controller.\n", + "# Setting context to Data Controller.\n", "#\n", "run_command(f'kubectl config set-context --current --namespace {arc_data_controller_namespace}')" ], @@ -223,7 +223,7 @@ { "cell_type": "markdown", "source": [ - "### **Login to the data controller.**\n" + "### **Login to the Data Controller.**\n" ], "metadata": { "azdata_cell_guid": "9376b2ab-0edf-478f-9e3c-5ff46ae3501a" @@ -232,7 +232,7 @@ { "cell_type": "code", "source": [ - "# Login to the data controller.\n", + "# Login to the Data Controller.\n", "#\n", "run_command(f'azdata login -n {arc_data_controller_namespace}')" ], diff --git a/extensions/arc/notebooks/arcDeployment/deploy.postgres.existing.arc.ipynb b/extensions/arc/notebooks/arcDeployment/deploy.postgres.existing.arc.ipynb index 6a6a029e42..dcfd42dfaa 100644 --- a/extensions/arc/notebooks/arcDeployment/deploy.postgres.existing.arc.ipynb +++ b/extensions/arc/notebooks/arcDeployment/deploy.postgres.existing.arc.ipynb @@ -25,12 +25,12 @@ "source": [ "![Microsoft](https://raw.githubusercontent.com/microsoft/azuredatastudio/main/extensions/arc/images/microsoft-small-logo.png)\n", " \n", - "## Deploy a PostgreSQL server group on an existing Azure Arc data cluster\n", + "## Create a PostgreSQL Hyperscale - Azure Arc on an existing Azure Arc Data Controller\n", " \n", - "This notebook walks through the process of deploying a PostgreSQL server group on an existing Azure Arc data cluster.\n", + "This notebook walks through the process of creating a PostgreSQL Hyperscale - Azure Arc on an existing Azure Arc Data Controller.\n", " \n", "* Follow the instructions in the **Prerequisites** cell to install the tools if not already installed.\n", - "* Make sure you have the target Azure Arc data cluster already created.\n", + "* Make sure you have the target Azure Arc Data Controller already created.\n", "\n", "Please press the \"Run All\" button to run the notebook" ], @@ -75,7 +75,7 @@ { "cell_type": "markdown", "source": [ - "#### **Ensure Postgres Server Group name and password exist**" + "#### **Ensure required parameters exist**" ], "metadata": { "azdata_cell_guid": "68ec0760-27d1-4ded-9a9f-89077c40b8bb" @@ -142,7 +142,7 @@ { "cell_type": "markdown", "source": [ - "#### **Get optional parameters for the PostgreSQL server group**" + "#### **Get optional parameters**" ], "metadata": { "azdata_cell_guid": "68ec0760-27d1-4ded-9a9f-89077c40b8bb" @@ -173,7 +173,7 @@ { "cell_type": "markdown", "source": [ - "### **Installing PostgreSQL server group**" + "### **Creating the PostgreSQL Hyperscale - Azure Arc instance**" ], "metadata": { "azdata_cell_guid": "90b0e162-2987-463f-9ce6-12dda1267189" @@ -197,7 +197,7 @@ { "cell_type": "code", "source": [ - "print (f'Creating a PostgreSQL server group on Azure Arc')\n", + "print (f'Creating the PostgreSQL Hyperscale - Azure Arc instance')\n", "\n", "workers_option = f' -w {server_group_workers}' if server_group_workers else \"\"\n", "port_option = f' --port \"{server_group_port}\"' if server_group_port else \"\"\n", @@ -222,4 +222,4 @@ "execution_count": null } ] -} \ No newline at end of file +} diff --git a/extensions/arc/notebooks/arcDeployment/deploy.sql.existing.arc.ipynb b/extensions/arc/notebooks/arcDeployment/deploy.sql.existing.arc.ipynb index 4c89d7d11e..d44e5f5c2a 100644 --- a/extensions/arc/notebooks/arcDeployment/deploy.sql.existing.arc.ipynb +++ b/extensions/arc/notebooks/arcDeployment/deploy.sql.existing.arc.ipynb @@ -25,12 +25,12 @@ "source": [ "![Microsoft](https://raw.githubusercontent.com/microsoft/azuredatastudio/main/extensions/arc/images/microsoft-small-logo.png)\n", " \n", - "## Deploy Azure SQL managed instance on an existing Azure Arc data cluster\n", + "## Create SQL managed instance - Azure Arc on an existing Azure Arc Data Controller\n", " \n", - "This notebook walks through the process of deploying a Azure SQL managed instance on an existing Azure Arc data cluster.\n", + "This notebook walks through the process of creating a SQL managed instance - Azure Arc on an existing Azure Arc Data Controller.\n", " \n", "* Follow the instructions in the **Prerequisites** cell to install the tools if not already installed.\n", - "* Make sure you have the target Azure Arc data cluster already created.\n", + "* Make sure you have the target Azure Arc Data Controller already created.\n", "\n", "Please press the \"Run All\" button to run the notebook" ], @@ -167,7 +167,7 @@ { "cell_type": "markdown", "source": [ - "### **Installing Managed SQL Instance**" + "### **Creating the SQL managed instance - Azure Arc instance**" ], "metadata": { "azdata_cell_guid": "90b0e162-2987-463f-9ce6-12dda1267189" @@ -191,7 +191,7 @@ { "cell_type": "code", "source": [ - "print (f'Creating Managed SQL Server instance on Azure Arc')\n", + "print (f'Creating the SQL managed instance - Azure Arc instance')\n", "\n", "cores_request_option = f' -cr \"{sql_instance_cores_request}\"' if sql_instance_cores_request else \"\"\n", "cores_limit_option = f' -cl \"{sql_instance_cores_limit}\"' if sql_instance_cores_limit else \"\"\n", diff --git a/extensions/arc/src/localizedConstants.ts b/extensions/arc/src/localizedConstants.ts index 4ac07c29fb..adb9c9f85c 100644 --- a/extensions/arc/src/localizedConstants.ts +++ b/extensions/arc/src/localizedConstants.ts @@ -8,13 +8,13 @@ import { getErrorMessage } from './common/utils'; const localize = nls.loadMessageBundle(); export const arcDeploymentDeprecation = localize('arc.arcDeploymentDeprecation', "The Arc Deployment extension has been replaced by the Arc extension and has been uninstalled."); -export function arcControllerDashboard(name: string): string { return localize('arc.controllerDashboard', "Azure Arc Controller Dashboard (Preview) - {0}", name); } -export function miaaDashboard(name: string): string { return localize('arc.miaaDashboard', "Managed Instance Dashboard (Preview) - {0}", name); } -export function postgresDashboard(name: string): string { return localize('arc.postgresDashboard', "Postgres Dashboard (Preview) - {0}", name); } +export function arcControllerDashboard(name: string): string { return localize('arc.controllerDashboard', "Azure Arc Data Controller Dashboard (Preview) - {0}", name); } +export function miaaDashboard(name: string): string { return localize('arc.miaaDashboard', "SQL managed instance - Azure Arc Dashboard (Preview) - {0}", name); } +export function postgresDashboard(name: string): string { return localize('arc.postgresDashboard', "PostgreSQL Hyperscale - Azure Arc Dashboard (Preview) - {0}", name); } export const dataControllersType = localize('arc.dataControllersType', "Azure Arc Data Controller"); export const pgSqlType = localize('arc.pgSqlType', "PostgreSQL Hyperscale - Azure Arc"); -export const miaaType = localize('arc.miaaType', "SQL instance - Azure Arc"); +export const miaaType = localize('arc.miaaType', "SQL managed instance - Azure Arc"); export const overview = localize('arc.overview', "Overview"); export const connectionStrings = localize('arc.connectionStrings', "Connection Strings"); @@ -74,7 +74,7 @@ export const loading = localize('arc.loading', "Loading..."); export const refreshToEnterCredentials = localize('arc.refreshToEnterCredentials', "Refresh node to enter credentials"); export const noInstancesAvailable = localize('arc.noInstancesAvailable', "No instances available"); export const connectToController = localize('arc.connectToController', "Connect to Existing Controller"); -export function connectToSql(name: string): string { return localize('arc.connectToSql', "Connect to SQL instance - Azure Arc ({0})", name); } +export function connectToSql(name: string): string { return localize('arc.connectToSql', "Connect to SQL managed instance - Azure Arc ({0})", name); } export const passwordToController = localize('arc.passwordToController', "Provide Password to Controller"); export const controllerUrl = localize('arc.controllerUrl', "Controller URL"); export const serverEndpoint = localize('arc.serverEndpoint', "Server Endpoint"); @@ -152,7 +152,7 @@ export function openDashboardFailed(error: any): string { return localize('arc.o export function instanceDeletionFailed(name: string, error: any): string { return localize('arc.instanceDeletionFailed', "Failed to delete instance {0}. {1}", name, getErrorMessage(error)); } export function databaseCreationFailed(name: string, error: any): string { return localize('arc.databaseCreationFailed', "Failed to create database {0}. {1}", name, getErrorMessage(error)); } export function connectToControllerFailed(url: string, error: any): string { return localize('arc.connectToControllerFailed', "Could not connect to controller {0}. {1}", url, getErrorMessage(error)); } -export function connectToSqlFailed(serverName: string, error: any): string { return localize('arc.connectToSqlFailed', "Could not connect to MIAA Instance {0}. {1}", serverName, getErrorMessage(error)); } +export function connectToSqlFailed(serverName: string, error: any): string { return localize('arc.connectToSqlFailed', "Could not connect to SQL managed instance - Azure Arc Instance {0}. {1}", serverName, getErrorMessage(error)); } export function fetchConfigFailed(name: string, error: any): string { return localize('arc.fetchConfigFailed', "An unexpected error occurred retrieving the config for '{0}'. {1}", name, getErrorMessage(error)); } export function fetchEndpointsFailed(name: string, error: any): string { return localize('arc.fetchEndpointsFailed', "An unexpected error occurred retrieving the endpoints for '{0}'. {1}", name, getErrorMessage(error)); } export function fetchRegistrationsFailed(name: string, error: any): string { return localize('arc.fetchRegistrationsFailed', "An unexpected error occurred retrieving the registrations for '{0}'. {1}", name, getErrorMessage(error)); } diff --git a/extensions/azdata/src/localizedConstants.ts b/extensions/azdata/src/localizedConstants.ts index 8644dec358..f1bf513945 100644 --- a/extensions/azdata/src/localizedConstants.ts +++ b/extensions/azdata/src/localizedConstants.ts @@ -12,8 +12,8 @@ export const foundExistingAzdata = (path: string, version: string): string => lo export const downloadingProgressMb = (currentMb: string, totalMb: string): string => localize('azdata.downloadingProgressMb', "Downloading ({0} / {1} MB)", currentMb, totalMb); export const downloadFinished = localize('azdata.downloadFinished', "Download finished"); -export const installingAzdata = localize('azdata.installingAzdata', "Installing azdata..."); -export const updatingAzdata = localize('azdata.updatingAzdata', "updating azdata..."); +export const installingAzdata = localize('azdata.installingAzdata', "Installing Azure Data CLI..."); +export const updatingAzdata = localize('azdata.updatingAzdata', "Updating Azure Data CLI..."); export const azdataInstalled = localize('azdata.azdataInstalled', "Azure Data CLI was successfully installed. Restarting Azure Data Studio is required to complete configuration - features will not be activated until this is done."); export const azdataUpdated = (version: string) => localize('azdata.azdataUpdated', "Azure Data CLI was successfully updated to version: {0}.", version); export const yes = localize('azdata.yes', "Yes"); @@ -26,32 +26,32 @@ export const downloadingTo = (name: string, location: string): string => localiz export const executingCommand = (command: string, args: string[]): string => localize('azdata.executingCommand', "Executing command: '{0} {1}'", command, args?.join(' ')); export const stdoutOutput = (stdout: string): string => localize('azdata.stdoutOutput', "stdout: {0}", stdout); export const stderrOutput = (stderr: string): string => localize('azdata.stderrOutput', "stderr: {0}", stderr); -export const checkingLatestAzdataVersion = localize('azdata.checkingLatestAzdataVersion', "Checking for latest available version of azdata"); +export const checkingLatestAzdataVersion = localize('azdata.checkingLatestAzdataVersion', "Checking for latest available version of Azure Data CLI"); export const gettingTextContentsOfUrl = (url: string): string => localize('azdata.gettingTextContentsOfUrl', "Getting text contents of resource at URL {0}", url); export const foundAzdataVersionToUpdateTo = (newVersion: string, currentVersion: string): string => localize('azdata.versionForUpdate', "Found version: {0} that Azure Data CLI can be updated to from current version: {1}.", newVersion, currentVersion); export const latestAzdataVersionAvailable = (version: string): string => localize('azdata.latestAzdataVersionAvailable', "Latest available Azure Data CLI version: {0}.", version); -export const couldNotFindAzdata = (err: any): string => localize('azdata.couldNotFindAzdata', "Could not find azdata. Error: {0}", err.message ?? err); -export const currentlyInstalledVersionIsLatest = (currentVersion: string): string => localize('azdata.currentlyInstalledVersionIsLatest', "Currently installed version of azdata: {0} is same or newer than any other version available", currentVersion); +export const couldNotFindAzdata = (err: any): string => localize('azdata.couldNotFindAzdata', "Could not find Azure Data CLI. Error: {0}", err.message ?? err); +export const currentlyInstalledVersionIsLatest = (currentVersion: string): string => localize('azdata.currentlyInstalledVersionIsLatest', "Currently installed version of Azure Data CLI: {0} is same or newer than any other version available", currentVersion); export const promptLog = (logEntry: string) => localize('azdata.promptLog', "Prompting the user to accept the following: {0}", logEntry); -export const promptForAzdataInstall = localize('azdata.couldNotFindAzdataWithPrompt', "Could not find azdata, install it now? If not then some features will not be able to function."); +export const promptForAzdataInstall = localize('azdata.couldNotFindAzdataWithPrompt', "Could not find Azure Data CLI, install it now? If not then some features will not be able to function."); export const promptForAzdataInstallLog = promptLog(promptForAzdataInstall); export const promptForAzdataUpdate = (version: string): string => localize('azdata.promptForAzdataUpdate', "A new version of Azure Data CLI ( {0} ) is available, do you wish to update to it now?", version); export const promptForAzdataUpdateLog = (version: string): string => promptLog(promptForAzdataUpdate(version)); export const downloadError = localize('azdata.downloadError', "Error while downloading"); -export const installError = (err: any): string => localize('azdata.installError', "Error installing azdata: {0}", err.message ?? err); -export const updateError = (err: any): string => localize('azdata.updateError', "Error updating azdata: {0}", err.message ?? err); +export const installError = (err: any): string => localize('azdata.installError', "Error installing Azure Data CLI: {0}", err.message ?? err); +export const updateError = (err: any): string => localize('azdata.updateError', "Error updating Azure Data CLI: {0}", err.message ?? err); export const platformUnsupported = (platform: string): string => localize('azdata.platformUnsupported', "Platform '{0}' is currently unsupported", platform); export const unexpectedCommandError = (errMsg: string): string => localize('azdata.unexpectedCommandError', "Unexpected error executing command: {0}", errMsg); export const unexpectedExitCode = (code: number, err: string): string => localize('azdata.unexpectedExitCode', "Unexpected exit code from command: {1} ({0})", code, err); export const noAzdata = localize('azdata.NoAzdata', "No Azure Data CLI is available, [install the Azure Data CLI](command:azdata.install) to enable the features that require it."); -export const skipInstall = (config: string): string => localize('azdata.skipInstall', "Skipping installation of azdata, since the operation was not user requested and config option: {0}.{1} is {2}", azdataConfigSection, azdataInstallKey, config); -export const skipUpdate = (config: string): string => localize('azdata.skipUpdate', "Skipping update of azdata, since the operation was not user requested and config option: {0}.{1} is {2}", azdataConfigSection, azdataUpdateKey, config); +export const skipInstall = (config: string): string => localize('azdata.skipInstall', "Skipping installation of Azure Data CLI, since the operation was not user requested and config option: {0}.{1} is {2}", azdataConfigSection, azdataInstallKey, config); +export const skipUpdate = (config: string): string => localize('azdata.skipUpdate', "Skipping update of Azure Data CLI, since the operation was not user requested and config option: {0}.{1} is {2}", azdataConfigSection, azdataUpdateKey, config); export const azdataUserSettingRead = (configName: string, configValue: string): string => localize('azdata.azdataUserSettingReadLog', "Azure Data CLI user setting: {0}.{1} read, value: {2}", azdataConfigSection, configName, configValue); export const azdataUserSettingUpdated = (configName: string, configValue: string): string => localize('azdata.azdataUserSettingUpdatedLog', "Azure Data CLI user setting: {0}.{1} updated, newValue: {2}", azdataConfigSection, configName, configValue); -export const userResponseToInstallPrompt = (response: string | undefined): string => localize('azdata.userResponseInstall', "User Response on prompt to install azdata: {0}", response); -export const userResponseToUpdatePrompt = (response: string | undefined): string => localize('azdata.userResponseUpdate', "User Response on prompt to update azdata: {0}", response); +export const userResponseToInstallPrompt = (response: string | undefined): string => localize('azdata.userResponseInstall', "User Response on prompt to install Azure Data CLI: {0}", response); +export const userResponseToUpdatePrompt = (response: string | undefined): string => localize('azdata.userResponseUpdate', "User Response on prompt to update Azure Data CLI: {0}", response); export const userRequestedInstall = localize('azdata.userRequestedInstall', "User requested to install Azure Data CLI using 'Azure Data CLI: Install' command"); export const userRequestedUpdate = localize('azdata.userRequestedUpdate', "User requested to update Azure Data CLI using 'Azure Data CLI: Check for Update' command"); export const userRequestedAcceptEula = localize('azdata.acceptEula', "User requested to be prompted for accepting EULA by invoking 'Azure Data CLI: Accept EULA' command");