Merge pull request #2275 from FabianKramm/main

devspace enter fixes, wait_pod & resolve vars in imports section

Author: FabianKramm

cmd/enter.go

@@ -30,6 +30,7 @@ type EnterCmd struct {
 	Container     string
 	Pod           string
 	Pick          bool
+	TTY           bool
 	Wait          bool
 	Reconnect     bool
 	Screen        bool
@@ -78,6 +79,7 @@ devspace enter bash --image-selector "${runtime.images.app.image}:${runtime.imag
 	enterCmd.Flags().StringVar(&cmd.ImageSelector, "image-selector", "", "The image to search a pod for (e.g. nginx, nginx:latest, ${runtime.images.app}, nginx:${runtime.images.app.tag})")
 	enterCmd.Flags().StringVar(&cmd.WorkingDirectory, "workdir", "", "The working directory where to open the terminal or execute the command")
 
+	enterCmd.Flags().BoolVar(&cmd.TTY, "tty", true, "If to use a tty to start the command")
 	enterCmd.Flags().BoolVar(&cmd.Pick, "pick", true, "Select a pod / container if multiple are found")
 	enterCmd.Flags().BoolVar(&cmd.Wait, "wait", false, "Wait for the pod(s) to start if they are not running")
 	enterCmd.Flags().BoolVar(&cmd.Reconnect, "reconnect", false, "Will reconnect the terminal if an unexpected return code is encountered")
@@ -158,7 +160,7 @@ func (cmd *EnterCmd) Run(f factory.Factory, args []string) error {
 
 	// Start terminal
 	stdout, stderr, stdin := defaultStdStreams(cmd.Stdout, cmd.Stderr, cmd.Stdin)
-	exitCode, err := terminal.StartTerminalFromCMD(ctx, targetselector.NewTargetSelector(selectorOptions), command, cmd.Wait, cmd.Reconnect, cmd.Screen, cmd.ScreenSession, stdout, stderr, stdin)
+	exitCode, err := terminal.StartTerminalFromCMD(ctx, targetselector.NewTargetSelector(selectorOptions), command, cmd.Wait, cmd.Reconnect, cmd.TTY, cmd.Screen, cmd.ScreenSession, stdout, stderr, stdin)
 	if err != nil {
 		return err
 	} else if exitCode != 0 {

devspace-schema.json

@@ -1813,6 +1813,10 @@
         "disableScreen": {
           "type": "boolean",
           "description": "DisableScreen will disable screen which is used by DevSpace by default to preserve\nsessions if connections interrupt or the session is lost."
+        },
+        "disableTTY": {
+          "type": "boolean",
+          "description": "DisableTTY will disable a tty shell for terminal command execution"
         }
       },
       "type": "object",

docs/hack/functions/main.go

@@ -363,6 +363,14 @@ var Functions = []Function{
 		Return:      reflect.String.String(),
 		Group:       groupOther,
 	},
+	{
+		Name:        "wait_pod",
+		Description: "Waits for a pod to become running",
+		Args:        `[command]`,
+		Handler:     commands.WaitPod,
+		Flags:       commands.WaitPodOptions{},
+		Group:       groupOther,
+	},
 	{
 		Name:        "exec_container",
 		Description: `Executes the command provided as argument inside a container`,

docs/pages/configuration/_partials/functions/group_other.mdx

@@ -9,9 +9,11 @@ import PartialGetflag from "./get_flag.mdx"
 import PartialCat from "./cat.mdx"
 import PartialGetconfigvalue from "./get_config_value.mdx"
 import PartialExeccontainer from "./exec_container.mdx"
+import PartialWaitpod from "./wait_pod.mdx"
 import PartialSelectpod from "./select_pod.mdx"
 
 <PartialSelectpod />
+<PartialWaitpod />
 <PartialExeccontainer />
 <PartialGetconfigvalue />
 <PartialCat />

docs/pages/configuration/_partials/functions/group_other_pipeline.mdx

@@ -4,9 +4,11 @@
 
 import PartialGetconfigvalue from "./get_config_value.mdx"
 import PartialExeccontainer from "./exec_container.mdx"
+import PartialWaitpod from "./wait_pod.mdx"
 import PartialSelectpod from "./select_pod.mdx"
 
 <PartialSelectpod />
+<PartialWaitpod />
 <PartialExeccontainer />
 <PartialGetconfigvalue />
 

docs/pages/configuration/_partials/functions/wait_pod.mdx

@@ -0,0 +1,26 @@
+
+import PartialImageselector from "./wait_pod/image-selector.mdx"
+import PartialLabelselector from "./wait_pod/label-selector.mdx"
+import PartialContainer from "./wait_pod/container.mdx"
+import PartialNamespace from "./wait_pod/namespace.mdx"
+import PartialDisablewait from "./wait_pod/disable-wait.mdx"
+import PartialTimeout from "./wait_pod/timeout.mdx"
+
+<details className="config-field -function" data-expandable="true">
+<summary>
+
+### `wait_pod` <span className="config-field-type">[command]</span> <span className="config-field-enum"></span> <span className="config-field-default -return"></span> <span className="config-field-required" data-required="true">pipeline only</span>  {#wait_pod}
+
+Waits for a pod to become running
+
+</summary>
+
+<PartialImageselector />
+<PartialLabelselector />
+<PartialContainer />
+<PartialNamespace />
+<PartialDisablewait />
+<PartialTimeout />
+
+
+</details>

docs/pages/configuration/_partials/functions/wait_pod/container.mdx

@@ -0,0 +1,13 @@
+
+<details className="config-field -function" data-expandable="false">
+<summary>
+
+#### `--container` <span className="config-field-type">string</span> <span className="config-field-enum"></span> <span className="config-field-default -return"></span> <span className="config-field-required" data-required="false">pipeline only</span>  {#wait_pod-container}
+
+The container to use
+
+</summary>
+
+
+
+</details>

docs/pages/configuration/_partials/functions/wait_pod/disable-wait.mdx

@@ -0,0 +1,13 @@
+
+<details className="config-field -function" data-expandable="false">
+<summary>
+
+#### `--disable-wait` <span className="config-field-type">bool</span> <span className="config-field-enum"></span> <span className="config-field-default -return"></span> <span className="config-field-required" data-required="false">pipeline only</span>  {#wait_pod-disable-wait}
+
+If true, will not wait for the container to become ready
+
+</summary>
+
+
+
+</details>

docs/pages/configuration/_partials/functions/wait_pod/image-selector.mdx

@@ -0,0 +1,13 @@
+
+<details className="config-field -function" data-expandable="false">
+<summary>
+
+#### `--image-selector` <span className="config-field-type">string</span> <span className="config-field-enum"></span> <span className="config-field-default -return"></span> <span className="config-field-required" data-required="false">pipeline only</span>  {#wait_pod-image-selector}
+
+The image selector to use to select the container
+
+</summary>
+
+
+
+</details>

docs/pages/configuration/_partials/functions/wait_pod/label-selector.mdx

@@ -0,0 +1,13 @@
+
+<details className="config-field -function" data-expandable="false">
+<summary>
+
+#### `--label-selector` <span className="config-field-type">string</span> <span className="config-field-enum"></span> <span className="config-field-default -return"></span> <span className="config-field-required" data-required="false">pipeline only</span>  {#wait_pod-label-selector}
+
+The label selector to use to select the container
+
+</summary>
+
+
+
+</details>