Skip to content

Commit 4353ad7

Browse files
EmyrkEmyrk
authored
chore: Remove url and wildcard url from moon create (#7224)
* chore: Remove url and wildcard url from moon create
1 parent 6866732 commit 4353ad7

File tree

16 files changed

+45
-109
lines changed

16 files changed

+45
-109
lines changed

‎coderd/apidoc/docs.go

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/dbfake/databasefake.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5193,8 +5193,6 @@ func (q *fakeQuerier) InsertWorkspaceProxy(_ context.Context, arg database.Inser
51935193
Name: arg.Name,
51945194
DisplayName: arg.DisplayName,
51955195
Icon: arg.Icon,
5196-
Url: arg.Url,
5197-
WildcardHostname: arg.WildcardHostname,
51985196
TokenHashedSecret: arg.TokenHashedSecret,
51995197
CreatedAt: arg.CreatedAt,
52005198
UpdatedAt: arg.UpdatedAt,

‎coderd/database/dbgen/generator.go

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -343,19 +343,27 @@ func WorkspaceProxy(t testing.TB, db database.Store, orig database.WorkspaceProx
343343
require.NoError(t, err, "generate secret")
344344
hashedSecret := sha256.Sum256([]byte(secret))
345345

346-
resource, err := db.InsertWorkspaceProxy(context.Background(), database.InsertWorkspaceProxyParams{
346+
proxy, err := db.InsertWorkspaceProxy(context.Background(), database.InsertWorkspaceProxyParams{
347347
ID: takeFirst(orig.ID, uuid.New()),
348348
Name: takeFirst(orig.Name, namesgenerator.GetRandomName(1)),
349349
DisplayName: takeFirst(orig.DisplayName, namesgenerator.GetRandomName(1)),
350350
Icon: takeFirst(orig.Icon, namesgenerator.GetRandomName(1)),
351-
Url: takeFirst(orig.Url, fmt.Sprintf("https://%s.com", namesgenerator.GetRandomName(1))),
352-
WildcardHostname: takeFirst(orig.WildcardHostname, fmt.Sprintf("*.%s.com", namesgenerator.GetRandomName(1))),
353351
TokenHashedSecret: hashedSecret[:],
354352
CreatedAt: takeFirst(orig.CreatedAt, database.Now()),
355353
UpdatedAt: takeFirst(orig.UpdatedAt, database.Now()),
356354
})
357355
require.NoError(t, err, "insert proxy")
358-
return resource, secret
356+
357+
// Also set these fields if the caller wants them.
358+
if orig.Url != "" || orig.WildcardHostname != "" {
359+
proxy, err = db.RegisterWorkspaceProxy(context.Background(), database.RegisterWorkspaceProxyParams{
360+
Url: orig.Url,
361+
WildcardHostname: orig.WildcardHostname,
362+
ID: proxy.ID,
363+
})
364+
require.NoError(t, err, "update proxy")
365+
}
366+
return proxy, secret
359367
}
360368

361369
func File(t testing.TB, db database.Store, orig database.File) database.File {

‎coderd/database/queries.sql.go

Lines changed: 3 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/proxies.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
INSERT INTO
33
workspace_proxies (
44
id,
5+
url,
6+
wildcard_hostname,
57
name,
68
display_name,
79
icon,
8-
url,
9-
wildcard_hostname,
1010
token_hashed_secret,
1111
created_at,
1212
updated_at,
1313
deleted
1414
)
1515
VALUES
16-
($1, $2, $3, $4, $5, $6, $7, $8, $9, false) RETURNING *;
16+
($1, '', '', $2, $3, $4, $5, $6, $7, false) RETURNING *;
1717

1818
-- name: RegisterWorkspaceProxy :one
1919
UPDATE

‎codersdk/workspaceproxy.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@ type WorkspaceProxy struct {
2626
}
2727

2828
type CreateWorkspaceProxyRequest struct {
29-
Name string `json:"name"`
30-
DisplayName string `json:"display_name"`
31-
Icon string `json:"icon"`
32-
URL string `json:"url"`
33-
WildcardHostname string `json:"wildcard_hostname"`
29+
Name string `json:"name"`
30+
DisplayName string `json:"display_name"`
31+
Icon string `json:"icon"`
3432
}
3533

3634
type CreateWorkspaceProxyResponse struct {

‎docs/api/enterprise.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1236,9 +1236,7 @@ curl -X POST http://coder-server:8080/api/v2/workspaceproxies \
12361236
{
12371237
"display_name": "string",
12381238
"icon": "string",
1239-
"name": "string",
1240-
"url": "string",
1241-
"wildcard_hostname": "string"
1239+
"name": "string"
12421240
}
12431241
```
12441242

‎docs/api/schemas.md

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1557,21 +1557,17 @@ CreateParameterRequest is a structure used to create a new parameter value for a
15571557
{
15581558
"display_name": "string",
15591559
"icon": "string",
1560-
"name": "string",
1561-
"url": "string",
1562-
"wildcard_hostname": "string"
1560+
"name": "string"
15631561
}
15641562
```
15651563

15661564
### Properties
15671565

1568-
| Name | Type | Required | Restrictions | Description |
1569-
| ------------------- | ------ | -------- | ------------ | ----------- |
1570-
| `display_name` | string | false | | |
1571-
| `icon` | string | false | | |
1572-
| `name` | string | false | | |
1573-
| `url` | string | false | | |
1574-
| `wildcard_hostname` | string | false | | |
1566+
| Name | Type | Required | Restrictions | Description |
1567+
| -------------- | ------ | -------- | ------------ | ----------- |
1568+
| `display_name` | string | false | | |
1569+
| `icon` | string | false | | |
1570+
| `name` | string | false | | |
15751571

15761572
## codersdk.CreateWorkspaceRequest
15771573

‎enterprise/cli/workspaceproxy.go

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,11 @@ func (r *RootCmd) deleteProxy() *clibase.Cmd {
5555

5656
func (r *RootCmd) createProxy() *clibase.Cmd {
5757
var (
58-
proxyName string
59-
displayName string
60-
proxyIcon string
61-
proxyURL string
62-
proxyWildcardHostname string
63-
onlyToken bool
64-
formatter = cliui.NewOutputFormatter(
58+
proxyName string
59+
displayName string
60+
proxyIcon string
61+
onlyToken bool
62+
formatter = cliui.NewOutputFormatter(
6563
// Text formatter should be human readable.
6664
cliui.ChangeFormatterData(cliui.TextFormat(), func(data any) (any, error) {
6765
response, ok := data.(codersdk.CreateWorkspaceProxyResponse)
@@ -94,11 +92,9 @@ func (r *RootCmd) createProxy() *clibase.Cmd {
9492
Handler: func(inv *clibase.Invocation) error {
9593
ctx := inv.Context()
9694
resp, err := client.CreateWorkspaceProxy(ctx, codersdk.CreateWorkspaceProxyRequest{
97-
Name: proxyName,
98-
DisplayName: displayName,
99-
Icon: proxyIcon,
100-
URL: proxyURL,
101-
WildcardHostname: proxyWildcardHostname,
95+
Name: proxyName,
96+
DisplayName: displayName,
97+
Icon: proxyIcon,
10298
})
10399
if err != nil {
104100
return xerrors.Errorf("create workspace proxy: %w", err)
@@ -136,16 +132,6 @@ func (r *RootCmd) createProxy() *clibase.Cmd {
136132
Description: "Display icon of the proxy.",
137133
Value: clibase.StringOf(&proxyIcon),
138134
},
139-
clibase.Option{
140-
Flag: "access-url",
141-
Description: "Access URL of the proxy.",
142-
Value: clibase.StringOf(&proxyURL),
143-
},
144-
clibase.Option{
145-
Flag: "wildcard-access-url",
146-
Description: "(Optional) Access url of the proxy for subdomain based apps.",
147-
Value: clibase.StringOf(&proxyWildcardHostname),
148-
},
149135
clibase.Option{
150136
Flag: "only-token",
151137
Description: "Only print the token. This is useful for scripting.",

‎enterprise/cli/workspaceproxy_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ func Test_ProxyCRUD(t *testing.T) {
4949
"--name", expectedName,
5050
"--display-name", "Test Proxy",
5151
"--icon", "/emojis/1f4bb.png",
52-
"--access-url", "http://localhost:3010",
5352
"--only-token",
5453
)
5554

@@ -99,7 +98,6 @@ func Test_ProxyCRUD(t *testing.T) {
9998
Name: expectedName,
10099
DisplayName: "Test Proxy",
101100
Icon: "/emojis/us.png",
102-
URL: "http://localhost:3010",
103101
})
104102
require.NoError(t, err, "failed to create workspace proxy")
105103

‎enterprise/coderd/coderdenttest/proxytest.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,8 @@ func NewWorkspaceProxy(t *testing.T, coderdAPI *coderd.API, owner *codersdk.Clie
108108
}
109109

110110
proxyRes, err := owner.CreateWorkspaceProxy(ctx, codersdk.CreateWorkspaceProxyRequest{
111-
Name: options.Name,
112-
Icon: "/emojis/flag.png",
113-
URL: accessURL.String(),
114-
WildcardHostname: options.AppHostname,
111+
Name: options.Name,
112+
Icon: "/emojis/flag.png",
115113
})
116114
require.NoError(t, err, "failed to create workspace proxy")
117115

‎enterprise/coderd/workspaceproxy.go

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -91,24 +91,6 @@ func (api *API) postWorkspaceProxy(rw http.ResponseWriter, r *http.Request) {
9191
return
9292
}
9393

94-
if err := validateProxyURL(req.URL); err != nil {
95-
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
96-
Message: "URL is invalid.",
97-
Detail: err.Error(),
98-
})
99-
return
100-
}
101-
102-
if req.WildcardHostname != "" {
103-
if _, err := httpapi.CompileHostnamePattern(req.WildcardHostname); err != nil {
104-
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
105-
Message: "Wildcard URL is invalid.",
106-
Detail: err.Error(),
107-
})
108-
return
109-
}
110-
}
111-
11294
id := uuid.New()
11395
secret, err := cryptorand.HexString(64)
11496
if err != nil {
@@ -123,8 +105,6 @@ func (api *API) postWorkspaceProxy(rw http.ResponseWriter, r *http.Request) {
123105
Name: req.Name,
124106
DisplayName: req.DisplayName,
125107
Icon: req.Icon,
126-
Url: req.URL,
127-
WildcardHostname: req.WildcardHostname,
128108
TokenHashedSecret: hashedSecret[:],
129109
CreatedAt: database.Now(),
130110
UpdatedAt: database.Now(),

‎enterprise/coderd/workspaceproxy_test.go

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,8 @@ func TestWorkspaceProxyCRUD(t *testing.T) {
5252
})
5353
ctx := testutil.Context(t, testutil.WaitLong)
5454
proxyRes, err := client.CreateWorkspaceProxy(ctx, codersdk.CreateWorkspaceProxyRequest{
55-
Name: namesgenerator.GetRandomName(1),
56-
Icon: "/emojis/flag.png",
57-
URL: "https://" + namesgenerator.GetRandomName(1) + ".com",
58-
WildcardHostname: "*.sub.example.com",
55+
Name: namesgenerator.GetRandomName(1),
56+
Icon: "/emojis/flag.png",
5957
})
6058
require.NoError(t, err)
6159

@@ -87,10 +85,8 @@ func TestWorkspaceProxyCRUD(t *testing.T) {
8785
})
8886
ctx := testutil.Context(t, testutil.WaitLong)
8987
proxyRes, err := client.CreateWorkspaceProxy(ctx, codersdk.CreateWorkspaceProxyRequest{
90-
Name: namesgenerator.GetRandomName(1),
91-
Icon: "/emojis/flag.png",
92-
URL: "https://" + namesgenerator.GetRandomName(1) + ".com",
93-
WildcardHostname: "*.sub.example.com",
88+
Name: namesgenerator.GetRandomName(1),
89+
Icon: "/emojis/flag.png",
9490
})
9591
require.NoError(t, err)
9692

@@ -156,10 +152,8 @@ func TestIssueSignedAppToken(t *testing.T) {
156152

157153
createProxyCtx := testutil.Context(t, testutil.WaitLong)
158154
proxyRes, err := client.CreateWorkspaceProxy(createProxyCtx, codersdk.CreateWorkspaceProxyRequest{
159-
Name: namesgenerator.GetRandomName(1),
160-
Icon: "/emojis/flag.png",
161-
URL: "https://" + namesgenerator.GetRandomName(1) + ".com",
162-
WildcardHostname: "*.sub.example.com",
155+
Name: namesgenerator.GetRandomName(1),
156+
Icon: "/emojis/flag.png",
163157
})
164158
require.NoError(t, err)
165159

‎scripts/develop.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ fatal() {
183183
# Attempt to delete the proxy first, in case it already exists.
184184
"${CODER_DEV_SHIM}" proxy delete local-proxy || true
185185
# Create the proxy
186-
proxy_session_token=$("${CODER_DEV_SHIM}" proxy create --name=local-proxy --display-name="Local Proxy" --icon="/emojis/1f4bb.png" --access-url=http://localhost:3010 --only-token)
186+
proxy_session_token=$("${CODER_DEV_SHIM}" proxy create --name=local-proxy --display-name="Local Proxy" --icon="/emojis/1f4bb.png" --only-token)
187187
# Start the proxy
188188
start_cmd PROXY "" "${CODER_DEV_SHIM}" proxy server --http-address=localhost:3010 --proxy-session-token="${proxy_session_token}" --primary-access-url=http://localhost:3000
189189
) || echo "Failed to create workspace proxy. No workspace proxy created."

‎site/src/api/typesGenerated.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,6 @@ export interface CreateWorkspaceProxyRequest {
260260
readonly name: string
261261
readonly display_name: string
262262
readonly icon: string
263-
readonly url: string
264-
readonly wildcard_hostname: string
265263
}
266264

267265
// From codersdk/workspaceproxy.go

0 commit comments

Comments
 (0)