DON'T PANIC

johnstcn · johnstcn · commit 55a0fd01bf5e · 2023-09-06T14:10:48.000+01:00
diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -72,9 +72,9 @@ func New(ctx context.Context, options *Options) (_ *API, err error) {
 			// This is a fatal error.
 			var derr *dbcrypt.DecryptFailedError
 			if xerrors.As(err, &derr) {
-				panic(`Coder has shut down to prevent data corruption: your configured database is encrypted with an unknown external token encryption key. Please check your configuration and try again.`)
+				return nil, xerrors.Errorf("database encrypted with unknown key, either add the key or see https://coder.com/docs/v2/latest/admin/encryption#disabling-encryption: %w", derr)
 			}
-			return nil, xerrors.Errorf("init dbcrypt: %w", err)
+			return nil, xerrors.Errorf("init database encryption: %w", err)
 		}
 		options.Database = cryptDB
 	}

Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,9 @@ func New(ctx context.Context, options Options) (_ API, err error) {`
`72`	`72`	`// This is a fatal error.`
`73`	`73`	`var derr *dbcrypt.DecryptFailedError`
`74`	`74`	`if xerrors.As(err, &derr) {`
`75`		- panic(`Coder has shut down to prevent data corruption: your configured database is encrypted with an unknown external token encryption key. Please check your configuration and try again.`)
	`75`	`+ return nil, xerrors.Errorf("database encrypted with unknown key, either add the key or see https://coder.com/docs/v2/latest/admin/encryption#disabling-encryption: %w", derr)`
`76`	`76`	`}`
`77`		`- return nil, xerrors.Errorf("init dbcrypt: %w", err)`
	`77`	`+ return nil, xerrors.Errorf("init database encryption: %w", err)`
`78`	`78`	`}`
`79`	`79`	`options.Database = cryptDB`
`80`	`80`	`}`