Merge pull request #190 from rebuy-de/update-v7

prepare v7 update
rebuy-de · Feb 8, 2024 · 3456cdd · 3456cdd
2 parents dc44120 + b754493
commit 3456cdd
Show file tree

Hide file tree

Showing 34 changed files with 52 additions and 52 deletions.
diff --git a/cmd/buildutil/chain.go b/cmd/buildutil/chain.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/executil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/executil"
 )
 
 type ChainExecutor struct {

diff --git a/cmd/buildutil/info.go b/cmd/buildutil/info.go
@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/cmdutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/cmdutil"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/mod/modfile"
 	"golang.org/x/tools/go/packages"

diff --git a/cmd/buildutil/instrumentation.go b/cmd/buildutil/instrumentation.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/rebuy-de/rebuy-go-sdk/v6/cmd/buildutil/internal/typeutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/cmd/buildutil/internal/typeutil"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/cmd/buildutil/logutil.go b/cmd/buildutil/logutil.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/cmdutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/cmdutil"
 	"github.com/tidwall/pretty"
 )
 

diff --git a/cmd/buildutil/main.go b/cmd/buildutil/main.go
@@ -6,7 +6,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/cmdutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/cmdutil"
 )
 
 func main() {

diff --git a/cmd/buildutil/runner.go b/cmd/buildutil/runner.go
@@ -24,8 +24,8 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/cmdutil"
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/executil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/cmdutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/executil"
 )
 
 func call(ctx context.Context, command string, args ...string) {
@@ -201,7 +201,7 @@ func (r *Runner) RunBuild(ctx context.Context, cmd *cobra.Command, args []string
 		ldFlags := []string{}
 		for _, entry := range ldData {
 			ldFlags = append(ldFlags, fmt.Sprintf(
-				`-X 'github.com/rebuy-de/rebuy-go-sdk/v6/pkg/cmdutil.%s=%s'`,
+				`-X 'github.com/rebuy-de/rebuy-go-sdk/v7/pkg/cmdutil.%s=%s'`,
 				entry.name, entry.value,
 			))
 		}

diff --git a/cmd/cdnmirror/main.go b/cmd/cdnmirror/main.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/evanw/esbuild/pkg/api"
 	"github.com/pkg/errors"
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/cmdutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/cmdutil"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

diff --git a/examples/full/buildutil b/examples/full/buildutil
@@ -2,4 +2,4 @@
 set -eu
 go mod vendor
 go generate ./...
-exec go run github.com/rebuy-de/rebuy-go-sdk/v6/cmd/buildutil "$@"
+exec go run github.com/rebuy-de/rebuy-go-sdk/v7/cmd/buildutil "$@"
diff --git a/examples/full/cmd/inst.go b/examples/full/cmd/inst.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/instutil"
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/logutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/instutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/logutil"
 )
 
 // inst.go contains all functions for handling instrumentation (ie metrics and

diff --git a/examples/full/cmd/root.go b/examples/full/cmd/root.go
@@ -7,9 +7,9 @@ import (
 	"io/fs"
 	"os"
 
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/cmdutil"
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/podutil"
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/redisutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/cmdutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/podutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/redisutil"
 	"github.com/redis/go-redis/v9"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"

diff --git a/examples/full/cmd/server.go b/examples/full/cmd/server.go
@@ -10,10 +10,10 @@ import (
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
 	"github.com/pkg/errors"
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/cmdutil"
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/logutil"
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/redisutil"
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/webutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/cmdutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/logutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/redisutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/webutil"
 	"github.com/redis/go-redis/v9"
 	"golang.org/x/sync/errgroup"
 )

diff --git a/examples/full/go.mod b/examples/full/go.mod
@@ -1,13 +1,13 @@
-module github.com/rebuy-de/rebuy-go-sdk/v6/examples/full
+module github.com/rebuy-de/rebuy-go-sdk/v7/examples/full
 
 go 1.21
 
-replace github.com/rebuy-de/rebuy-go-sdk/v6 => ../..
+replace github.com/rebuy-de/rebuy-go-sdk/v7 => ../..
 
 require (
 	github.com/go-chi/chi/v5 v5.0.11
 	github.com/pkg/errors v0.9.1
-	github.com/rebuy-de/rebuy-go-sdk/v6 v6.0.0
+	github.com/rebuy-de/rebuy-go-sdk/v7 v7.0.0
 	github.com/redis/go-redis/v9 v9.4.0
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.8.0

diff --git a/examples/full/main.go b/examples/full/main.go
@@ -1,10 +1,10 @@
 package main
 
 import (
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/cmdutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/cmdutil"
 	"github.com/sirupsen/logrus"
 
-	"github.com/rebuy-de/rebuy-go-sdk/v6/examples/full/cmd"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/examples/full/cmd"
 )
 
 func main() {

diff --git a/examples/full/tools.go b/examples/full/tools.go
@@ -5,5 +5,5 @@ package main
 
 // https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module
 import (
-	_ "github.com/rebuy-de/rebuy-go-sdk/v6/cmd/buildutil"
+	_ "github.com/rebuy-de/rebuy-go-sdk/v7/cmd/buildutil"
 )
diff --git a/examples/minimal/buildutil b/examples/minimal/buildutil
@@ -2,4 +2,4 @@
 set -eu
 go mod vendor
 go generate ./...
-exec go run github.com/rebuy-de/rebuy-go-sdk/v6/cmd/buildutil "$@"
+exec go run github.com/rebuy-de/rebuy-go-sdk/v7/cmd/buildutil "$@"
diff --git a/examples/minimal/cmd/root.go b/examples/minimal/cmd/root.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/cmdutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/cmdutil"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

diff --git a/examples/minimal/go.mod b/examples/minimal/go.mod
@@ -1,11 +1,11 @@
-module github.com/rebuy-de/rebuy-go-sdk/v6/examples/minimal
+module github.com/rebuy-de/rebuy-go-sdk/v7/examples/minimal
 
 go 1.21
 
-replace github.com/rebuy-de/rebuy-go-sdk/v6 => ../..
+replace github.com/rebuy-de/rebuy-go-sdk/v7 => ../..
 
 require (
-	github.com/rebuy-de/rebuy-go-sdk/v6 v6.0.0
+	github.com/rebuy-de/rebuy-go-sdk/v7 v7.0.0
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.8.0
 )

diff --git a/examples/minimal/main.go b/examples/minimal/main.go
@@ -1,10 +1,10 @@
 package main
 
 import (
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/cmdutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/cmdutil"
 	"github.com/sirupsen/logrus"
 
-	"github.com/rebuy-de/rebuy-go-sdk/v6/examples/minimal/cmd"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/examples/minimal/cmd"
 )
 
 func main() {

diff --git a/examples/minimal/tools.go b/examples/minimal/tools.go
@@ -5,5 +5,5 @@ package main
 
 // https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module
 import (
-	_ "github.com/rebuy-de/rebuy-go-sdk/v6/cmd/buildutil"
+	_ "github.com/rebuy-de/rebuy-go-sdk/v7/cmd/buildutil"
 )
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/rebuy-de/rebuy-go-sdk/v6
+module github.com/rebuy-de/rebuy-go-sdk/v7
 
 go 1.21
 

diff --git a/pkg/instutil/instutil.go b/pkg/instutil/instutil.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/cmdutil"
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/logutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/cmdutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/logutil"
 )
 
 type contextKeyCounter string

diff --git a/pkg/instutil/toolstack.go b/pkg/instutil/toolstack.go
@@ -2,7 +2,7 @@ package instutil
 
 import (
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/cmdutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/cmdutil"
 )
 
 func init() {

diff --git a/pkg/instutil/transition.go b/pkg/instutil/transition.go
@@ -3,7 +3,7 @@ package instutil
 import (
 	"context"
 
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/logutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/logutil"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/pkg/lokiutil/buf.go b/pkg/lokiutil/buf.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/afiskon/promtail-client/logproto"
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/cmdutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/cmdutil"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
 

diff --git a/pkg/podutil/dev.go b/pkg/podutil/dev.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/cmdutil"
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/logutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/cmdutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/logutil"
 )
 
 func StartDevcontainer(ctx context.Context, conn *Connection, name string, image string, opts ...CreateContainerOption) (*InspectContainerResult, error) {

diff --git a/pkg/testutil/golden_test.go b/pkg/testutil/golden_test.go
@@ -3,7 +3,7 @@ package testutil_test
 import (
 	"testing"
 
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/testutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/testutil"
 )
 
 type exampleData struct {

diff --git a/pkg/vaultutil/aws.go b/pkg/vaultutil/aws.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/pkg/errors"
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/logutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/logutil"
 )
 
 type awsCredentialsProvider struct {

diff --git a/pkg/vaultutil/manager.go b/pkg/vaultutil/manager.go
@@ -7,7 +7,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/hashicorp/vault/api"
 	"github.com/pkg/errors"
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/logutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/logutil"
 )
 
 const (

diff --git a/pkg/vaultutil/params.go b/pkg/vaultutil/params.go
@@ -1,7 +1,7 @@
 package vaultutil
 
 import (
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/cmdutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/cmdutil"
 	"github.com/spf13/cobra"
 )
 

diff --git a/pkg/vaultutil/util.go b/pkg/vaultutil/util.go
@@ -2,7 +2,7 @@ package vaultutil
 
 import (
 	"github.com/hashicorp/vault/api"
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/logutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/logutil"
 )
 
 func prettyPrintSecret(original *api.Secret) string {

diff --git a/pkg/webutil/admin.go b/pkg/webutil/admin.go
@@ -7,7 +7,7 @@ import (
 	"net/http/pprof"
 
 	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/logutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/logutil"
 )
 
 func AdminAPIListenAndServe(ctx context.Context, healthy ...func() error) {

diff --git a/pkg/webutil/auth.go b/pkg/webutil/auth.go
@@ -19,9 +19,9 @@ import (
 
 	"github.com/coreos/go-oidc/v3/oidc"
 	"github.com/go-chi/chi/v5"
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/cmdutil"
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/logutil"
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/typeutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/cmdutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/logutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/typeutil"
 	"github.com/spf13/cobra"
 	"golang.org/x/oauth2"
 )

diff --git a/pkg/webutil/server.go b/pkg/webutil/server.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/logutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/logutil"
 	"golang.org/x/sync/errgroup"
 )
 

diff --git a/pkg/webutil/session.go b/pkg/webutil/session.go
@@ -10,7 +10,7 @@ import (
 	"github.com/gorilla/securecookie"
 	"github.com/gorilla/sessions"
 	"github.com/pkg/errors"
-	"github.com/rebuy-de/rebuy-go-sdk/v6/pkg/cmdutil"
+	"github.com/rebuy-de/rebuy-go-sdk/v7/pkg/cmdutil"
 	"github.com/redis/go-redis/v9"
 	"github.com/sirupsen/logrus"
 )