style: fixed style errors identified in latest version of linting tool

achannarasappa · Feb 21, 2022 · bcc4b85 · bcc4b85
1 parent 2c2f493
commit bcc4b85
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 35 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -19,6 +19,10 @@ linters:
     - gofumpt
     - maligned
     - unparam
+    - tagliatelle
+    - forbidigo
+    - gci
+    - varnamelen
 run:
   tests: false
 issues:

diff --git a/cmd/root.go b/cmd/root.go
@@ -17,7 +17,7 @@ import (
 //nolint:gochecknoglobals
 var (
 	// Version is a placeholder that is replaced at build time with a linker flag (-ldflags)
-	Version      string = "v0.0.0"
+	Version      = "v0.0.0"
 	configPath   string
 	dep          c.Dependencies
 	ctx          c.Context

diff --git a/internal/cli/cli.go b/internal/cli/cli.go
@@ -102,7 +102,7 @@ func readConfig(fs afero.Fs, configPathOption string) (c.Config, error) {
 	configPath, err := getConfigPath(fs, configPathOption)
 
 	if err != nil {
-		return config, nil
+		return config, err
 	}
 	handle, err := fs.Open(configPath)
 

diff --git a/internal/cli/symbol/symbol.go b/internal/cli/symbol/symbol.go
@@ -9,7 +9,7 @@ import (
 	"github.com/go-resty/resty/v2"
 )
 
-type SymbolSourceMap struct { //nolint:golint
+type SymbolSourceMap struct { //nolint:golint,revive
 	TickerSymbol string
 	SourceSymbol string
 	Source       c.QuoteSource

diff --git a/internal/common/common.go b/internal/common/common.go
@@ -71,7 +71,7 @@ type Reference struct {
 // Dependencies represents references to external dependencies
 type Dependencies struct {
 	Fs         afero.Fs
-	HttpClient *resty.Client //nolint:golint,stylecheck
+	HttpClient *resty.Client //nolint:golint,stylecheck,revive
 }
 
 // Lot represents a cost basis lot

diff --git a/internal/currency/currency.go b/internal/currency/currency.go
@@ -5,7 +5,7 @@ import (
 )
 
 // CurrencyRateByUse represents the currency conversion rate for each use case
-type CurrencyRateByUse struct { //nolint:golint
+type CurrencyRateByUse struct { //nolint:golint,revive
 	ToCurrencyCode string
 	QuotePrice     float64
 	PositionCost   float64

diff --git a/internal/print/print.go b/internal/print/print.go
@@ -1,4 +1,4 @@
-package print
+package print //nolint:predeclared
 
 import (
 	"bytes"
@@ -20,13 +20,13 @@ type Options struct {
 }
 
 type jsonRow struct {
-	Name     string  `json:"name"`
-	Symbol   string  `json:"symbol"`
-	Price    float64 `json:"price"`
-	Value    float64 `json:"value"`
-	Cost     float64 `json:"cost"`
-	Quantity float64 `json:"quantity"`
-	Weight   float64 `json:"weight"`
+	Name     string `json:"name"`
+	Symbol   string `json:"symbol"`
+	Price    string `json:"price"`
+	Value    string `json:"value"`
+	Cost     string `json:"cost"`
+	Quantity string `json:"quantity"`
+	Weight   string `json:"weight"`
 }
 
 func convertAssetsToCSV(assets []c.Asset) string {
@@ -65,16 +65,20 @@ func convertAssetsToJSON(assets []c.Asset) string {
 			rows = append(rows, jsonRow{
 				Name:     asset.Name,
 				Symbol:   asset.Symbol,
-				Price:    asset.QuotePrice.Price,
-				Value:    asset.Holding.Value,
-				Cost:     asset.Holding.Cost,
-				Quantity: asset.Holding.Quantity,
-				Weight:   asset.Holding.Weight,
+				Price:    fmt.Sprintf("%f", asset.QuotePrice.Price),
+				Value:    fmt.Sprintf("%f", asset.Holding.Value),
+				Cost:     fmt.Sprintf("%f", asset.Holding.Cost),
+				Quantity: fmt.Sprintf("%f", asset.Holding.Quantity),
+				Weight:   fmt.Sprintf("%f", asset.Holding.Weight),
 			})
 		}
 	}
 
-	out, _ := json.Marshal(rows)
+	out, err := json.Marshal(rows)
+
+	if err != nil {
+		return err.Error()
+	}
 
 	return string(out)
 

diff --git a/internal/quote/coingecko/coingecko.go b/internal/quote/coingecko/coingecko.go
@@ -11,7 +11,7 @@ import (
 type ResponseQuotes []ResponseQuote
 
 type ResponseQuote struct {
-	Id                           string  `json:"id"` //nolint:golint,stylecheck
+	Id                           string  `json:"id"` //nolint:golint,stylecheck,revive
 	Symbol                       string  `json:"symbol"`
 	Name                         string  `json:"name"`
 	Image                        string  `json:"image"`
@@ -94,7 +94,7 @@ func GetAssetQuotes(client resty.Client, symbols []string) []c.AssetQuote {
 		SetResult(ResponseQuotes{}).
 		Get(url)
 
-	out := (res.Result().(*ResponseQuotes))
+	out := (res.Result().(*ResponseQuotes)) //nolint:forcetypeassert
 
 	assetQuotes := transformResponseToAssetQuotes(out)
 

diff --git a/internal/quote/yahoo/currency.go b/internal/quote/yahoo/currency.go
@@ -50,7 +50,7 @@ func getCurrencyRatesFromCurrencyPairSymbols(client resty.Client, currencyPairSy
 		return c.CurrencyRates{}, err
 	}
 
-	return transformResponseCurrencies((res.Result().(*Response)).QuoteResponse.Quotes), nil
+	return transformResponseCurrencies((res.Result().(*Response)).QuoteResponse.Quotes), nil //nolint:forcetypeassert
 }
 
 func transformResponseCurrencyPairs(responseQuotes []ResponseQuote, targetCurrency string) []string {
@@ -84,7 +84,7 @@ func getCurrencyPairSymbols(client resty.Client, symbols []string, targetCurrenc
 		return []string{}, err
 	}
 
-	return transformResponseCurrencyPairs((res.Result().(*Response)).QuoteResponse.Quotes, targetCurrency), nil
+	return transformResponseCurrencyPairs((res.Result().(*Response)).QuoteResponse.Quotes, targetCurrency), nil //nolint:forcetypeassert
 }
 
 // GetCurrencyRates retrieves the currency rates to convert from each currency for the given symbols to the target currency

diff --git a/internal/quote/yahoo/quote.go b/internal/quote/yahoo/quote.go
@@ -167,6 +167,6 @@ func GetAssetQuotes(client resty.Client, symbols []string) func() []c.AssetQuote
 			SetResult(Response{}).
 			Get(url)
 
-		return transformResponseQuotes((res.Result().(*Response)).QuoteResponse.Quotes)
+		return transformResponseQuotes((res.Result().(*Response)).QuoteResponse.Quotes) //nolint:forcetypeassert
 	}
 }
diff --git a/internal/ui/ui.go b/internal/ui/ui.go
@@ -99,7 +99,7 @@ type quoteMsg struct {
 }
 
 // Update hook for bubbletea
-func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { //nolint:ireturn,cyclop
 
 	switch msg := msg.(type) {
 

diff --git a/internal/ui/util/style.go b/internal/ui/util/style.go
@@ -30,7 +30,7 @@ func NewStyle(fg string, bg string, bold bool) func(string) string {
 	return s.Styled
 }
 
-func stylePrice(percent float64, text string) string {
+func stylePrice(percent float64, text string) string { //nolint:cyclop
 
 	out := te.String(text)
 

diff --git a/test/http/http.go b/test/http/http.go
@@ -34,8 +34,8 @@ func MockResponse(responseParameters ResponseParameters) {
 	t, _ := template.New("response").Parse(responseTemplate)
 	//nolint:errcheck
 	t.Execute(&responseBytes, responseParameters)
-	responseURL := "https://query1.finance.yahoo.com/v7/finance/quote?lang=en-US&region=US&corsDomain=finance.yahoo.com&fields=regularMarketPrice,currency&symbols=" + responseParameters.Symbol //nolint:golint,stylecheck
-	httpmock.RegisterResponder("GET", responseURL, func(req *http.Request) (*http.Response, error) {
+	responseUrl := "https://query1.finance.yahoo.com/v7/finance/quote?lang=en-US&region=US&corsDomain=finance.yahoo.com&fields=regularMarketPrice,currency&symbols=" + responseParameters.Symbol //nolint:golint,stylecheck,revive
+	httpmock.RegisterResponder("GET", responseUrl, func(req *http.Request) (*http.Response, error) {
 		resp := httpmock.NewStringResponse(200, responseBytes.String())
 		resp.Header.Set("Content-Type", "application/json")
 
@@ -57,8 +57,8 @@ func MockResponseCurrency() {
 			"error": null
 		}
 	}`
-	responseURL := `https://query1.finance.yahoo.com/v7/finance/quote` //nolint:golint,stylecheck
-	httpmock.RegisterResponder("GET", responseURL, func(req *http.Request) (*http.Response, error) {
+	responseUrl := `https://query1.finance.yahoo.com/v7/finance/quote` //nolint:golint,stylecheck,revive
+	httpmock.RegisterResponder("GET", responseUrl, func(req *http.Request) (*http.Response, error) {
 		resp := httpmock.NewStringResponse(200, response)
 		resp.Header.Set("Content-Type", "application/json")
 
@@ -67,7 +67,7 @@ func MockResponseCurrency() {
 }
 
 func MockResponseCurrencyError() {
-	responseUrl := "https://query1.finance.yahoo.com/v7/finance/quote" //nolint:golint,stylecheck
+	responseUrl := "https://query1.finance.yahoo.com/v7/finance/quote" //nolint:golint,stylecheck,revive
 	httpmock.RegisterResponder("GET", responseUrl, func(req *http.Request) (*http.Response, error) {
 		return &http.Response{}, errors.New("error getting currencies") //nolint:goerr113
 	})
@@ -125,8 +125,8 @@ func MockResponseYahooQuotes() {
 			"error": null
 		}
 	}`
-	responseURL := "https://query1.finance.yahoo.com/v7/finance/quote?lang=en-US&region=US&corsDomain=finance.yahoo.com&symbols=GOOG,RBLX" //nolint:golint,stylecheck
-	httpmock.RegisterResponder("GET", responseURL, func(req *http.Request) (*http.Response, error) {
+	responseUrl := "https://query1.finance.yahoo.com/v7/finance/quote?lang=en-US&region=US&corsDomain=finance.yahoo.com&symbols=GOOG,RBLX" //nolint:golint,stylecheck,revive
+	httpmock.RegisterResponder("GET", responseUrl, func(req *http.Request) (*http.Response, error) {
 		resp := httpmock.NewStringResponse(200, response)
 		resp.Header.Set("Content-Type", "application/json")
 
@@ -145,7 +145,7 @@ func MockTickerSymbols() {
 "USDC.X","usd-coin","cg"
 "XRP.X","ripple","cg"
 `
-	responseUrl := "https://raw.githubusercontent.com/achannarasappa/ticker-static/master/symbols.csv" //nolint:golint,stylecheck
+	responseUrl := "https://raw.githubusercontent.com/achannarasappa/ticker-static/master/symbols.csv" //nolint:golint,stylecheck,revive
 	httpmock.RegisterResponder("GET", responseUrl, func(req *http.Request) (*http.Response, error) {
 		resp := httpmock.NewStringResponse(200, responseFixture)
 		resp.Header.Set("Content-Type", "text/plain; charset=utf-8")
@@ -155,7 +155,7 @@ func MockTickerSymbols() {
 }
 
 func MockTickerSymbolsError() {
-	responseUrl := "https://raw.githubusercontent.com/achannarasappa/ticker-static/master/symbols.csv" //nolint:golint,stylecheck
+	responseUrl := "https://raw.githubusercontent.com/achannarasappa/ticker-static/master/symbols.csv" //nolint:golint,stylecheck,revive
 	httpmock.RegisterResponder("GET", responseUrl, func(req *http.Request) (*http.Response, error) {
 		return &http.Response{}, errors.New("error getting ticker symbols") //nolint:goerr113
 	})