Replace login_before_ready with startup_script_behavior

mafredri · mafredri · commit fbd5cd1ff686 · 2023-06-02T13:16:38.000Z
diff --git a/docs/resources/agent.md b/docs/resources/agent.md
@@ -50,12 +50,13 @@ resource "kubernetes_pod" "dev" {
 - `connection_timeout` (Number) Time in seconds until the agent is marked as timed out when a connection with the server cannot be established. A value of zero never marks the agent as timed out.
 - `dir` (String) The starting directory when a user creates a shell session. Defaults to $HOME.
 - `env` (Map of String) A mapping of environment variables to set inside the workspace.
-- `login_before_ready` (Boolean) This option defines whether or not the user can (by default) login to the workspace before it is ready. Ready means that e.g. the startup_script is done and has exited. When enabled, users may see an incomplete workspace when logging in.
+- `login_before_ready` (Boolean, Deprecated) This option defines whether or not the user can (by default) login to the workspace before it is ready. Ready means that e.g. the startup_script is done and has exited. When enabled, users may see an incomplete workspace when logging in.
 - `metadata` (Block List) Each "metadata" block defines a single item consisting of a key/value pair. This feature is in alpha and may break in future releases. (see [below for nested schema](#nestedblock--metadata))
 - `motd_file` (String) The path to a file within the workspace containing a message to display to users when they login via SSH. A typical value would be /etc/motd.
 - `shutdown_script` (String) A script to run before the agent is stopped. The script should exit when it is done to signal that the workspace can be stopped.
 - `shutdown_script_timeout` (Number) Time in seconds until the agent lifecycle status is marked as timed out during shutdown, this happens when the shutdown script has not completed (exited) in the given time.
 - `startup_script` (String) A script to run after the agent starts. The script should exit when it is done to signal that the agent is ready.
+- `startup_script_behavior` (String) This option sets the behavior of the startup_script. When set to "blocking", the startup_script must exit before the workspace is ready. When set to "non-blocking", the startup_script may run in the background and the workspace will be ready immediately. Defaults to "non-blocking", although "blocking" is recommended.
 - `startup_script_timeout` (Number) Time in seconds until the agent lifecycle status is marked as timed out during start, this happens when the startup script has not completed (exited) in the given time.
 - `troubleshooting_url` (String) A URL to a document with instructions for troubleshooting problems with the agent.
 
diff --git a/provider/agent.go b/provider/agent.go
@@ -16,23 +16,31 @@ import (
 func agentResource() *schema.Resource {
 	return &schema.Resource{
 		Description: "Use this resource to associate an agent.",
-		CreateContext: func(c context.Context, resourceData *schema.ResourceData, i interface{}) diag.Diagnostics {
+		CreateContext: func(ctx context.Context, resourceData *schema.ResourceData, i interface{}) diag.Diagnostics {
 			// This should be a real authentication token!
 			resourceData.SetId(uuid.NewString())
 			err := resourceData.Set("token", uuid.NewString())
 			if err != nil {
 				return diag.FromErr(err)
 			}
+			err = updateStartupScriptBehaviorIfLoginBeforeReady(resourceData)
+			if err != nil {
+				return diag.FromErr(err)
+			}
 			return updateInitScript(resourceData, i)
 		},
-		ReadWithoutTimeout: func(c context.Context, resourceData *schema.ResourceData, i interface{}) diag.Diagnostics {
+		ReadWithoutTimeout: func(ctx context.Context, resourceData *schema.ResourceData, i interface{}) diag.Diagnostics {
 			err := resourceData.Set("token", uuid.NewString())
 			if err != nil {
 				return diag.FromErr(err)
 			}
+			err = updateStartupScriptBehaviorIfLoginBeforeReady(resourceData)
+			if err != nil {
+				return diag.FromErr(err)
+			}
 			return updateInitScript(resourceData, i)
 		},
-		DeleteContext: func(c context.Context, rd *schema.ResourceData, i interface{}) diag.Diagnostics {
+		DeleteContext: func(ctx context.Context, resourceData *schema.ResourceData, i interface{}) diag.Diagnostics {
 			return nil
 		},
 		Schema: map[string]*schema.Schema{
@@ -131,11 +139,22 @@ func agentResource() *schema.Resource {
 				Description: "The path to a file within the workspace containing a message to display to users when they login via SSH. A typical value would be /etc/motd.",
 			},
 			"login_before_ready": {
-				Type:        schema.TypeBool,
-				Default:     true, // Change default value to false in a future release.
-				ForceNew:    true,
-				Optional:    true,
-				Description: "This option defines whether or not the user can (by default) login to the workspace before it is ready. Ready means that e.g. the startup_script is done and has exited. When enabled, users may see an incomplete workspace when logging in.",
+				Type:          schema.TypeBool,
+				Default:       true,
+				ForceNew:      true,
+				Optional:      true,
+				Description:   "This option defines whether or not the user can (by default) login to the workspace before it is ready. Ready means that e.g. the startup_script is done and has exited. When enabled, users may see an incomplete workspace when logging in.",
+				Deprecated:    "Configure startup_script_behavior instead. This attribute will be removed in a future version of the provider.",
+				ConflictsWith: []string{"startup_script_behavior"},
+			},
+			"startup_script_behavior": {
+				Type:          schema.TypeString,
+				Default:       "non-blocking",
+				ForceNew:      true,
+				Optional:      true,
+				Description:   "This option sets the behavior of the startup_script. When set to \"blocking\", the startup_script must exit before the workspace is ready. When set to \"non-blocking\", the startup_script may run in the background and the workspace will be ready immediately. Defaults to \"non-blocking\", although \"blocking\" is recommended.",
+				ValidateFunc:  validation.StringInSlice([]string{"blocking", "non-blocking"}, false),
+				ConflictsWith: []string{"login_before_ready"},
 			},
 			"metadata": {
 				Type:        schema.TypeList,
@@ -251,3 +270,19 @@ func updateInitScript(resourceData *schema.ResourceData, i interface{}) diag.Dia
 	}
 	return nil
 }
+
+func updateStartupScriptBehaviorIfLoginBeforeReady(resourceData *schema.ResourceData) error {
+	if rc := resourceData.GetRawConfig(); !rc.IsNull() {
+		if attr := rc.GetAttr("login_before_ready"); !attr.IsNull() {
+			behavior := "non-blocking"
+			if attr.False() {
+				behavior = "blocking"
+			}
+			err := resourceData.Set("startup_script_behavior", behavior)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
diff --git a/provider/agent_test.go b/provider/agent_test.go
@@ -37,6 +37,7 @@ func TestAgent(t *testing.T) {
 					shutdown_script = "echo bye bye"
 					shutdown_script_timeout = 120
 					login_before_ready = false
+					# ^ should result in: startup_script_behavior = "blocking"
 				}
 				`,
 			Check: func(state *terraform.State) error {
@@ -59,6 +60,7 @@ func TestAgent(t *testing.T) {
 					"shutdown_script",
 					"shutdown_script_timeout",
 					"login_before_ready",
+					"startup_script_behavior",
 				} {
 					value := resource.Primary.Attributes[key]
 					t.Logf("%q = %q", key, value)
