Merge branch 'main' into dean/app-tokens

coder · deansheather · Sep 22, 2022 · Sep 19, 2022 · Sep 19, 2022 · Sep 19, 2022
commit da5f656c8bf1cfba818e54b296e7a2f7aa728438
diff --git a/coderd/workspaceapps_test.go b/coderd/workspaceapps_test.go
@@ -40,7 +40,7 @@ const (
 // setupProxyTest creates a workspace with an agent and some apps. It returns a
 // codersdk client, the first user, the workspace, and the port number the test
 // listener is running on.
-func setupProxyTest(t *testing.T) (*codersdk.Client, codersdk.CreateFirstUserResponse, codersdk.Workspace, uint16) {
+func setupProxyTest(t *testing.T, workspaceMutators ...func(*codersdk.CreateWorkspaceRequest)) (*codersdk.Client, codersdk.CreateFirstUserResponse, codersdk.Workspace, uint16) {
 	// #nosec
 	ln, err := net.Listen("tcp", ":0")
 	require.NoError(t, err)
@@ -62,8 +62,10 @@ func setupProxyTest(t *testing.T) (*codersdk.Client, codersdk.CreateFirstUserRes
 	require.True(t, ok)
 
 	client := coderdtest.New(t, &coderdtest.Options{
-		AppHostname:              proxyTestSubdomain,
-		IncludeProvisionerDaemon: true,
+		AppHostname:                 proxyTestSubdomain,
+		IncludeProvisionerDaemon:    true,
+		AgentStatsRefreshInterval:   time.Millisecond * 100,
+		MetricsCacheRefreshInterval: time.Millisecond * 100,
 	})
 	user := coderdtest.CreateFirstUser(t, client)
 	authToken := uuid.NewString()

diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -103,6 +103,28 @@ export interface AuthMethods {
   readonly oidc: boolean
 }
 
+// From codersdk/authorization.go
+export interface AuthorizationCheck {
+  readonly object: AuthorizationObject
+  readonly action: string
+}
+
+// From codersdk/authorization.go
+export interface AuthorizationObject {
+  readonly resource_type: string
+  readonly owner_id?: string
+  readonly organization_id?: string
+  readonly resource_id?: string
+}
+
+// From codersdk/authorization.go
+export interface AuthorizationRequest {
+  readonly checks: Record<string, AuthorizationCheck>
+}
+
+// From codersdk/authorization.go
+export type AuthorizationResponse = Record<string, boolean>
+
 // From codersdk/workspaceagents.go
 export interface AzureInstanceIdentityToken {
   readonly signature: string
@@ -497,28 +519,6 @@ export interface User {
   readonly avatar_url: string
 }
 
-// From codersdk/users.go
-export interface UserAuthorization {
-  readonly object: UserAuthorizationObject
-  readonly action: string
-}
-
-// From codersdk/users.go
-export interface UserAuthorizationObject {
-  readonly resource_type: string
-  readonly owner_id?: string
-  readonly organization_id?: string
-  readonly resource_id?: string
-}
-
-// From codersdk/users.go
-export interface UserAuthorizationRequest {
-  readonly checks: Record<string, UserAuthorization>
-}
-
-// From codersdk/users.go
-export type UserAuthorizationResponse = Record<string, boolean>
-
 // From codersdk/users.go
 export interface UserRoles {
   readonly roles: string[]