map more devcontainer.json fields

metio · Feb 18, 2023 · 491cb76 · 491cb76
1 parent 3e98f6c
commit 491cb76
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 0 deletions.
diff --git a/src/main/java/wtf/metio/ilo/devcontainer/DevcontainerOptionsMapper.java b/src/main/java/wtf/metio/ilo/devcontainer/DevcontainerOptionsMapper.java
@@ -11,6 +11,7 @@
 import wtf.metio.devcontainer.Devcontainer;
 import wtf.metio.ilo.compose.ComposeOptions;
 import wtf.metio.ilo.shell.ShellOptions;
+import wtf.metio.ilo.shell.ShellVolumeBehavior;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -22,6 +23,8 @@ final class DevcontainerOptionsMapper {
 
   static ShellOptions shellOptions(final DevcontainerOptions options, final Devcontainer devcontainer) {
     final var opts = new ShellOptions();
+    opts.interactive = true;
+    opts.missingVolumes = ShellVolumeBehavior.CREATE;
     opts.debug = options.debug;
     opts.pull = options.pull;
     opts.removeImage = options.removeImage;
@@ -38,11 +41,13 @@ static ShellOptions shellOptions(final DevcontainerOptions options, final Devcon
         .flatMap(Collection::stream)
         .map(port -> port + ":" + port)
         .toList();
+    opts.runtimeRunOptions = devcontainer.runArgs();
     return opts;
   }
 
   static ComposeOptions composeOptions(final DevcontainerOptions options, final Devcontainer devcontainer, final Path devcontainerJson) {
     final var opts = new ComposeOptions();
+    opts.interactive = true;
     opts.file = Stream.ofNullable(devcontainer.dockerComposeFile())
         .flatMap(Collection::stream)
         .map(Paths::get)

diff --git a/src/test/java/wtf/metio/ilo/devcontainer/DevcontainerOptionsMapperTest.java b/src/test/java/wtf/metio/ilo/devcontainer/DevcontainerOptionsMapperTest.java
@@ -12,6 +12,7 @@
 import org.junit.jupiter.api.Test;
 import wtf.metio.devcontainer.BuildBuilder;
 import wtf.metio.devcontainer.DevcontainerBuilder;
+import wtf.metio.ilo.shell.ShellVolumeBehavior;
 
 import java.nio.file.Paths;
 import java.util.List;
@@ -89,6 +90,48 @@ void shouldMapForwardPorts() {
       assertIterableEquals(List.of("123:123", "456:456"), shellOptions.ports);
     }
 
+    @Test
+    @DisplayName("maps the runArgs field")
+    void shouldMapRunArgs() {
+      // given
+      final var options = new DevcontainerOptions();
+      final var json = DevcontainerBuilder.builder().runArgs(List.of("--cap-add=SYS_PTRACE", "--security-opt")).create();
+
+      // when
+      final var shellOptions = shellOptions(options, json);
+
+      // then
+      assertIterableEquals(List.of("--cap-add=SYS_PTRACE", "--security-opt"), shellOptions.runtimeRunOptions);
+    }
+
+    @Test
+    @DisplayName("--interactive is set to true")
+    void shouldEnableInteractiveMode() {
+      // given
+      final var options = new DevcontainerOptions();
+      final var json = DevcontainerBuilder.builder().create();
+
+      // when
+      final var shellOptions = shellOptions(options, json);
+
+      // then
+      assertTrue(shellOptions.interactive);
+    }
+
+    @Test
+    @DisplayName("--missing-volumes is set to CREATE")
+    void shouldCreateMissingVolumes() {
+      // given
+      final var options = new DevcontainerOptions();
+      final var json = DevcontainerBuilder.builder().create();
+
+      // when
+      final var shellOptions = shellOptions(options, json);
+
+      // then
+      assertEquals(ShellVolumeBehavior.CREATE, shellOptions.missingVolumes);
+    }
+
     @Test
     @DisplayName("sets the default context in case none is specified")
     void shouldUseDefaultForMissingContext() {
@@ -157,6 +200,20 @@ void shouldMapService() {
       assertEquals(json.service(), composeOptions.service);
     }
 
+    @Test
+    @DisplayName("--interactive is set to true")
+    void shouldEnableInteractiveMode() {
+      // given
+      final var options = new DevcontainerOptions();
+      final var json = DevcontainerBuilder.builder().create();
+
+      // when
+      final var composeOptions = composeOptions(options, json, Paths.get("."));
+
+      // then
+      assertTrue(composeOptions.interactive);
+    }
+
   }
 
 }