squash pkg golang errors

hypertrace · Jul 24, 2023 · 42efe3d · 42efe3d
1 parent 51f5585
commit 42efe3d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/examples/postgres-query/main.go b/examples/postgres-query/main.go
@@ -7,7 +7,10 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/hypertrace/goagent/instrumentation/hypertrace/github.com/jackc/hyperpgx"
+	// gosec complains about this pkg not following golang repo standards
+	// "could not import github.com/hypertrace/goagent/instrumentation/hypertrace/github.com/jackc/hyperpgx (invalid package name: "")"
+	// It is caused the pkg having its own go.mod
+	"github.com/hypertrace/goagent/instrumentation/hypertrace/github.com/jackc/hyperpgx" // #nosec
 )
 
 func main() {

diff --git a/examples/sql-query/main.go b/examples/sql-query/main.go
@@ -10,7 +10,9 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/go-sql-driver/mysql"
+	// gosec complains about github.com/go-sql-driver/mysql not following golang repo standards
+	// "could not import github.com/go-sql-driver/mysql (invalid package name: "")"
+	"github.com/go-sql-driver/mysql" // #nosec
 	"github.com/gorilla/mux"
 	"github.com/hypertrace/goagent/config"
 	"github.com/hypertrace/goagent/instrumentation/hypertrace"

diff --git a/instrumentation/opencensus/init.go b/instrumentation/opencensus/init.go
@@ -21,8 +21,10 @@ func Init(cfg *config.AgentConfig) func() {
 
 	client := &http.Client{Transport: &http.Transport{
 		TLSClientConfig: &tls.Config{
-			MinVersion:         tls.VersionTLS12,
-			InsecureSkipVerify: !cfg.GetReporting().GetSecure().GetValue(), // #nosec
+			MinVersion: tls.VersionTLS12,
+			// Ignore gosec: G402 (CWE-295): TLS InsecureSkipVerify may be true.
+			// #nosec G402
+			InsecureSkipVerify: !cfg.GetReporting().GetSecure().GetValue(),
 		},
 	}}