go fmt

webdevops · Nov 19, 2019 · 9d734bb · 9d734bb
1 parent 9f4b1d0
commit 9d734bb
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 32 deletions.
diff --git a/config.go b/config.go
@@ -23,13 +23,13 @@ type (
 	ConfigProjectCommon struct {
 		Name   string                    `yaml:"name"`
 		Filter ConfigProjectCommonFilter `yaml:"filter"`
-		Mark   []string  `yaml:"mark"`
+		Mark   []string                  `yaml:"mark"`
 
 		Cve ConfigProjectCommonCve `yaml:"cve"`
 	}
 
 	ConfigProjectCommonCve struct {
-		Vendor string
+		Vendor  string
 		Product string
 	}
 

diff --git a/main.go b/main.go
@@ -39,9 +39,9 @@ var opts struct {
 	ScrapeTimeGithub *time.Duration `long:"scrape-time.github"  env:"SCRAPE_TIME_GITHUB"    description:"Scrape time for Github (time.duration)"`
 
 	// github
-	GithubPersonalAccessToken *string `long:"github.personalaccesstoken"  env:"GITHUB_PERSONALACCESSTOKEN" description:"GitHub personal access token"`
-	GithubScrapeWait time.Duration `long:"github.scrape-wait"  env:"GITHUB_SCRAPEWAIT" description:"Wait number between project waits" default:"2s"`
-	GithubPerPage int `long:"github.perpage"  env:"GITHUB_PERPAGE" description:"Number of results fetched from GitHub" default:"50"`
+	GithubPersonalAccessToken *string       `long:"github.personalaccesstoken"  env:"GITHUB_PERSONALACCESSTOKEN" description:"GitHub personal access token"`
+	GithubScrapeWait          time.Duration `long:"github.scrape-wait"  env:"GITHUB_SCRAPEWAIT" description:"Wait number between project waits" default:"2s"`
+	GithubPerPage             int           `long:"github.perpage"  env:"GITHUB_PERPAGE" description:"Number of results fetched from GitHub" default:"50"`
 }
 
 func main() {

diff --git a/metrics_docker.go b/metrics_docker.go
@@ -15,11 +15,11 @@ type (
 	MetricsCollectorDocker struct {
 		CollectorProcessorGeneral
 
-		client map[string]*registry.Registry
+		client    map[string]*registry.Registry
 		cveClient *CveClient
 
 		prometheus struct {
-			release *prometheus.GaugeVec
+			release    *prometheus.GaugeVec
 			releaseCve *prometheus.GaugeVec
 		}
 	}
@@ -123,7 +123,6 @@ func (m *MetricsCollectorDocker) collectProject(ctx context.Context, callback ch
 		}
 	}
 
-
 	if imageTags, err := client.Tags(project.Image); err == nil {
 
 		natsort.Sort(imageTags)
@@ -156,9 +155,9 @@ func (m *MetricsCollectorDocker) collectProject(ctx context.Context, callback ch
 				}
 
 				releaseMetrics.AddTime(prometheus.Labels{
-					"name":  project.Name,
-					"image": project.Image,
-					"tag":   tag,
+					"name":   project.Name,
+					"image":  project.Image,
+					"tag":    tag,
 					"marked": boolToString(project.IsReleaseMarked(tag)),
 				}, createdDate)
 			}

diff --git a/metrics_github.go b/metrics_github.go
@@ -12,11 +12,11 @@ type (
 	MetricsCollectorGithub struct {
 		CollectorProcessorGeneral
 
-		client *github.Client
+		client    *github.Client
 		cveClient *CveClient
 
 		prometheus struct {
-			release *prometheus.GaugeVec
+			release    *prometheus.GaugeVec
 			releaseCve *prometheus.GaugeVec
 		}
 	}
@@ -133,7 +133,7 @@ func (m *MetricsCollectorGithub) collectProject(ctx context.Context, callback ch
 				"name":    project.Name,
 				"project": project.Project,
 				"release": releaseVersion,
-				"marked": boolToString(project.IsReleaseMarked(releaseVersion)),
+				"marked":  boolToString(project.IsReleaseMarked(releaseVersion)),
 			}, release.GetCreatedAt().Time)
 
 			if cveReport != nil {

diff --git a/service-cve.go b/service-cve.go
@@ -10,15 +10,15 @@ import (
 
 type (
 	CveClient struct {
-		restClient     *resty.Client
+		restClient *resty.Client
 	}
 
 	CveResponse struct {
 		response *resty.Response
 
 		conf ConfigProjectCommonCve
 
-		report *CveResponseReport
+		report                 *CveResponseReport
 		vulneratbilityVersions map[string][]CveResponseReportResultShort
 	}
 
@@ -27,47 +27,47 @@ type (
 	}
 
 	CveResponseReportResultShort struct {
-		Id string
+		Id   string
 		Cvss float64
 	}
 
 	CveResponseReportResult struct {
 		Id string
 
-		Modified string
+		Modified  string
 		Published string
 
-		Assigner string
-		Cvss float64
-		CvssTime string `json:"cvss-time"`
+		Assigner   string
+		Cvss       float64
+		CvssTime   string `json:"cvss-time"`
 		CvssVector string `json:"cvss-vector"`
-		Cwe string
+		Cwe        string
 
 		Access struct {
 			Authentication string
-			Complexity string
-			Vector string
+			Complexity     string
+			Vector         string
 		}
 
 		Impact struct {
-			Availability string
+			Availability    string
 			Confidentiality string
-			Integrity string
+			Integrity       string
 		}
 
 		References []string
-		Summary string
+		Summary    string
 
-		VulnerableConfiguration []string `json:"vulnerable_configuration"`
+		VulnerableConfiguration       []string `json:"vulnerable_configuration"`
 		VulnerableConfigurationCpe2_2 []string `json:"vulnerable_configuration_cpe_2_2"`
-		VulnerableProduct []string `json:"vulnerable_product"`
+		VulnerableProduct             []string `json:"vulnerable_product"`
 	}
 )
 
 func NewCveClient() *CveClient {
 	c := &CveClient{}
 	c.restClient = resty.New()
-	c.restClient.SetHeader("User-Agent", "apprelease-exporter/" + Version)
+	c.restClient.SetHeader("User-Agent", "apprelease-exporter/"+Version)
 	c.restClient.SetHostURL("https://cve.circl.lu/")
 	c.restClient.SetHeader("Accept", "application/json")
 
@@ -95,7 +95,7 @@ func (c *CveClient) GetCveReport(conf ConfigProjectCommonCve) (*CveResponse, err
 	return r, nil
 }
 
-func (c *CveResponse) parseResponse(resp *resty.Response) (error) {
+func (c *CveResponse) parseResponse(resp *resty.Response) error {
 	confVendor := strings.ToLower(c.conf.Vendor)
 	confProduct := strings.ToLower(c.conf.Product)
 
@@ -117,7 +117,7 @@ func (c *CveResponse) parseResponse(resp *resty.Response) (error) {
 
 				if lineVendor == confVendor && lineProduct == confProduct {
 					shortReport := CveResponseReportResultShort{
-						Id: report.Id,
+						Id:   report.Id,
 						Cvss: report.Cvss,
 					}