Skip to content

Commit bc2f530

Browse files
Emyrkpull[bot]
Emyrk
authored and
pull[bot]
committed
fix: add workspace_proxy type to auditlog friendly strings (#9194)
* fix: add workspace_proxy type to auditlog friendly strings * add unit test and organization type
1 parent 4dd68d1 commit bc2f530

File tree

6 files changed

+38
-4
lines changed

6 files changed

+38
-4
lines changed

‎coderd/apidoc/docs.go

Lines changed: 6 additions & 2 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: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/models_test.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,24 @@ import (
55
"testing"
66

77
"github.com/stretchr/testify/assert"
8+
"github.com/stretchr/testify/require"
89

910
"github.com/coder/coder/v2/coderd/database"
11+
"github.com/coder/coder/v2/codersdk"
1012
)
1113

14+
// TestAuditDBEnumsCovered ensures that all enums in the database are covered by the codersdk enums
15+
// for audit log strings.
16+
func TestAuditDBEnumsCovered(t *testing.T) {
17+
t.Parallel()
18+
19+
dbTypes := database.AllResourceTypeValues()
20+
for _, ty := range dbTypes {
21+
str := codersdk.ResourceType(ty).FriendlyString()
22+
require.NotEqualf(t, "unknown", str, "ResourceType %q not covered by codersdk.ResourceType", ty)
23+
}
24+
}
25+
1226
// TestViewSubsetTemplate ensures TemplateTable is a subset of Template
1327
func TestViewSubsetTemplate(t *testing.T) {
1428
t.Parallel()

‎codersdk/audit.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ const (
2424
ResourceTypeGroup ResourceType = "group"
2525
ResourceTypeLicense ResourceType = "license"
2626
ResourceTypeConvertLogin ResourceType = "convert_login"
27+
ResourceTypeWorkspaceProxy ResourceType = "workspace_proxy"
28+
ResourceTypeOrganization ResourceType = "organization"
2729
)
2830

2931
func (r ResourceType) FriendlyString() string {
@@ -50,6 +52,10 @@ func (r ResourceType) FriendlyString() string {
5052
return "license"
5153
case ResourceTypeConvertLogin:
5254
return "login type conversion"
55+
case ResourceTypeWorkspaceProxy:
56+
return "workspace proxy"
57+
case ResourceTypeOrganization:
58+
return "organization"
5359
default:
5460
return "unknown"
5561
}

‎docs/api/schemas.md

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

‎site/src/api/typesGenerated.ts

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

0 commit comments

Comments
 (0)