Upgrade packages (#220)

* upgrade go v1.23

Signed-off-by: Mike Mason <[email protected]>

* upgrade otel

Signed-off-by: Mike Mason <[email protected]>

* upgraded nats

Signed-off-by: Mike Mason <[email protected]>

* upgrade spf13/cobra,viper,pflag

Signed-off-by: Mike Mason <[email protected]>

* upgrade gin-contrib packages cors,zap

Signed-off-by: Mike Mason <[email protected]>

* upgrade governor-api to v0.2.4

Signed-off-by: Mike Mason <[email protected]>

* upgrade prometheus client

Signed-off-by: Mike Mason <[email protected]>

---------

Signed-off-by: Mike Mason <[email protected]>

.buildkite/pipeline.yml

@@ -8,22 +8,22 @@ steps:
     key: "lint"
     plugins:
       - docker#v5.9.0:
-          image: "registry.hub.docker.com/golangci/golangci-lint:v1.51-alpine"
+          image: "registry.hub.docker.com/golangci/golangci-lint:v1.62-alpine"
           command: ["golangci-lint", "run", "-v"]
 
   - label: ":test_tube: test"
     key: "test"
     plugins:
       - docker#v5.9.0:
-          image: "golang:1.20"
+          image: "golang:1.23"
           command: ["go", "test", "-cover" ,"-race", "./..."]
 
   - label: ":golang: build"
     key: "gobuild"
     artifact_paths: "bin/${APP_NAME}"
     plugins:
       - docker#v5.9.0:
-          image: "golang:1.20"
+          image: "golang:1.23"
           environment:
             - CGO_ENABLED=0
             - GOOS=linux

.golangci.yml

@@ -19,11 +19,11 @@ linters:
     - bodyclose
     - gocritic
     - gocyclo
-    - goerr113
+    - err113
     - gofmt
     - gofumpt
     - goimports
-    - gomnd
+    - mnd
     - govet
     - misspell
     - noctx

cmd/serve.go

@@ -2,11 +2,10 @@ package cmd
 
 import (
 	"context"
-	"fmt"
+	"errors"
 	"net/url"
 	"os"
 	"os/signal"
-	"strings"
 	"time"
 
 	"github.com/metal-toolbox/addonx/natslock"
@@ -32,7 +31,7 @@ const (
 var serveCmd = &cobra.Command{
 	Use:   "serve",
 	Short: "starts the gov-okta-addon service",
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(cmd *cobra.Command, _ []string) error {
 		return serve(cmd.Context(), viper.GetViper())
 	},
 }
@@ -278,43 +277,39 @@ func newNATSLocker(nc *nats.Conn) (*natslock.Locker, error) {
 
 // validateMandatoryFlags collects the mandatory flag validation
 func validateMandatoryFlags() error {
-	errs := []string{}
+	errs := []error{}
 
 	if viper.GetString("nats.url") == "" {
-		errs = append(errs, ErrNATSURLRequired.Error())
+		errs = append(errs, ErrNATSURLRequired)
 	}
 
 	if viper.GetString("okta.url") == "" {
-		errs = append(errs, ErrOktaURLRequired.Error())
+		errs = append(errs, ErrOktaURLRequired)
 	}
 
 	if viper.GetString("okta.token") == "" {
-		errs = append(errs, ErrOktaTokenRequired.Error())
+		errs = append(errs, ErrOktaTokenRequired)
 	}
 
 	if viper.GetString("governor.url") == "" {
-		errs = append(errs, ErrGovernorURLRequired.Error())
+		errs = append(errs, ErrGovernorURLRequired)
 	}
 
 	if viper.GetString("governor.client-id") == "" {
-		errs = append(errs, ErrGovernorClientIDRequired.Error())
+		errs = append(errs, ErrGovernorClientIDRequired)
 	}
 
 	if viper.GetString("governor.client-secret") == "" {
-		errs = append(errs, ErrGovernorClientSecretRequired.Error())
+		errs = append(errs, ErrGovernorClientSecretRequired)
 	}
 
 	if viper.GetString("governor.token-url") == "" {
-		errs = append(errs, ErrGovernorClientTokenURLRequired.Error())
+		errs = append(errs, ErrGovernorClientTokenURLRequired)
 	}
 
 	if viper.GetString("governor.audience") == "" {
-		errs = append(errs, ErrGovernorClientAudienceRequired.Error())
+		errs = append(errs, ErrGovernorClientAudienceRequired)
 	}
 
-	if len(errs) == 0 {
-		return nil
-	}
-
-	return fmt.Errorf(strings.Join(errs, "\n")) //nolint:goerr113
+	return errors.Join(errs...)
 }

cmd/sync_groups.go

@@ -26,7 +26,7 @@ var syncGroupsCmd = &cobra.Command{
 Groups that exist in Okta but not in Governor, will be created. Groups that exist in Governor but not in Okta, will be deleted.
 This command is intended for doing an initial load of groups. It is strongly recommended that you use the dry-run flag first 
 to see what groups would be created/deleted in Governor.`,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(cmd *cobra.Command, _ []string) error {
 		return syncGroupsToGovernor(cmd.Context())
 	},
 }

cmd/sync_members.go

@@ -35,7 +35,7 @@ group members that do not exist in the Okta group will be removed from the group
 must exist in Governor. It is strongly recommended that you use the dry-run flag first to see what
 group memberships would be created/deleted in Governor.
 `,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(cmd *cobra.Command, _ []string) error {
 		return syncGroupMembersToGovernor(cmd.Context())
 	},
 }

cmd/sync_users.go

@@ -24,7 +24,7 @@ var syncUsersCmd = &cobra.Command{
 Users that exist in Okta but not in Governor, will be created. Users that exist in Governor but not in Okta, will be deleted.
 This command is intended for doing an initial load of users. It is strongly recommended that you use the dry-run flag first 
 to see what users would be created/deleted in Governor.`,
-	RunE: func(cmd *cobra.Command, args []string) error {
+	RunE: func(cmd *cobra.Command, _ []string) error {
 		return syncUsersToGovernor(cmd.Context())
 	},
 }

cmd/tracing.go

@@ -1,30 +1,53 @@
 package cmd
 
 import (
+	"context"
+	"net/url"
+	"time"
+
 	"github.com/spf13/viper"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
-	"go.opentelemetry.io/otel/exporters/jaeger"
+	"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
+	"go.opentelemetry.io/otel/propagation"
 	"go.opentelemetry.io/otel/sdk/resource"
 	tracesdk "go.opentelemetry.io/otel/sdk/trace"
 	semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
 )
 
+const timeout = 10 * time.Second
+
 func initTracing() {
 	if viper.GetBool("tracing.enabled") {
-		initTracer(viper.GetString("tracing.endpoint"))
+		initTracer(
+			viper.GetString("tracing.endpoint"),
+			viper.GetBool("tracing.insecure"),
+		)
 	}
 }
 
 // initTracer returns an OpenTelemetry TracerProvider configured to use
-// the Jaeger exporter that will send spans to the provided url. The returned
+// the OTLP GRPC exporter that will send spans to the provided endpoint. The returned
 // TracerProvider will also use a Resource configured with all the information
 // about the application.
-func initTracer(url string) *tracesdk.TracerProvider {
-	// Create the Jaeger exporter
-	exp, err := jaeger.New(jaeger.WithCollectorEndpoint(jaeger.WithEndpoint(url)))
+func initTracer(endpoint string, insecure bool) *tracesdk.TracerProvider {
+	_, err := url.Parse(endpoint)
+	if err != nil {
+		logger.Fatalw("invalid tracing endpoint", "error", err)
+	}
+
+	exporterOpts := []otlptracegrpc.Option{
+		otlptracegrpc.WithEndpoint(endpoint),
+		otlptracegrpc.WithTimeout(timeout),
+	}
+
+	if insecure {
+		exporterOpts = append(exporterOpts, otlptracegrpc.WithInsecure())
+	}
+
+	exp, err := otlptracegrpc.New(context.Background(), exporterOpts...)
 	if err != nil {
-		logger.Fatalw("failed to initialize tracing exporter", "error", err)
+		logger.Fatalf("failed to initialize tracing", "error", err)
 	}
 
 	tp := tracesdk.NewTracerProvider(
@@ -39,6 +62,7 @@ func initTracer(url string) *tracesdk.TracerProvider {
 	)
 
 	otel.SetTracerProvider(tp)
+	otel.SetTextMapPropagator(propagation.NewCompositeTextMapPropagator(propagation.TraceContext{}, propagation.Baggage{}))
 
 	return tp
 }