Jul 25, 2024 · Jul 23, 2024 · Jul 23, 2024 · Jul 25, 2024 · Jul 26, 2024 · Jul 29, 2024
diff --git a/.github/workflows/dogfood.yaml b/.github/workflows/dogfood.yaml
      - "flake.lock"
      - "flake.nix"
  pull_request:
    branches-ignore:
      - "dependabot/**"
    paths:
      - "dogfood/**"
      - ".github/workflows/dogfood.yaml"

 jobs:
  build_image:
    if: github.actor != 'dependabot[bot]' # Skip Dependabot PRs
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/audit/diff.go b/coderd/audit/diff.go
 database.OAuth2ProviderAppSecret |
 database.CustomRole |
 database.AuditableOrganizationMember |
 database.Organization
 database.Organization |
 database.NotificationTemplate
 }

 // Map is a map of changed fields in an audited resource. It maps field names to
diff --git a/coderd/audit/request.go b/coderd/audit/request.go
 "golang.org/x/xerrors"

 "cdr.dev/slog"

 "github.com/coder/coder/v2/coderd/database"
 "github.com/coder/coder/v2/coderd/database/dbtime"
 "github.com/coder/coder/v2/coderd/httpmw"
 "github.com/coder/coder/v2/coderd/tracing"
 )

 return typed.Username
 case database.Organization:
 return typed.Name
 case database.NotificationTemplate:
 return typed.Name
 default:
 panic(fmt.Sprintf("unknown resource %T for ResourceTarget", tgt))
 }
 return typed.UserID
 case database.Organization:
 return typed.ID
 case database.NotificationTemplate:
 return typed.ID
 default:
 panic(fmt.Sprintf("unknown resource %T for ResourceID", tgt))
 }
 return database.ResourceTypeOrganizationMember
 case database.Organization:
 return database.ResourceTypeOrganization
 case database.NotificationTemplate:
 return database.ResourceTypeNotificationTemplate
 default:
 panic(fmt.Sprintf("unknown resource %T for ResourceType", typed))
 }
 return true
 case database.Organization:
 return true
 case database.NotificationTemplate:
 return false
 default:
 panic(fmt.Sprintf("unknown resource %T for ResourceRequiresOrgID", tgt))
 }
diff --git a/coderd/coderd.go b/coderd/coderd.go
 })
 })
 r.Route("/notifications", func(r chi.Router) {
 r.Use(apiKeyMiddleware)
 r.Use(
 apiKeyMiddleware,
 httpmw.RequireExperiment(api.Experiments, codersdk.ExperimentNotifications),
 )
 r.Get("/settings", api.notificationsSettings)
 r.Put("/settings", api.putNotificationsSettings)
 r.Route("/templates", func(r chi.Router) {
 r.Get("/system", api.systemNotificationTemplates)
 })
 })
 })
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,8 +10,6 @@ on:
		- "flake.lock"
		- "flake.nix"
		pull_request:
		branches-ignore:
		- "dependabot/**"
		paths:
		- "dogfood/**"
		- ".github/workflows/dogfood.yaml"
Expand All		@@ -21,6 +19,7 @@ on:

		jobs:
		build_image:
		if: github.actor != 'dependabot[bot]' # Skip Dependabot PRs
		runs-on: ubuntu-latest
		steps:
		- name: Checkout
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,7 +25,8 @@ type Auditable interface {
		database.OAuth2ProviderAppSecret \|
		database.CustomRole \|
		database.AuditableOrganizationMember \|
		database.Organization
		database.Organization \|
		database.NotificationTemplate
		}

		// Map is a map of changed fields in an audited resource. It maps field names to
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,9 +16,10 @@
		"golang.org/x/xerrors"

		"cdr.dev/slog"

		"github.com/coder/coder/v2/coderd/database"
		"github.com/coder/coder/v2/coderd/database/dbtime"
		"github.com/coder/coder/v2/coderd/httpmw"
Check failure on line 22 in coderd/audit/request.go View workflow job for this annotation GitHub Actions/ lint `could not import github.com/coder/coder/v2/coderd/httpmw (-: # github.com/coder/coder/v2/coderd/httpmw`
		"github.com/coder/coder/v2/coderd/tracing"
		)

Expand DownExpand Up		@@ -117,6 +118,8 @@
		return typed.Username
		case database.Organization:
		return typed.Name
		case database.NotificationTemplate:
		return typed.Name
		default:
		panic(fmt.Sprintf("unknown resource %T for ResourceTarget", tgt))
		}
Expand DownExpand Up		@@ -163,6 +166,8 @@
		return typed.UserID
		case database.Organization:
		return typed.ID
		case database.NotificationTemplate:
		return typed.ID
		default:
		panic(fmt.Sprintf("unknown resource %T for ResourceID", tgt))
		}
Expand DownExpand Up		@@ -206,6 +211,8 @@
		return database.ResourceTypeOrganizationMember
		case database.Organization:
		return database.ResourceTypeOrganization
		case database.NotificationTemplate:
		return database.ResourceTypeNotificationTemplate
		default:
		panic(fmt.Sprintf("unknown resource %T for ResourceType", typed))
		}
Expand DownExpand Up		@@ -251,6 +258,8 @@
		return true
		case database.Organization:
		return true
		case database.NotificationTemplate:
		return false
		default:
		panic(fmt.Sprintf("unknown resource %T for ResourceRequiresOrgID", tgt))
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1243,9 +1243,15 @@ func New(options Options) API {
		})
		})
		r.Route("/notifications", func(r chi.Router) {
		r.Use(apiKeyMiddleware)
		r.Use(
		apiKeyMiddleware,
		httpmw.RequireExperiment(api.Experiments, codersdk.ExperimentNotifications),
		)
		r.Get("/settings", api.notificationsSettings)
		r.Put("/settings", api.putNotificationsSettings)
		r.Route("/templates", func(r chi.Router) {
		r.Get("/system", api.systemNotificationTemplates)
		})
		})
		})

Expand Down