feat(cli): Disable sentry in development (#1939)

yevgenypats · web-flow · commit e2c417e42e01 · 2022-09-21T21:43:33.000+03:00
Disables sentry in dev Also, doing some piggyback and creating some better error message so we can ignore user errors in the server side (sentry) --- Use the following steps to ensure your PR is ready to be reviewed - [ ] Read the [contribution guidelines](../blob/main/CONTRIBUTING.md) 🧑‍🎓 - [ ] Test locally on your own infrastructure - [ ] Run `go fmt` to format your code 🖊 - [ ] Lint your changes via `golangci-lint run` 🚨 (install golangci-lint [here](https://golangci-lint.run/usage/install/#local-installation)) - [ ] Update or add tests 🧪 - [ ] Ensure the status checks below are successful ✅
diff --git a/cli/cmd/generate.go b/cli/cmd/generate.go
@@ -122,7 +122,7 @@ func genSource(cmd *cobra.Command, path string, pm *plugins.PluginManager, regis
 	}
 	err = writeSource(configPath, sourceSpec)
 	if err != nil {
-		return fmt.Errorf("failed to write file: %w", err)
+		return fmt.Errorf("failed to write source to file: %w", err)
 	}
 	fmt.Println("Source plugin config successfully written to " + configPath)
 	return nil
@@ -166,7 +166,7 @@ func genDestination(cmd *cobra.Command, path string, pm *plugins.PluginManager,
 	}
 	err = writeDestination(configPath, destSpec)
 	if err != nil {
-		return fmt.Errorf("failed to write file: %w", err)
+		return fmt.Errorf("failed to write destination to file: %w", err)
 	}
 	fmt.Println("Destination plugin config successfully written to " + configPath)
 	return nil
diff --git a/cli/cmd/root.go b/cli/cmd/root.go
@@ -72,33 +72,32 @@ func NewCmdRoot() *cobra.Command {
 
 			mw := io.MultiWriter(writers...)
 			log.Logger = zerolog.New(mw).Level(zerologLevel).With().Str("module", "cli").Timestamp().Logger()
-			err = sentry.Init(sentry.ClientOptions{
-				Debug:   false,
-				Dsn:     sentryDsn,
-				Release: "cloudquery@" + Version,
-				// https://docs.sentry.io/platforms/go/configuration/options/#removing-default-integrations
-				Integrations: func(integrations []sentry.Integration) []sentry.Integration {
-					var filteredIntegrations []sentry.Integration
-					for _, integration := range integrations {
-						if integration.Name() == "Modules" {
-							continue
+			if sentryDsn != "" && Version != "development" {
+				if err := sentry.Init(sentry.ClientOptions{
+					Debug:   false,
+					Dsn:     sentryDsn,
+					Release: "cloudquery@" + Version,
+					// https://docs.sentry.io/platforms/go/configuration/options/#removing-default-integrations
+					Integrations: func(integrations []sentry.Integration) []sentry.Integration {
+						var filteredIntegrations []sentry.Integration
+						for _, integration := range integrations {
+							if integration.Name() == "Modules" {
+								continue
+							}
+							filteredIntegrations = append(filteredIntegrations, integration)
 						}
-						filteredIntegrations = append(filteredIntegrations, integration)
-					}
-					return filteredIntegrations
-				},
-			})
-			if err != nil {
-				log.Error().Err(err).Msg("error initializing sentry")
+						return filteredIntegrations
+					},
+				}); err != nil {
+					return err
+				}
 			}
-
 			return nil
 		},
 		PersistentPostRun: func(cmd *cobra.Command, args []string) {
 			if logFile != nil {
 				logFile.Close()
 			}
-			// analytics.Close()
 		},
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ func genSource(cmd cobra.Command, path string, pm plugins.PluginManager, regis`
`122`	`122`	`}`
`123`	`123`	`err = writeSource(configPath, sourceSpec)`
`124`	`124`	`if err != nil {`
`125`		`- return fmt.Errorf("failed to write file: %w", err)`
	`125`	`+ return fmt.Errorf("failed to write source to file: %w", err)`
`126`	`126`	`}`
`127`	`127`	`fmt.Println("Source plugin config successfully written to " + configPath)`
`128`	`128`	`return nil`
`@@ -166,7 +166,7 @@ func genDestination(cmd cobra.Command, path string, pm plugins.PluginManager,`
`166`	`166`	`}`
`167`	`167`	`err = writeDestination(configPath, destSpec)`
`168`	`168`	`if err != nil {`
`169`		`- return fmt.Errorf("failed to write file: %w", err)`
	`169`	`+ return fmt.Errorf("failed to write destination to file: %w", err)`
`170`	`170`	`}`
`171`	`171`	`fmt.Println("Destination plugin config successfully written to " + configPath)`
`172`	`172`	`return nil`