Format code with gofumpt (#141)

deepsource-autofix[bot] · web-flow · commit c1f741ff1030 · 2022-05-27T20:10:40.000+05:30
diff --git a/command/auth/login/login.go b/command/auth/login/login.go
@@ -23,7 +23,6 @@ type LoginOptions struct {
 
 // NewCmdLogin handles the login functionality for the CLI
 func NewCmdLogin() *cobra.Command {
-
 	doc := heredoc.Docf(`
 		Log in to DeepSource using the CLI.
 
@@ -64,7 +63,6 @@ func NewCmdLogin() *cobra.Command {
 
 // Run executes the auth command and starts the login flow if not already authenticated
 func (opts *LoginOptions) Run() (err error) {
-
 	// Fetch config
 	cfg, _ := config.GetConfig()
 	opts.User = cfg.User
diff --git a/command/config/generate/analyzers_input.go b/command/config/generate/analyzers_input.go
@@ -132,7 +132,7 @@ func populateMetadata(optionalFields []string, jsonParsed *gabs.Container) []Ana
 func (o *Options) extractRequiredAnalyzerMetaFields() error {
 	var optionalFields []string
 	var requiredMetaData []AnalyzerMetadata
-	var analyzerFieldsData = make(map[string][]AnalyzerMetadata)
+	analyzerFieldsData := make(map[string][]AnalyzerMetadata)
 
 	// Extract `optional_required` fields of analyzer meta of selected analyzers
 	for _, activatedAnalyzer := range o.ActivatedAnalyzers {
diff --git a/command/config/generate/input.go b/command/config/generate/input.go
@@ -10,7 +10,6 @@ import (
 
 // Responsible for collecting user input for generating DeepSource config
 func (o *Options) collectUserInput() error {
-
 	deepsource, err := deepsource.New(deepsource.ClientOpts{
 		Token:    config.Cfg.Token,
 		HostName: config.Cfg.Host,
diff --git a/command/config/validate/validate.go b/command/config/validate/validate.go
@@ -25,7 +25,6 @@ type Options struct{}
 // NewCmdValidate handles the validation of the DeepSource config (.deepsource.toml)
 // Internally it uses the package `configvalidator` to validate the config
 func NewCmdValidate() *cobra.Command {
-
 	o := Options{}
 	cmd := &cobra.Command{
 		Use:   "validate",
diff --git a/command/issues/list/list_test.go b/command/issues/list/list_test.go
@@ -63,7 +63,6 @@ func TestListJSON(t *testing.T) {
 }
 
 func TestListSARIF(t *testing.T) {
-
 	t.Run("must work with single language repositories", func(t *testing.T) {
 		// export issues to SARIF
 		issues_data := ReadIssues("./testdata/dummy/issues.json")
@@ -112,7 +111,6 @@ func TestListSARIF(t *testing.T) {
 }
 
 func TestFilterIssuesByPath(t *testing.T) {
-
 	t.Run("must work with files", func(t *testing.T) {
 		issues_data := ReadIssues("./testdata/dummy/issues_data_multi.json")
 		issues_docker := ReadIssues("./testdata/dummy/issues_docker.json")
@@ -137,7 +135,6 @@ func TestFilterIssuesByPath(t *testing.T) {
 }
 
 func TestFilterIssuesByAnalyzer(t *testing.T) {
-
 	t.Run("must work with a single analyzer", func(t *testing.T) {
 		issues_data := ReadIssues("./testdata/dummy/issues_data_multi.json")
 		issues_docker := ReadIssues("./testdata/dummy/issues_docker.json")
diff --git a/command/repo/status/status.go b/command/repo/status/status.go
@@ -20,7 +20,6 @@ type RepoStatusOptions struct {
 
 // NewCmdRepoStatus handles querying the activation status of the repo supplied as an arg
 func NewCmdRepoStatus() *cobra.Command {
-
 	opts := RepoStatusOptions{
 		RepoArg:      "",
 		TokenExpired: config.Cfg.IsExpired(),
diff --git a/command/repo/view/view.go b/command/repo/view/view.go
@@ -27,7 +27,6 @@ type RepoViewOptions struct {
 }
 
 func NewCmdRepoView() *cobra.Command {
-
 	opts := RepoViewOptions{
 		RepoArg:        "",
 		SelectedRemote: &utils.RemoteData{},
diff --git a/configvalidator/generic_config_validator.go b/configvalidator/generic_config_validator.go
@@ -90,5 +90,4 @@ func (c *ConfigValidator) validateGenericConfig() {
 	c.validateVersion()
 	c.validateExcludePatterns()
 	c.validateTestPatterns()
-
 }
diff --git a/deepsource/analyzers/queries/get_analyzers.go b/deepsource/analyzers/queries/get_analyzers.go
@@ -43,7 +43,6 @@ type IGQLClient interface {
 }
 
 func (a AnalyzersRequest) Do(ctx context.Context, client IGQLClient) ([]analyzers.Analyzer, error) {
-
 	req := graphql.NewRequest(listAnalyzersQuery)
 
 	// set header fields
diff --git a/deepsource/issues/issues_list.go b/deepsource/issues/issues_list.go
@@ -19,5 +19,4 @@ type Issue struct {
 	IssueCode string       `json:"issue_code"`  // DeepSource code for the issue reported
 	Location  Location     `json:"location"`    // The location data for the issue reported
 	Analyzer  AnalyzerMeta // The Analyzer which raised the issue
-
 }
diff --git a/utils/cmd_validator.go b/utils/cmd_validator.go
@@ -10,7 +10,6 @@ import (
 // Validates if the number of args passed to a command is exactly same as that required
 func ExactArgs(count int) cobra.PositionalArgs {
 	return func(cmd *cobra.Command, args []string) error {
-
 		arg := "argument"
 		if count > 1 {
 			arg = "arguments"
@@ -32,7 +31,6 @@ func ExactArgs(count int) cobra.PositionalArgs {
 
 func MaxNArgs(count int) cobra.PositionalArgs {
 	return func(cmd *cobra.Command, args []string) error {
-
 		arg := "argument"
 		if count > 1 {
 			arg = "arguments"
@@ -54,7 +52,6 @@ func MaxNArgs(count int) cobra.PositionalArgs {
 
 // Validates if there is any arg passed to a command which doesn't require any
 func NoArgs(cmd *cobra.Command, args []string) error {
-
 	errorMsg := fmt.Sprintf("`%s` does not require any argument. Please see `%s --help` for the supported flags and their usage.",
 		cmd.CommandPath(),
 		cmd.CommandPath())
diff --git a/utils/fetch_analyzers_transformers.go b/utils/fetch_analyzers_transformers.go
@@ -22,11 +22,15 @@ type DeepSourceTransformersData struct {
 	TransformerMap        map[string]string // Map for {transformer name:shortcode}
 }
 
-var AnalyzersData DeepSourceAnalyzersData
-var TransformersData DeepSourceTransformersData
+var (
+	AnalyzersData    DeepSourceAnalyzersData
+	TransformersData DeepSourceTransformersData
+)
 
-var analyzersAPIResponse []analyzers.Analyzer
-var transformersAPIResponse []transformers.Transformer
+var (
+	analyzersAPIResponse    []analyzers.Analyzer
+	transformersAPIResponse []transformers.Transformer
+)
 
 // Get the list of all the supported analyzers and transformers with
 // their corresponding data like shortcode, metaschema etc.
diff --git a/utils/fetch_remote.go b/utils/fetch_remote.go
@@ -31,7 +31,7 @@ func getRemoteMap(remoteList []string) (map[string][]string, error) {
 			continue
 		}
 
-		var RepoNameRegexp = regexp.MustCompile(`.+/([^/]+)(\.git)?$`)
+		RepoNameRegexp := regexp.MustCompile(`.+/([^/]+)(\.git)?$`)
 
 		// Parsing out repository name from the remote URL using the above regex
 		matched := RepoNameRegexp.FindStringSubmatch(remoteURL)
diff --git a/utils/remote_resolver.go b/utils/remote_resolver.go
@@ -72,7 +72,6 @@ func ResolveRemote(repoArg string) (*RemoteData, error) {
 
 // Utility to parse the --repo flag
 func RepoArgumentResolver(arg string) ([]string, error) {
-
 	// github.com/deepsourcelabs/cli or gh/deepsourcelabs/cli
 
 	argComponents := strings.Split(arg, "/")
diff --git a/version/version_test.go b/version/version_test.go
@@ -7,7 +7,6 @@ import (
 )
 
 func TestBuildInfo_String(t *testing.T) {
-
 	date, _ := time.Parse("2006-01-02", "2021-01-21")
 
 	type fields struct {
@@ -78,7 +77,6 @@ func TestSetBuildInfo(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			SetBuildInfo(tt.args.version, tt.args.dateStr, tt.args.gitTreeState, tt.args.gitCommit)
-
 		})
 		if !reflect.DeepEqual(buildInfo, want) {
 			t.Errorf("buildInfo = %v, want %v", buildInfo, want)

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,6 @@ func TestListJSON(t *testing.T) {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`func TestListSARIF(t *testing.T) {`
`66`		`-`
`67`	`66`	`t.Run("must work with single language repositories", func(t *testing.T) {`
`68`	`67`	`// export issues to SARIF`
`69`	`68`	`issues_data := ReadIssues("./testdata/dummy/issues.json")`
`@@ -112,7 +111,6 @@ func TestListSARIF(t *testing.T) {`
`112`	`111`	`}`
`113`	`112`
`114`	`113`	`func TestFilterIssuesByPath(t *testing.T) {`
`115`		`-`
`116`	`114`	`t.Run("must work with files", func(t *testing.T) {`
`117`	`115`	`issues_data := ReadIssues("./testdata/dummy/issues_data_multi.json")`
`118`	`116`	`issues_docker := ReadIssues("./testdata/dummy/issues_docker.json")`
`@@ -137,7 +135,6 @@ func TestFilterIssuesByPath(t *testing.T) {`
`137`	`135`	`}`
`138`	`136`
`139`	`137`	`func TestFilterIssuesByAnalyzer(t *testing.T) {`
`140`		`-`
`141`	`138`	`t.Run("must work with a single analyzer", func(t *testing.T) {`
`142`	`139`	`issues_data := ReadIssues("./testdata/dummy/issues_data_multi.json")`
`143`	`140`	`issues_docker := ReadIssues("./testdata/dummy/issues_docker.json")`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@ type RepoViewOptions struct {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`func NewCmdRepoView() *cobra.Command {`
`30`		`-`
`31`	`30`	`opts := RepoViewOptions{`
`32`	`31`	`RepoArg: "",`
`33`	`32`	`SelectedRemote: &utils.RemoteData{},`
Original file line number	Diff line number	Diff line change
`@@ -90,5 +90,4 @@ func (c *ConfigValidator) validateGenericConfig() {`
`90`	`90`	`c.validateVersion()`
`91`	`91`	`c.validateExcludePatterns()`
`92`	`92`	`c.validateTestPatterns()`
`93`		`-`
`94`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ type IGQLClient interface {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`func (a AnalyzersRequest) Do(ctx context.Context, client IGQLClient) ([]analyzers.Analyzer, error) {`
`46`		`-`
`47`	`46`	`req := graphql.NewRequest(listAnalyzersQuery)`
`48`	`47`
`49`	`48`	`// set header fields`
Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,4 @@ type Issue struct {`
`19`	`19`	IssueCode string `json:"issue_code"` // DeepSource code for the issue reported
`20`	`20`	Location Location `json:"location"` // The location data for the issue reported
`21`	`21`	`Analyzer AnalyzerMeta // The Analyzer which raised the issue`
`22`		`-`
`23`	`22`	`}`