fix/-nobackend-options

motatoes · motatoes · commit eca39b5fc187 · 2024-06-05T14:37:21.000+01:00
diff --git a/ee/backend/templates/github_success.tmpl b/ee/backend/templates/github_success.tmpl
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Digger github app installed</title>
+  <meta name="description" content="">
+  <meta name="author" content="">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+</head>
+<body>
+<div class="container">
+  <section class="header">
+    <h1 class="title-heading">App installation successful</h1>
+    <p>You can now close this tab.</p>
+  </section>
+</div>
+</body>
+</html>
diff --git a/ee/cli/cmd/digger/root.go b/ee/cli/cmd/digger/root.go
@@ -90,7 +90,7 @@ func PreRun(cmd *cobra.Command, args []string) {
 		log.Println("WARNING: running in 'backendless' mode. Features that require backend will not be available.")
 		PolicyChecker = policy.NoOpPolicyChecker{}
 		BackendApi = backend.NoopApi{}
-	} else if os.Getenv("DIGGER_TOKEN") != "" {
+	} else {
 		if os.Getenv("DIGGER_ORGANISATION") == "" {
 			log.Fatalf("Token specified but missing organisation: DIGGER_ORGANISATION. Please set this value in action digger_config.")
 		}
@@ -104,8 +104,6 @@ func PreRun(cmd *cobra.Command, args []string) {
 			AuthToken:  os.Getenv("DIGGER_TOKEN"),
 			HttpClient: http.DefaultClient,
 		}
-	} else {
-		reportErrorAndExit("", "DIGGER_TOKEN not specified. You can get one at https://cloud.digger.dev, or self-manage a backend of Digger Community Edition (change DIGGER_HOSTNAME). You can also pass 'no-backend: true' option; in this case some of the features may not be available.", 1)
 	}
 
 	if os.Getenv("REPORTING_STRATEGY") == "comments_per_run" || os.Getenv("ACCUMULATE_PLANS") == "true" {

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ func PreRun(cmd *cobra.Command, args []string) {`
`90`	`90`	`log.Println("WARNING: running in 'backendless' mode. Features that require backend will not be available.")`
`91`	`91`	`PolicyChecker = policy.NoOpPolicyChecker{}`
`92`	`92`	`BackendApi = backend.NoopApi{}`
`93`		`- } else if os.Getenv("DIGGER_TOKEN") != "" {`
	`93`	`+ } else {`
`94`	`94`	`if os.Getenv("DIGGER_ORGANISATION") == "" {`
`95`	`95`	`log.Fatalf("Token specified but missing organisation: DIGGER_ORGANISATION. Please set this value in action digger_config.")`
`96`	`96`	`}`
`@@ -104,8 +104,6 @@ func PreRun(cmd *cobra.Command, args []string) {`
`104`	`104`	`AuthToken: os.Getenv("DIGGER_TOKEN"),`
`105`	`105`	`HttpClient: http.DefaultClient,`
`106`	`106`	`}`
`107`		`- } else {`
`108`		`- reportErrorAndExit("", "DIGGER_TOKEN not specified. You can get one at https://cloud.digger.dev, or self-manage a backend of Digger Community Edition (change DIGGER_HOSTNAME). You can also pass 'no-backend: true' option; in this case some of the features may not be available.", 1)`
`109`	`107`	`}`
`110`	`108`
`111`	`109`	`if os.Getenv("REPORTING_STRATEGY") == "comments_per_run" \|\| os.Getenv("ACCUMULATE_PLANS") == "true" {`