fix test

wxiaoguang · wxiaoguang · commit c084de2d7b72 · 2024-05-10T14:38:07.000+08:00
diff --git a/modules/setting/security.go b/modules/setting/security.go
@@ -198,7 +198,12 @@ func loadSecurityFrom(rootCfg ConfigProvider) {
 
 func GetGeneralTokenSigningSecret() []byte {
 	if len(GeneralWebSecretBytes) == 0 {
-		log.Fatal("GeneralWebSecretBytes is empty")
+		// FIXME: it shouldn't happen in production. At the monment only some tests are using the secret without initializing it.
+		LogStartupProblem(1, log.WARN, "OAuth2 is not enabled, unable to use a persistent signing secret, a new one is generated, which is not persistent between restarts and cluster nodes")
+		GeneralWebSecretBytes, _, _ = generate.NewGeneralWebSecretWithBase64()
+		if len(GeneralWebSecretBytes) == 0 {
+			panic("Failed to generate a new GeneralWebSecretBytes") // impossible to happen
+		}
 	}
 	return GeneralWebSecretBytes
 }

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,12 @@ func loadSecurityFrom(rootCfg ConfigProvider) {`
`198`	`198`
`199`	`199`	`func GetGeneralTokenSigningSecret() []byte {`
`200`	`200`	`if len(GeneralWebSecretBytes) == 0 {`
`201`		`- log.Fatal("GeneralWebSecretBytes is empty")`
	`201`	`+ // FIXME: it shouldn't happen in production. At the monment only some tests are using the secret without initializing it.`
	`202`	`+ LogStartupProblem(1, log.WARN, "OAuth2 is not enabled, unable to use a persistent signing secret, a new one is generated, which is not persistent between restarts and cluster nodes")`
	`203`	`+ GeneralWebSecretBytes, _, _ = generate.NewGeneralWebSecretWithBase64()`
	`204`	`+ if len(GeneralWebSecretBytes) == 0 {`
	`205`	`+ panic("Failed to generate a new GeneralWebSecretBytes") // impossible to happen`
	`206`	`+ }`
`202`	`207`	`}`
`203`	`208`	`return GeneralWebSecretBytes`
`204`	`209`	`}`