Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

prepare v7 update #190

Merged
merged 1 commit into from
Feb 8, 2024
Merged

prepare v7 update #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/buildutil/chain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion cmd/buildutil/info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/buildutil/instrumentation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/buildutil/logutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/buildutil/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions cmd/buildutil/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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,
))
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/cdnmirror/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion examples/full/buildutil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "$@"
4 changes: 2 additions & 2 deletions examples/full/cmd/inst.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions examples/full/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions examples/full/cmd/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
6 changes: 3 additions & 3 deletions examples/full/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions examples/full/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion examples/full/tools.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
2 changes: 1 addition & 1 deletion examples/minimal/buildutil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "$@"
2 changes: 1 addition & 1 deletion examples/minimal/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
6 changes: 3 additions & 3 deletions examples/minimal/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
)
Expand Down
4 changes: 2 additions & 2 deletions examples/minimal/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion examples/minimal/tools.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions pkg/instutil/instutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/instutil/toolstack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/instutil/transition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/lokiutil/buf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/podutil/dev.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/testutil/golden_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/vaultutil/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/vaultutil/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion pkg/vaultutil/params.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/vaultutil/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/webutil/admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/webutil/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/webutil/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/webutil/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
Loading