Skip to content

feat: Implement experiment gated CRUD for workspace proxies #6928

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 26 commits into from
Apr 4, 2023
Merged

feat: Implement experiment gated CRUD for workspace proxies #6928

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
243f837
feat: Implement basic moon crud
Emyrk Mar 30, 2023
5bd1392
chore: Implement enterprise endpoints for moons
Emyrk Mar 31, 2023
4b5e219
Make gen
Emyrk Mar 31, 2023
a593520
Add unit test for moons
Emyrk Mar 31, 2023
8613b13
Linting
Emyrk Mar 31, 2023
f1da2f1
Add url validation
Emyrk Mar 31, 2023
dff4fc8
Add unit tests
Emyrk Mar 31, 2023
aa41907
Make gen
Emyrk Mar 31, 2023
fa5ad31
Linting
Emyrk Mar 31, 2023
d4260b5
Fix unit test
Emyrk Mar 31, 2023
f689381
Fix unit test
Emyrk Mar 31, 2023
bace1cf
Make gen
Emyrk Apr 3, 2023
6ba9079
Merge remote-tracking branch 'origin/main' into stevenmasley/moon_crud
Emyrk Apr 3, 2023
a8a5be1
Bump migrations
Emyrk Apr 3, 2023
cce8a7d
wildcard hostname vs url
Emyrk Apr 4, 2023
d84b46c
Use tabs
Emyrk Apr 4, 2023
a1a31e4
Remove org scoped proxies
Emyrk Apr 4, 2023
440645c
Fix unit tests
Emyrk Apr 4, 2023
c7b6b7c
make fmt
Emyrk Apr 4, 2023
9824f2e
Fix route gen
Emyrk Apr 4, 2023
c7c52f3
Fix unit test
Emyrk Apr 4, 2023
0f3af22
Merge remote-tracking branch 'origin/main' into stevenmasley/moon_crud
Emyrk Apr 4, 2023
ac3f912
Merge remote-tracking branch 'origin/main' into stevenmasley/moon_crud
Emyrk Apr 4, 2023
3145d5f
Make gen
Emyrk Apr 4, 2023
8a5119e
Bump migrations
Emyrk Apr 4, 2023
7daf459
Only return non deleted
Emyrk Apr 4, 2023
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
Prev Previous commit
Next Next commit
Fix unit tests
  • Loading branch information
@Emyrk
Emyrk committed Apr 4, 2023
commit 440645cfc459052843d69ba9dc4af006cd38171e
8 changes: 3 additions & 5 deletions coderd/database/dbauthz/querier_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,11 +440,9 @@ func (s *MethodTestSuite) TestOrganization() {

func (s *MethodTestSuite) TestWorkspaceProxy() {
s.Run("InsertWorkspaceProxy", s.Subtest(func(db database.Store, check *expects) {
o := dbgen.Organization(s.T(), db, database.Organization{})
check.Args(database.InsertWorkspaceProxyParams{
ID: uuid.New(),
OrganizationID: o.ID,
}).Asserts(rbac.ResourceWorkspaceProxy.InOrg(o.ID), rbac.ActionCreate)
ID: uuid.New(),
}).Asserts(rbac.ResourceWorkspaceProxy, rbac.ActionCreate)
}))
s.Run("UpdateWorkspaceProxy", s.Subtest(func(db database.Store, check *expects) {
p := dbgen.WorkspaceProxy(s.T(), db, database.WorkspaceProxy{})
Expand All @@ -464,7 +462,7 @@ func (s *MethodTestSuite) TestWorkspaceProxy() {
}).Asserts(p, rbac.ActionDelete)
}))
s.Run("GetWorkspaceProxies", s.Subtest(func(db database.Store, check *expects) {
p1 := dbgen.WorkspaceProxy(s.T(), db, database.WorkspacseProxy{})
p1 := dbgen.WorkspaceProxy(s.T(), db, database.WorkspaceProxy{})
p2 := dbgen.WorkspaceProxy(s.T(), db, database.WorkspaceProxy{})
check.Args().Asserts(p1, rbac.ActionRead, p2, rbac.ActionRead).Returns(slice.New(p1, p2))
}))
Expand Down
8 changes: 4 additions & 4 deletions codersdk/workspaceproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ type WorkspaceProxy struct {
Deleted bool `db:"deleted" json:"deleted"`
}

func (c *Client) CreateWorkspaceProxy(ctx context.Context, orgID uuid.UUID, req CreateWorkspaceProxyRequest) (WorkspaceProxy, error) {
func (c *Client) CreateWorkspaceProxy(ctx context.Context, req CreateWorkspaceProxyRequest) (WorkspaceProxy, error) {
res, err := c.Request(ctx, http.MethodPost,
fmt.Sprintf("/api/v2/organizations/%s/workspaceproxies", orgID.String()),
fmt.Sprintf("/api/v2/workspaceproxies"),
req,
)
if err != nil {
Expand All @@ -51,9 +51,9 @@ func (c *Client) CreateWorkspaceProxy(ctx context.Context, orgID uuid.UUID, req
return resp, json.NewDecoder(res.Body).Decode(&resp)
}

func (c *Client) WorkspaceProxiesByOrganization(ctx context.Context, orgID uuid.UUID) ([]WorkspaceProxy, error) {
func (c *Client) WorkspaceProxiesByOrganization(ctx context.Context) ([]WorkspaceProxy, error) {
res, err := c.Request(ctx, http.MethodGet,
fmt.Sprintf("/api/v2/organizations/%s/workspaceproxies", orgID.String()),
fmt.Sprintf("/api/v2/workspaceproxies"),
nil,
)
if err != nil {
Expand Down
6 changes: 3 additions & 3 deletions enterprise/coderd/workspaceproxy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,22 @@ func TestWorkspaceProxyCRUD(t *testing.T) {
DeploymentValues: dv,
},
})
user := coderdtest.CreateFirstUser(t, client)
_ = coderdtest.CreateFirstUser(t, client)
_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
Features: license.Features{
codersdk.FeatureWorkspaceProxy: 1,
},
})
ctx := testutil.Context(t, testutil.WaitLong)
proxy, err := client.CreateWorkspaceProxy(ctx, user.OrganizationID, codersdk.CreateWorkspaceProxyRequest{
proxy, err := client.CreateWorkspaceProxy(ctx, codersdk.CreateWorkspaceProxyRequest{
Name: namesgenerator.GetRandomName(1),
Icon: "/emojis/flag.png",
URL: "https://" + namesgenerator.GetRandomName(1) + ".com",
WildcardHostname: "*." + namesgenerator.GetRandomName(1) + ".com",
})
require.NoError(t, err)

proxies, err := client.WorkspaceProxiesByOrganization(ctx, user.OrganizationID)
proxies, err := client.WorkspaceProxiesByOrganization(ctx)
require.NoError(t, err)
require.Len(t, proxies, 1)
require.Equal(t, proxy, proxies[0])
Expand Down