Skip to content

Commit b03b7a4

Browse files
committed
*: move pkg to internal
Follow the golang conventions for internal packages and move them to the internal dir.
1 parent d2e2b29 commit b03b7a4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+77
-77
lines changed

cmd/common.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import (
1919
"os"
2020
"path/filepath"
2121

22-
"github.com/sorintlab/stolon/common"
23-
"github.com/sorintlab/stolon/pkg/store"
24-
"github.com/sorintlab/stolon/pkg/util"
22+
"github.com/sorintlab/stolon/internal/common"
23+
"github.com/sorintlab/stolon/internal/store"
24+
"github.com/sorintlab/stolon/internal/util"
2525
"k8s.io/client-go/kubernetes"
2626

2727
"github.com/mattn/go-isatty"

cmd/keeper/cmd/keeper.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ import (
3232
"time"
3333

3434
"github.com/sorintlab/stolon/cmd"
35-
"github.com/sorintlab/stolon/common"
36-
"github.com/sorintlab/stolon/pkg/cluster"
37-
"github.com/sorintlab/stolon/pkg/flagutil"
38-
slog "github.com/sorintlab/stolon/pkg/log"
39-
"github.com/sorintlab/stolon/pkg/postgresql"
40-
pg "github.com/sorintlab/stolon/pkg/postgresql"
41-
"github.com/sorintlab/stolon/pkg/store"
42-
"github.com/sorintlab/stolon/pkg/util"
35+
"github.com/sorintlab/stolon/internal/cluster"
36+
"github.com/sorintlab/stolon/internal/common"
37+
"github.com/sorintlab/stolon/internal/flagutil"
38+
slog "github.com/sorintlab/stolon/internal/log"
39+
"github.com/sorintlab/stolon/internal/postgresql"
40+
pg "github.com/sorintlab/stolon/internal/postgresql"
41+
"github.com/sorintlab/stolon/internal/store"
42+
"github.com/sorintlab/stolon/internal/util"
4343

4444
"github.com/davecgh/go-spew/spew"
4545
"github.com/prometheus/client_golang/prometheus/promhttp"

cmd/proxy/cmd/proxy.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ import (
2626

2727
"github.com/prometheus/client_golang/prometheus/promhttp"
2828
"github.com/sorintlab/stolon/cmd"
29-
"github.com/sorintlab/stolon/common"
30-
"github.com/sorintlab/stolon/pkg/cluster"
31-
"github.com/sorintlab/stolon/pkg/flagutil"
32-
slog "github.com/sorintlab/stolon/pkg/log"
33-
"github.com/sorintlab/stolon/pkg/store"
34-
"github.com/sorintlab/stolon/pkg/util"
29+
"github.com/sorintlab/stolon/internal/cluster"
30+
"github.com/sorintlab/stolon/internal/common"
31+
"github.com/sorintlab/stolon/internal/flagutil"
32+
slog "github.com/sorintlab/stolon/internal/log"
33+
"github.com/sorintlab/stolon/internal/store"
34+
"github.com/sorintlab/stolon/internal/util"
3535

3636
"github.com/davecgh/go-spew/spew"
3737
"github.com/sorintlab/pollon"

cmd/sentinel/cmd/sentinel.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ import (
3232

3333
"github.com/prometheus/client_golang/prometheus/promhttp"
3434
"github.com/sorintlab/stolon/cmd"
35-
"github.com/sorintlab/stolon/common"
36-
"github.com/sorintlab/stolon/pkg/cluster"
37-
"github.com/sorintlab/stolon/pkg/flagutil"
38-
slog "github.com/sorintlab/stolon/pkg/log"
39-
"github.com/sorintlab/stolon/pkg/postgresql"
40-
"github.com/sorintlab/stolon/pkg/store"
41-
"github.com/sorintlab/stolon/pkg/timer"
42-
"github.com/sorintlab/stolon/pkg/util"
35+
"github.com/sorintlab/stolon/internal/cluster"
36+
"github.com/sorintlab/stolon/internal/common"
37+
"github.com/sorintlab/stolon/internal/flagutil"
38+
slog "github.com/sorintlab/stolon/internal/log"
39+
"github.com/sorintlab/stolon/internal/postgresql"
40+
"github.com/sorintlab/stolon/internal/store"
41+
"github.com/sorintlab/stolon/internal/timer"
42+
"github.com/sorintlab/stolon/internal/util"
4343

4444
"github.com/davecgh/go-spew/spew"
4545
"github.com/mitchellh/copystructure"

cmd/sentinel/cmd/sentinel_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"reflect"
2525

2626
"github.com/davecgh/go-spew/spew"
27-
"github.com/sorintlab/stolon/common"
28-
"github.com/sorintlab/stolon/pkg/cluster"
27+
"github.com/sorintlab/stolon/internal/cluster"
28+
"github.com/sorintlab/stolon/internal/common"
2929
)
3030

3131
var curUID int

cmd/stolonctl/cmd/init.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"os"
2222

2323
cmdcommon "github.com/sorintlab/stolon/cmd"
24-
"github.com/sorintlab/stolon/common"
25-
"github.com/sorintlab/stolon/pkg/cluster"
24+
"github.com/sorintlab/stolon/internal/cluster"
25+
"github.com/sorintlab/stolon/internal/common"
2626
"github.com/spf13/cobra"
2727
)
2828

cmd/stolonctl/cmd/promote.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"os"
2020

2121
cmdcommon "github.com/sorintlab/stolon/cmd"
22-
"github.com/sorintlab/stolon/pkg/cluster"
23-
"github.com/sorintlab/stolon/pkg/store"
22+
"github.com/sorintlab/stolon/internal/cluster"
23+
"github.com/sorintlab/stolon/internal/store"
2424

2525
"github.com/spf13/cobra"
2626
)

cmd/stolonctl/cmd/removekeeper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"context"
1919

2020
cmdcommon "github.com/sorintlab/stolon/cmd"
21-
"github.com/sorintlab/stolon/pkg/cluster"
21+
"github.com/sorintlab/stolon/internal/cluster"
2222
"github.com/spf13/cobra"
2323
)
2424

cmd/stolonctl/cmd/status.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"text/tabwriter"
2323

2424
cmdcommon "github.com/sorintlab/stolon/cmd"
25-
"github.com/sorintlab/stolon/pkg/cluster"
26-
"github.com/sorintlab/stolon/pkg/store"
25+
"github.com/sorintlab/stolon/internal/cluster"
26+
"github.com/sorintlab/stolon/internal/store"
2727

2828
"github.com/spf13/cobra"
2929
)

cmd/stolonctl/cmd/stolonctl.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import (
2222
"strings"
2323

2424
"github.com/sorintlab/stolon/cmd"
25-
"github.com/sorintlab/stolon/pkg/cluster"
26-
"github.com/sorintlab/stolon/pkg/flagutil"
27-
"github.com/sorintlab/stolon/pkg/store"
25+
"github.com/sorintlab/stolon/internal/cluster"
26+
"github.com/sorintlab/stolon/internal/flagutil"
27+
"github.com/sorintlab/stolon/internal/store"
2828

2929
"github.com/spf13/cobra"
3030
)

0 commit comments

Comments
 (0)