fix: security scanner warnings (#1611)

* fix: security scanner warnings * fix: GH actions Signed-off-by: Sandor Szücs <[email protected]>
zalando · Nov 18, 2020 · 79de18d · 79de18d
1 parent e8c4ba7
commit 79de18d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 14 deletions.
diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
@@ -3,14 +3,12 @@ on:
   push:
     branches:
       - master
-env:
-  GO111MODULE: on
 jobs:
   tests:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-go@v2-beta
+    - uses: actions/setup-go@v2
       with:
         go-version: '^1.15'
     - run: go version

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -1,13 +1,11 @@
 name: pr
 on: [pull_request]
-env:
-  GO111MODULE: on
 jobs:
   check-race:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2-beta
+      - uses: actions/setup-go@v2
         with:
           go-version: '^1.15'
       - run: go version
@@ -18,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2-beta
+      - uses: actions/setup-go@v2
         with:
           go-version: '^1.15'
       - run: go version

diff --git a/swarm/nodeinfo.go b/swarm/nodeinfo.go
@@ -32,7 +32,7 @@ func NewStaticNodeInfo(name, addr string) (*NodeInfo, error) {
 		return nil, err
 	}
 	ip := net.ParseIP(ipString)
-	portInt, err := strconv.Atoi(portString)
+	portInt, err := strconv.ParseUint(portString, 10, 16)
 	if err != nil {
 		return nil, fmt.Errorf("invalid port in addr '%s': %v", portString, err)
 	}

diff --git a/tracing/tracers/basic/basic.go b/tracing/tracers/basic/basic.go
@@ -14,7 +14,7 @@ func InitTracer(opts []string) (opentracing.Tracer, error) {
 	fmt.Printf("DO NOT USE IN PRODUCTION\n")
 	var dropAllLogs bool
 	var sampleModulo uint64 = 1
-	var maxLogsPerSpan int64 = 0
+	var maxLogsPerSpan int = 0
 	var recorder basic.SpanRecorder = basic.NewInMemoryRecorder()
 	var err error
 
@@ -37,7 +37,7 @@ func InitTracer(opts []string) (opentracing.Tracer, error) {
 			if len(parts) == 1 {
 				return nil, missingArg(parts[0])
 			}
-			maxLogsPerSpan, err = strconv.ParseInt(parts[1], 10, 64)
+			maxLogsPerSpan, err = strconv.Atoi(parts[1])
 			if err != nil {
 				return nil, invalidArg(parts[0], err)
 			}
@@ -70,7 +70,7 @@ func InitTracer(opts []string) (opentracing.Tracer, error) {
 	return basic.NewWithOptions(basic.Options{
 		DropAllLogs:    dropAllLogs,
 		ShouldSample:   func(traceID uint64) bool { return traceID%sampleModulo == 0 },
-		MaxLogsPerSpan: int(maxLogsPerSpan),
+		MaxLogsPerSpan: maxLogsPerSpan,
 		Recorder:       recorder,
 	}), nil
 }

diff --git a/tracing/tracers/jaeger/jaeger.go b/tracing/tracers/jaeger/jaeger.go
@@ -24,7 +24,7 @@ func parseOptions(opts []string) (*config.Configuration, error) {
 	var samplerType string
 	var samplerURL string
 	var localAgent string
-	var reporterQueue int64
+	var reporterQueue int
 	var reporterInterval time.Duration
 	var globalTags []opentracing.Tag
 
@@ -70,7 +70,7 @@ func parseOptions(opts []string) (*config.Configuration, error) {
 			if len(parts) == 1 {
 				return nil, missingArg(parts[0])
 			}
-			reporterQueue, _ = strconv.ParseInt(parts[1], 10, 64)
+			reporterQueue, _ = strconv.Atoi(parts[1])
 		case "reporter-interval":
 			if len(parts) == 1 {
 				return nil, missingArg(parts[0])
@@ -105,7 +105,7 @@ func parseOptions(opts []string) (*config.Configuration, error) {
 			SamplingServerURL: samplerURL,
 		},
 		Reporter: &config.ReporterConfig{
-			QueueSize:           int(reporterQueue),
+			QueueSize:           reporterQueue,
 			BufferFlushInterval: reporterInterval,
 			LocalAgentHostPort:  localAgent,
 		},