@@ -620,20 +620,20 @@ export class Commands {
620
620
*
621
621
* Throw if not logged into a deployment.
622
622
*/
623
- public async openDevContainer ( ...args : string [ ] ) : Promise < void > {
623
+ public async openDevContainer (
624
+ workspaceOwner : string ,
625
+ workspaceName : string ,
626
+ workspaceAgent : string ,
627
+ devContainerName : string ,
628
+ devContainerFolder : string ,
629
+ localWorkspaceFolder : string = "" ,
630
+ localConfigFile : string = "" ,
631
+ ) : Promise < void > {
624
632
const baseUrl = this . restClient . getAxiosInstance ( ) . defaults . baseURL ;
625
633
if ( ! baseUrl ) {
626
634
throw new Error ( "You are not logged in" ) ;
627
635
}
628
636
629
- const workspaceOwner = args [ 0 ] as string ;
630
- const workspaceName = args [ 1 ] as string ;
631
- const workspaceAgent = args [ 2 ] as string ;
632
- const devContainerName = args [ 3 ] as string ;
633
- const devContainerFolder = args [ 4 ] as string ;
634
- const localWorkspaceFolder = args [ 5 ] as string | undefined ;
635
- const localConfigFile = args [ 6 ] as string | undefined ;
636
-
637
637
await openDevContainer (
638
638
baseUrl ,
639
639
workspaceOwner ,
@@ -755,8 +755,8 @@ async function openDevContainer(
755
755
workspaceAgent : string ,
756
756
devContainerName : string ,
757
757
devContainerFolder : string ,
758
- localWorkspaceFolder : string | undefined ,
759
- localConfigFile : string | undefined ,
758
+ localWorkspaceFolder : string = "" ,
759
+ localConfigFile : string = "" ,
760
760
) {
761
761
const remoteAuthority = toRemoteAuthority (
762
762
baseUrl ,
@@ -765,20 +765,18 @@ async function openDevContainer(
765
765
workspaceAgent ,
766
766
) ;
767
767
768
- if ( ! localWorkspaceFolder ) {
769
- localConfigFile = undefined ;
770
- }
771
- let configFile ;
772
- if ( localConfigFile ) {
773
- configFile = {
774
- path : localConfigFile ,
775
- scheme : "vscode-fileHost" ,
776
- } ;
777
- }
768
+ const hostPath = localWorkspaceFolder ? localWorkspaceFolder : undefined ;
769
+ const configFile =
770
+ hostPath && localConfigFile
771
+ ? {
772
+ path : localConfigFile ,
773
+ scheme : "vscode-fileHost" ,
774
+ }
775
+ : undefined ;
778
776
const devContainer = Buffer . from (
779
777
JSON . stringify ( {
780
778
containerName : devContainerName ,
781
- hostPath : localWorkspaceFolder ,
779
+ hostPath,
782
780
configFile,
783
781
localDocker : false ,
784
782
} ) ,
0 commit comments