Skip to content

feat: Add ssh max timeout to coder_agent resource #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

feat: Add ssh max timeout to coder_agent resource #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions provider/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"os"
"reflect"
"strings"
"time"

"github.com/google/uuid"
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
Expand Down Expand Up @@ -137,6 +138,13 @@ func agentResource() *schema.Resource {
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.",
},
"ssh_max_timeout": {
Type: schema.TypeString,
Default: "0",
ForceNew: true,
Optional: true,
Description: "The max timeout for SSH connections. By default there is no timeout.",
},
},
}
}
Expand Down Expand Up @@ -197,10 +205,19 @@ func updateInitScript(resourceData *schema.ResourceData, i interface{}) diag.Dia
if err != nil {
return diag.Errorf("parse access url: %s", err)
}
sshMaxTimeout, valid := resourceData.Get("ssh_max_timeout").(string)
if !valid {
return diag.Errorf("ssh_max_timeout was unexpected type %q", reflect.TypeOf(resourceData.Get("ssh_max_timeout")))
}
_, err = time.ParseDuration(sshMaxTimeout)
if err != nil {
return diag.Errorf("expected '%s' to be a duration string e.g. '2h45m10s'. Full error: %s", sshMaxTimeout, err.Error())
}
script := os.Getenv(fmt.Sprintf("CODER_AGENT_SCRIPT_%s_%s", operatingSystem, arch))
if script != "" {
script = strings.ReplaceAll(script, "${ACCESS_URL}", accessURL.String())
script = strings.ReplaceAll(script, "${AUTH_TYPE}", auth)
script = strings.ReplaceAll(script, "${SSH_MAX_TIMEOUT}", sshMaxTimeout)
}
err = resourceData.Set("init_script", script)
if err != nil {
Expand Down
1 change: 1 addition & 0 deletions provider/agent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ func TestAgent(t *testing.T) {
shutdown_script = "echo bye bye"
shutdown_script_timeout = 120
login_before_ready = false
ssh_max_timeout = "1m"
}
`,
Check: func(state *terraform.State) error {
Expand Down