Skip to content

docs: add URL scheme to example #160

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

Merged
merged 2 commits into from
Jan 6, 2025
Merged

docs: add URL scheme to example #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
047c203
docs: add URL scheme to example
ethanndickson Jan 6, 2025
3a171a8
increase startup timeout
ethanndickson Jan 6, 2025
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
2 changes: 1 addition & 1 deletion docs/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ terraform {
}

provider "coderd" {
url = "coder.example.com"
url = "https://coder.example.com"
token = "****"
}

Expand Down
2 changes: 1 addition & 1 deletion examples/provider/provider.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ terraform {
}

provider "coderd" {
url = "coder.example.com"
url = "https://coder.example.com"
token = "****"
}

Expand Down
2 changes: 1 addition & 1 deletion integration/integration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func StartCoder(ctx context.Context, t *testing.T, name string, useLicense bool)
t.Logf("not ready yet: %s", err.Error())
}
return err == nil
}, 15*time.Second, time.Second, "coder failed to become ready in time")
}, 20*time.Second, time.Second, "coder failed to become ready in time")
_, err = client.CreateFirstUser(ctx, codersdk.CreateFirstUserRequest{
Email: testEmail,
Username: testUsername,
Expand Down
12 changes: 11 additions & 1 deletion internal/provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package provider

import (
"context"
"fmt"
"net/url"
"os"
"strings"
Expand Down Expand Up @@ -101,7 +102,16 @@ func (p *CoderdProvider) Configure(ctx context.Context, req provider.ConfigureRe
data.Token = types.StringValue(tokenEnv)
}

url, err := url.Parse(data.URL.ValueString())
rawURL := data.URL.ValueString()
if !strings.HasPrefix(rawURL, "http://") && !strings.HasPrefix(rawURL, "https://") {
scheme := "https"
if strings.HasPrefix(rawURL, "localhost") {
scheme = "http"
}
rawURL = fmt.Sprintf("%s://%s", scheme, rawURL)
}

url, err := url.Parse(rawURL)
Comment on lines +105 to +114
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is from the CLI, https://github.com/coder/coder/blob/3043e79a28f7c02cd014d1ec99d56c1207a7895e/cli/login.go#L182-L188

if err != nil {
resp.Diagnostics.AddError("url", "url is not a valid URL: "+err.Error())
return
Expand Down
Loading