Skip to content

Commit 69ce5f0

Browse files
EmyrkEmyrk
committed
fixup! Remove excess diffs
1 parent bde8870 commit 69ce5f0

File tree

6 files changed

+20
-84
lines changed

6 files changed

+20
-84
lines changed

‎coderd/apidoc/docs.go

+3-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

+3-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/api/enterprise.md

+4-8
Original file line numberDiff line numberDiff line change
@@ -1182,7 +1182,6 @@ curl -X GET http://coder-server:8080/api/v2/workspaceproxies \
11821182
{
11831183
"created_at": "2019-08-24T14:15:22Z",
11841184
"deleted": true,
1185-
"display_name": "string",
11861185
"icon": "string",
11871186
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
11881187
"name": "string",
@@ -1192,7 +1191,7 @@ curl -X GET http://coder-server:8080/api/v2/workspaceproxies \
11921191
"errors": ["string"],
11931192
"warnings": ["string"]
11941193
},
1195-
"status": "unknown"
1194+
"status": "reachable"
11961195
},
11971196
"updated_at": "2019-08-24T14:15:22Z",
11981197
"url": "string",
@@ -1216,13 +1215,12 @@ Status Code **200**
12161215
| `[array item]` | array | false | | |
12171216
| `» created_at` | string(date-time) | false | | |
12181217
| `» deleted` | boolean | false | | |
1219-
| `» display_name` | string | false | | |
12201218
| `» icon` | string | false | | |
12211219
| `» id` | string(uuid) | false | | |
12221220
| `» name` | string | false | | |
12231221
| `» status` | [codersdk.WorkspaceProxyStatus](schemas.md#codersdkworkspaceproxystatus) | false | | Status is the latest status check of the proxy. This will be empty for deleted proxies. This value can be used to determine if a workspace proxy is healthy and ready to use. |
12241222
| `»» checked_at` | string(date-time) | false | | |
1225-
| `»» report` | [codersdk.ProxyHealthReport](schemas.md#codersdkproxyhealthreport) | false | | Report provides more information about the health of the workspace proxy. This is not provided if the user does not have permission to view workspace proxy metadata. |
1223+
| `»» report` | [codersdk.ProxyHealthReport](schemas.md#codersdkproxyhealthreport) | false | | Report provides more information about the health of the workspace proxy. |
12261224
| `»»» errors` | array | false | | Errors are problems that prevent the workspace proxy from being healthy |
12271225
| `»»» warnings` | array | false | | Warnings do not prevent the workspace proxy from being healthy, but should be addressed. |
12281226
| `»» status` | [codersdk.ProxyHealthStatus](schemas.md#codersdkproxyhealthstatus) | false | | |
@@ -1234,8 +1232,7 @@ Status Code **200**
12341232

12351233
| Property | Value |
12361234
| -------- | -------------- |
1237-
| `status` | `unknown` |
1238-
| `status` | `ok` |
1235+
| `status` | `reachable` |
12391236
| `status` | `unreachable` |
12401237
| `status` | `unhealthy` |
12411238
| `status` | `unregistered` |
@@ -1280,7 +1277,6 @@ curl -X POST http://coder-server:8080/api/v2/workspaceproxies \
12801277
{
12811278
"created_at": "2019-08-24T14:15:22Z",
12821279
"deleted": true,
1283-
"display_name": "string",
12841280
"icon": "string",
12851281
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
12861282
"name": "string",
@@ -1290,7 +1286,7 @@ curl -X POST http://coder-server:8080/api/v2/workspaceproxies \
12901286
"errors": ["string"],
12911287
"warnings": ["string"]
12921288
},
1293-
"status": "unknown"
1289+
"status": "reachable"
12941290
},
12951291
"updated_at": "2019-08-24T14:15:22Z",
12961292
"url": "string",

‎docs/api/schemas.md

+9-12
Original file line numberDiff line numberDiff line change
@@ -3401,7 +3401,7 @@ Parameter represents a set value for the scope.
34013401
## codersdk.ProxyHealthStatus
34023402

34033403
```json
3404-
"unknown"
3404+
"reachable"
34053405
```
34063406

34073407
### Properties
@@ -3410,8 +3410,7 @@ Parameter represents a set value for the scope.
34103410

34113411
| Value |
34123412
| -------------- |
3413-
| `unknown` |
3414-
| `ok` |
3413+
| `reachable` |
34153414
| `unreachable` |
34163415
| `unhealthy` |
34173416
| `unregistered` |
@@ -5273,7 +5272,6 @@ Parameter represents a set value for the scope.
52735272
{
52745273
"created_at": "2019-08-24T14:15:22Z",
52755274
"deleted": true,
5276-
"display_name": "string",
52775275
"icon": "string",
52785276
"id": "497f6eca-6276-4993-bfeb-53cbbbba6f08",
52795277
"name": "string",
@@ -5283,7 +5281,7 @@ Parameter represents a set value for the scope.
52835281
"errors": ["string"],
52845282
"warnings": ["string"]
52855283
},
5286-
"status": "unknown"
5284+
"status": "reachable"
52875285
},
52885286
"updated_at": "2019-08-24T14:15:22Z",
52895287
"url": "string",
@@ -5297,7 +5295,6 @@ Parameter represents a set value for the scope.
52975295
| ------------------- | -------------------------------------------------------------- | -------- | ------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
52985296
| `created_at` | string | false | | |
52995297
| `deleted` | boolean | false | | |
5300-
| `display_name` | string | false | | |
53015298
| `icon` | string | false | | |
53025299
| `id` | string | false | | |
53035300
| `name` | string | false | | |
@@ -5315,17 +5312,17 @@ Parameter represents a set value for the scope.
53155312
"errors": ["string"],
53165313
"warnings": ["string"]
53175314
},
5318-
"status": "unknown"
5315+
"status": "reachable"
53195316
}
53205317
```
53215318

53225319
### Properties
53235320

5324-
| Name | Type | Required | Restrictions | Description |
5325-
| ------------ | -------------------------------------------------------- | -------- | ------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
5326-
| `checked_at` | string | false | | |
5327-
| `report` | [codersdk.ProxyHealthReport](#codersdkproxyhealthreport) | false | | Report provides more information about the health of the workspace proxy. This is not provided if the user does not have permission to view workspace proxy metadata. |
5328-
| `status` | [codersdk.ProxyHealthStatus](#codersdkproxyhealthstatus) | false | | |
5321+
| Name | Type | Required | Restrictions | Description |
5322+
| ------------ | -------------------------------------------------------- | -------- | ------------ | ------------------------------------------------------------------------- |
5323+
| `checked_at` | string | false | | |
5324+
| `report` | [codersdk.ProxyHealthReport](#codersdkproxyhealthreport) | false | | Report provides more information about the health of the workspace proxy. |
5325+
| `status` | [codersdk.ProxyHealthStatus](#codersdkproxyhealthstatus) | false | | |
53295326

53305327
## codersdk.WorkspaceQuota
53315328

‎enterprise/coderd/workspaceproxy_test.go

-48
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ import (
1717
"cdr.dev/slog/sloggers/slogtest"
1818
"github.com/coder/coder/agent"
1919
"github.com/coder/coder/coderd/coderdtest"
20-
"github.com/coder/coder/coderd/database"
21-
"github.com/coder/coder/coderd/database/dbauthz"
2220
"github.com/coder/coder/coderd/database/dbtestutil"
2321
"github.com/coder/coder/coderd/workspaceapps"
2422
"github.com/coder/coder/codersdk"
@@ -247,52 +245,6 @@ func TestWorkspaceProxyCRUD(t *testing.T) {
247245
})
248246
}
249247

250-
// TestWorkspaceProxyRead ensures regular uses cannot get report information.
251-
func TestWorkspaceProxyRead(t *testing.T) {
252-
t.Parallel()
253-
254-
dv := coderdtest.DeploymentValues(t)
255-
dv.Experiments = []string{
256-
string(codersdk.ExperimentMoons),
257-
"*",
258-
}
259-
client, _, api := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
260-
Options: &coderdtest.Options{
261-
DeploymentValues: dv,
262-
},
263-
})
264-
first := coderdtest.CreateFirstUser(t, client)
265-
member, _ := coderdtest.CreateAnotherUser(t, client, first.OrganizationID)
266-
_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
267-
Features: license.Features{
268-
codersdk.FeatureWorkspaceProxy: 1,
269-
},
270-
})
271-
272-
ctx := testutil.Context(t, testutil.WaitLong)
273-
proxyRes, err := client.CreateWorkspaceProxy(ctx, codersdk.CreateWorkspaceProxyRequest{
274-
Name: namesgenerator.GetRandomName(1),
275-
Icon: "/emojis/flag.png",
276-
})
277-
require.NoError(t, err)
278-
279-
//nolint:gocritic // System func
280-
_, err = api.Database.RegisterWorkspaceProxy(dbauthz.AsSystemRestricted(ctx), database.RegisterWorkspaceProxyParams{
281-
ID: proxyRes.Proxy.ID,
282-
Url: "http://bad-never-resolves.random",
283-
})
284-
require.NoError(t, err, "failed to register workspace proxy")
285-
286-
proxies, err := client.WorkspaceProxies(ctx)
287-
require.NoError(t, err, "failed to get workspace proxies")
288-
fmt.Println(proxies)
289-
290-
proxies, err = member.WorkspaceProxies(ctx)
291-
require.NoError(t, err, "failed to get workspace proxies")
292-
fmt.Println(proxies)
293-
294-
}
295-
296248
func TestIssueSignedAppToken(t *testing.T) {
297249
t.Parallel()
298250

‎scripts/develop.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ fatal() {
185185
# Create the proxy
186186
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
188-
start_cmd PROXY "" "${CODER_DEV_SHIM}" proxy server --access-url=http://127.0.0.1:3010 --http-address=127.0.0.1:3010 --proxy-session-token="${proxy_session_token}" --primary-access-url=http://localhost:3000
188+
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."
190190
fi
191191

0 commit comments

Comments
 (0)