Add compose service startup CodeLenses, update vscode-docker-registries

package.json

@@ -3008,13 +3008,13 @@
         "@azure/arm-authorization": "^9.0.0",
         "@azure/arm-containerregistry": "^10.1.0",
         "@azure/storage-blob": "^12.14.0",
-        "@microsoft/compose-language-service": "^0.2.0",
+        "@microsoft/compose-language-service": "^0.3.0",
         "@microsoft/vscode-azext-azureappservice": "~3.3.0",
         "@microsoft/vscode-azext-azureauth": "^2.4.1",
         "@microsoft/vscode-azext-azureutils": "^3.0.1",
         "@microsoft/vscode-azext-utils": "^2.5.1",
         "@microsoft/vscode-container-client": "^0.1.2",
-        "@microsoft/vscode-docker-registries": "^0.1.12",
+        "@microsoft/vscode-docker-registries": "^0.1.13",
         "dayjs": "^1.11.7",
         "dockerfile-language-server-nodejs": "^0.13.0",
         "fs-extra": "^11.1.1",

src/commands/compose/compose.ts

@@ -12,11 +12,15 @@ import { quickPickWorkspaceFolder } from '../../utils/quickPickWorkspaceFolder';
 import { selectComposeCommand } from '../selectCommandTemplate';
 import { getComposeProfileList, getComposeProfilesOrServices, getComposeServiceList } from './getComposeSubsetList';
 
-async function compose(context: IActionContext, commands: ('up' | 'down' | 'upSubset')[], message: string, dockerComposeFileUri?: vscode.Uri, selectedComposeFileUris?: vscode.Uri[]): Promise<void> {
+async function compose(context: IActionContext, commands: ('up' | 'down' | 'upSubset')[], message: string, dockerComposeFileUri?: vscode.Uri | string, selectedComposeFileUris?: vscode.Uri[], preselectedServices?: string[]): Promise<void> {
     if (!vscode.workspace.isTrusted) {
         throw new UserCancelledError('enforceTrust');
     }
 
+    if (typeof dockerComposeFileUri === 'string') {
+        dockerComposeFileUri = vscode.Uri.parse(dockerComposeFileUri);
+    }
+
     // If a file is chosen, get its workspace folder, otherwise, require the user to choose
     // If a file is chosen that is not in a workspace, it will automatically fall back to quickPickWorkspaceFolder
     const folder: vscode.WorkspaceFolder = (dockerComposeFileUri ? vscode.workspace.getWorkspaceFolder(dockerComposeFileUri) : undefined) ||
@@ -59,7 +63,7 @@ async function compose(context: IActionContext, commands: ('up' | 'down' | 'upSu
             );
 
             // Add the service list if needed
-            terminalCommand.command = await addServicesOrProfilesIfNeeded(context, folder, terminalCommand.command);
+            terminalCommand.command = await addServicesOrProfilesIfNeeded(context, folder, terminalCommand.command, preselectedServices);
 
             const client = await ext.orchestratorManager.getClient();
             const taskCRF = new TaskCommandRunnerFactory({
@@ -72,12 +76,14 @@ async function compose(context: IActionContext, commands: ('up' | 'down' | 'upSu
     }
 }
 
+// The parameters of this function should not be changed without updating the compose language service which uses this command
 export async function composeUp(context: IActionContext, dockerComposeFileUri?: vscode.Uri, selectedComposeFileUris?: vscode.Uri[]): Promise<void> {
     return await compose(context, ['up'], vscode.l10n.t('Choose Docker Compose file to bring up'), dockerComposeFileUri, selectedComposeFileUris);
 }
 
-export async function composeUpSubset(context: IActionContext, dockerComposeFileUri?: vscode.Uri, selectedComposeFileUris?: vscode.Uri[]): Promise<void> {
-    return await compose(context, ['upSubset'], vscode.l10n.t('Choose Docker Compose file to bring up'), dockerComposeFileUri, selectedComposeFileUris);
+// The parameters of this function should not be changed without updating the compose language service which uses this command
+export async function composeUpSubset(context: IActionContext, dockerComposeFileUri?: vscode.Uri, selectedComposeFileUris?: vscode.Uri[], preselectedServices?: string[]): Promise<void> {
+    return await compose(context, ['upSubset'], vscode.l10n.t('Choose Docker Compose file to bring up'), dockerComposeFileUri, selectedComposeFileUris, preselectedServices);
 }
 
 export async function composeDown(context: IActionContext, dockerComposeFileUri?: vscode.Uri, selectedComposeFileUris?: vscode.Uri[]): Promise<void> {
@@ -90,9 +96,12 @@ export async function composeRestart(context: IActionContext, dockerComposeFileU
 
 const serviceListPlaceholder = /\${serviceList}/i;
 const profileListPlaceholder = /\${profileList}/i;
-async function addServicesOrProfilesIfNeeded(context: IActionContext, workspaceFolder: vscode.WorkspaceFolder, command: string): Promise<string> {
+async function addServicesOrProfilesIfNeeded(context: IActionContext, workspaceFolder: vscode.WorkspaceFolder, command: string, preselectedServices: string[]): Promise<string> {
     const commandWithoutPlaceholders = command.replace(serviceListPlaceholder, '').replace(profileListPlaceholder, '');
-    if (serviceListPlaceholder.test(command) && profileListPlaceholder.test(command)) {
+
+    if (preselectedServices?.length && serviceListPlaceholder.test(command)) {
+        return command.replace(serviceListPlaceholder, preselectedServices.join(' '));
+    } else if (serviceListPlaceholder.test(command) && profileListPlaceholder.test(command)) {
         // If both are present, need to ask
         const { services, profiles } = await getComposeProfilesOrServices(context, workspaceFolder, commandWithoutPlaceholders);
         return command

src/utils/AlternateYamlLanguageServiceClientFeature.ts

@@ -30,6 +30,7 @@ export class AlternateYamlLanguageServiceClientFeature implements StaticFeature,
                 advancedCompletions: false, // YAML extension does not have advanced completions for compose docs
                 hover: false, // YAML extension provides hover, but the compose spec lacks descriptions -- https://github.com/compose-spec/compose-spec/issues/138
                 imageLinks: false, // YAML extension does not have image hyperlinks for compose docs
+                serviceStartupCodeLens: false, // YAML extension does not have service startup code lens for compose docs
                 formatting: true,
             };