Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 abbreviations/abbreviations.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package abbreviations

import (
"fmt"
"github.com/datacharmer/dbdeployer/common"
"github.com/ProxySQL/dbdeployer/common"
"os"
"regexp"
"strings"
Expand Down
4 changes: 2 additions & 2 deletions abbreviations/abbreviations_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
package abbreviations

import (
"github.com/datacharmer/dbdeployer/common"
"github.com/datacharmer/dbdeployer/compare"
"github.com/ProxySQL/dbdeployer/common"
"github.com/ProxySQL/dbdeployer/compare"
"os"
"testing"
)
Expand Down
8 changes: 4 additions & 4 deletions cmd/admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ package cmd

import (
"fmt"
"github.com/datacharmer/dbdeployer/defaults"
"github.com/ProxySQL/dbdeployer/defaults"
"os"
"path"
"sort"

"github.com/datacharmer/dbdeployer/common"
"github.com/datacharmer/dbdeployer/globals"
"github.com/datacharmer/dbdeployer/sandbox"
"github.com/ProxySQL/dbdeployer/common"
"github.com/ProxySQL/dbdeployer/globals"
"github.com/ProxySQL/dbdeployer/sandbox"
"github.com/pkg/errors"
"github.com/spf13/cobra"
)
Expand Down
6 changes: 3 additions & 3 deletions cmd/admin_default_sandbox.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (

"github.com/spf13/cobra"

"github.com/datacharmer/dbdeployer/common"
"github.com/datacharmer/dbdeployer/defaults"
"github.com/datacharmer/dbdeployer/globals"
"github.com/ProxySQL/dbdeployer/common"
"github.com/ProxySQL/dbdeployer/defaults"
"github.com/ProxySQL/dbdeployer/globals"
)

var defaultsExecutableTemplate = `#!{{.ShellPath}}
Expand Down
4 changes: 2 additions & 2 deletions cmd/cookbook.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"fmt"
"os"

"github.com/datacharmer/dbdeployer/cookbook"
"github.com/datacharmer/dbdeployer/globals"
"github.com/ProxySQL/dbdeployer/cookbook"
"github.com/ProxySQL/dbdeployer/globals"
"github.com/spf13/cobra"
)

Expand Down
8 changes: 4 additions & 4 deletions cmd/data_load.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
"github.com/dustin/go-humanize"
"github.com/spf13/cobra"

"github.com/datacharmer/dbdeployer/common"
"github.com/datacharmer/dbdeployer/data_load"
"github.com/datacharmer/dbdeployer/defaults"
"github.com/datacharmer/dbdeployer/globals"
"github.com/ProxySQL/dbdeployer/common"
"github.com/ProxySQL/dbdeployer/data_load"
"github.com/ProxySQL/dbdeployer/defaults"
"github.com/ProxySQL/dbdeployer/globals"
)

func listArchives(cmd *cobra.Command, args []string) error {
Expand Down
8 changes: 4 additions & 4 deletions cmd/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ import (
"regexp"

"github.com/alexeyco/simpletable"
"github.com/datacharmer/dbdeployer/ops"
"github.com/ProxySQL/dbdeployer/ops"

"github.com/datacharmer/dbdeployer/globals"
"github.com/ProxySQL/dbdeployer/globals"
"github.com/spf13/cobra"

"github.com/datacharmer/dbdeployer/common"
"github.com/datacharmer/dbdeployer/defaults"
"github.com/ProxySQL/dbdeployer/common"
"github.com/ProxySQL/dbdeployer/defaults"
)

func showDefaults(cmd *cobra.Command, args []string) {
Expand Down
10 changes: 5 additions & 5 deletions cmd/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import (
"os"
"path"

"github.com/datacharmer/dbdeployer/common"
"github.com/datacharmer/dbdeployer/concurrent"
"github.com/datacharmer/dbdeployer/defaults"
"github.com/datacharmer/dbdeployer/globals"
"github.com/datacharmer/dbdeployer/sandbox"
"github.com/ProxySQL/dbdeployer/common"
"github.com/ProxySQL/dbdeployer/concurrent"
"github.com/ProxySQL/dbdeployer/defaults"
"github.com/ProxySQL/dbdeployer/globals"
"github.com/ProxySQL/dbdeployer/sandbox"
"github.com/spf13/cobra"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/delete_binaries.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ package cmd
import (
"fmt"

"github.com/datacharmer/dbdeployer/common"
"github.com/datacharmer/dbdeployer/globals"
"github.com/datacharmer/dbdeployer/ops"
"github.com/ProxySQL/dbdeployer/common"
"github.com/ProxySQL/dbdeployer/globals"
"github.com/ProxySQL/dbdeployer/ops"
"github.com/spf13/cobra"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"os"
"path"

"github.com/datacharmer/dbdeployer/common"
"github.com/datacharmer/dbdeployer/defaults"
"github.com/datacharmer/dbdeployer/globals"
"github.com/ProxySQL/dbdeployer/common"
"github.com/ProxySQL/dbdeployer/defaults"
"github.com/ProxySQL/dbdeployer/globals"
"github.com/spf13/cobra"
)

Expand Down
12 changes: 6 additions & 6 deletions cmd/downloads.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ import (
"time"

"github.com/alexeyco/simpletable"
"github.com/datacharmer/dbdeployer/common"
"github.com/datacharmer/dbdeployer/defaults"
"github.com/datacharmer/dbdeployer/downloads"
"github.com/datacharmer/dbdeployer/globals"
"github.com/datacharmer/dbdeployer/ops"
"github.com/datacharmer/dbdeployer/rest"
"github.com/ProxySQL/dbdeployer/common"
"github.com/ProxySQL/dbdeployer/defaults"
"github.com/ProxySQL/dbdeployer/downloads"
"github.com/ProxySQL/dbdeployer/globals"
"github.com/ProxySQL/dbdeployer/ops"
"github.com/ProxySQL/dbdeployer/rest"
"github.com/dustin/go-humanize"
"github.com/spf13/cobra"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/export.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"fmt"
"os"

"github.com/datacharmer/dbdeployer/common"
"github.com/datacharmer/dbdeployer/globals"
"github.com/ProxySQL/dbdeployer/common"
"github.com/ProxySQL/dbdeployer/globals"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"golang.org/x/term"
Expand Down
6 changes: 3 additions & 3 deletions cmd/export_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ package cmd
import (
"encoding/json"
"fmt"
"github.com/datacharmer/dbdeployer/common"
"github.com/datacharmer/dbdeployer/globals"
"github.com/ProxySQL/dbdeployer/common"
"github.com/ProxySQL/dbdeployer/globals"
"testing"

"github.com/datacharmer/dbdeployer/compare"
"github.com/ProxySQL/dbdeployer/compare"
)

func TestExport(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/global.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"regexp"
"strings"

"github.com/datacharmer/dbdeployer/common"
"github.com/datacharmer/dbdeployer/globals"
"github.com/ProxySQL/dbdeployer/common"
"github.com/ProxySQL/dbdeployer/globals"
"github.com/spf13/cobra"
)

Expand Down
10 changes: 5 additions & 5 deletions cmd/import.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ import (

"github.com/spf13/cobra"

"github.com/datacharmer/dbdeployer/common"
"github.com/datacharmer/dbdeployer/defaults"
"github.com/datacharmer/dbdeployer/globals"
"github.com/datacharmer/dbdeployer/importing"
"github.com/datacharmer/dbdeployer/sandbox"
"github.com/ProxySQL/dbdeployer/common"
"github.com/ProxySQL/dbdeployer/defaults"
"github.com/ProxySQL/dbdeployer/globals"
"github.com/ProxySQL/dbdeployer/importing"
"github.com/ProxySQL/dbdeployer/sandbox"
)

func importSingleSandbox(cmd *cobra.Command, args []string) {
Expand Down
8 changes: 4 additions & 4 deletions cmd/info.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (
"github.com/dustin/go-humanize"
"github.com/spf13/cobra"

"github.com/datacharmer/dbdeployer/common"
"github.com/datacharmer/dbdeployer/defaults"
"github.com/datacharmer/dbdeployer/globals"
"github.com/datacharmer/dbdeployer/rest"
"github.com/ProxySQL/dbdeployer/common"
"github.com/ProxySQL/dbdeployer/defaults"
"github.com/ProxySQL/dbdeployer/globals"
"github.com/ProxySQL/dbdeployer/rest"
)

func displayDefaults(cmd *cobra.Command, args []string) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
package cmd

import (
"github.com/datacharmer/dbdeployer/ops"
"github.com/ProxySQL/dbdeployer/ops"
"github.com/spf13/cobra"

"github.com/datacharmer/dbdeployer/globals"
"github.com/ProxySQL/dbdeployer/globals"
)

func initEnvironment(cmd *cobra.Command, args []string) error {
Expand Down
6 changes: 3 additions & 3 deletions cmd/multiple.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
package cmd

import (
"github.com/datacharmer/dbdeployer/common"
"github.com/datacharmer/dbdeployer/globals"
"github.com/datacharmer/dbdeployer/sandbox"
"github.com/ProxySQL/dbdeployer/common"
"github.com/ProxySQL/dbdeployer/globals"
"github.com/ProxySQL/dbdeployer/sandbox"
"github.com/spf13/cobra"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/remote.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (

"github.com/spf13/cobra"

"github.com/datacharmer/dbdeployer/common"
"github.com/datacharmer/dbdeployer/globals"
"github.com/datacharmer/dbdeployer/rest"
"github.com/ProxySQL/dbdeployer/common"
"github.com/ProxySQL/dbdeployer/globals"
"github.com/ProxySQL/dbdeployer/rest"
)

func listRemoteFiles(cmd *cobra.Command, args []string) {
Expand Down
6 changes: 3 additions & 3 deletions cmd/replication.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
package cmd

import (
"github.com/datacharmer/dbdeployer/common"
"github.com/datacharmer/dbdeployer/globals"
"github.com/datacharmer/dbdeployer/sandbox"
"github.com/ProxySQL/dbdeployer/common"
"github.com/ProxySQL/dbdeployer/globals"
"github.com/ProxySQL/dbdeployer/sandbox"
"github.com/spf13/cobra"
)

Expand Down
10 changes: 5 additions & 5 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"

"github.com/datacharmer/dbdeployer/common"
"github.com/datacharmer/dbdeployer/defaults"
"github.com/datacharmer/dbdeployer/downloads"
"github.com/datacharmer/dbdeployer/globals"
"github.com/datacharmer/dbdeployer/sandbox"
"github.com/ProxySQL/dbdeployer/common"
"github.com/ProxySQL/dbdeployer/defaults"
"github.com/ProxySQL/dbdeployer/downloads"
"github.com/ProxySQL/dbdeployer/globals"
"github.com/ProxySQL/dbdeployer/sandbox"
)

// rootCmd represents the base command when called without any subcommands
Expand Down
6 changes: 3 additions & 3 deletions cmd/sandboxes.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
"github.com/araddon/dateparse"
"github.com/spf13/cobra"

"github.com/datacharmer/dbdeployer/common"
"github.com/datacharmer/dbdeployer/defaults"
"github.com/datacharmer/dbdeployer/globals"
"github.com/ProxySQL/dbdeployer/common"
"github.com/ProxySQL/dbdeployer/defaults"
"github.com/ProxySQL/dbdeployer/globals"
)

func showSandboxesFromCatalog(currentSandboxHome string, useFlavor, useHeader, useTable bool) {
Expand Down
8 changes: 4 additions & 4 deletions cmd/single.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"regexp"
"strings"

"github.com/datacharmer/dbdeployer/common"
"github.com/datacharmer/dbdeployer/defaults"
"github.com/datacharmer/dbdeployer/globals"
"github.com/datacharmer/dbdeployer/sandbox"
"github.com/ProxySQL/dbdeployer/common"
"github.com/ProxySQL/dbdeployer/defaults"
"github.com/ProxySQL/dbdeployer/globals"
"github.com/ProxySQL/dbdeployer/sandbox"
"github.com/pkg/errors"
"github.com/spf13/cobra"
)
Expand Down
8 changes: 4 additions & 4 deletions cmd/templates.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
"path"
"strings"

"github.com/datacharmer/dbdeployer/common"
"github.com/datacharmer/dbdeployer/defaults"
"github.com/datacharmer/dbdeployer/globals"
"github.com/datacharmer/dbdeployer/sandbox"
"github.com/ProxySQL/dbdeployer/common"
"github.com/ProxySQL/dbdeployer/defaults"
"github.com/ProxySQL/dbdeployer/globals"
"github.com/ProxySQL/dbdeployer/sandbox"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/tree.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/cobra/doc"

"github.com/datacharmer/dbdeployer/common"
"github.com/datacharmer/dbdeployer/globals"
"github.com/ProxySQL/dbdeployer/common"
"github.com/ProxySQL/dbdeployer/globals"
)

func writeApi(showHidden bool) {
Expand Down
6 changes: 3 additions & 3 deletions cmd/unpack.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ package cmd
import (
"fmt"

"github.com/datacharmer/dbdeployer/ops"
"github.com/ProxySQL/dbdeployer/ops"
"github.com/spf13/cobra"

"github.com/datacharmer/dbdeployer/common"
"github.com/datacharmer/dbdeployer/globals"
"github.com/ProxySQL/dbdeployer/common"
"github.com/ProxySQL/dbdeployer/globals"
)

func unpackTarball(cmd *cobra.Command, args []string) {
Expand Down
8 changes: 4 additions & 4 deletions cmd/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ import (
"github.com/dustin/go-humanize"
"github.com/spf13/cobra"

"github.com/datacharmer/dbdeployer/common"
"github.com/datacharmer/dbdeployer/globals"
"github.com/datacharmer/dbdeployer/rest"
"github.com/datacharmer/dbdeployer/unpack"
"github.com/ProxySQL/dbdeployer/common"
"github.com/ProxySQL/dbdeployer/globals"
"github.com/ProxySQL/dbdeployer/rest"
"github.com/ProxySQL/dbdeployer/unpack"
)

func updateDbDeployer(cmd *cobra.Command, args []string) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/use.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"github.com/dustin/go-humanize"
"github.com/spf13/cobra"

"github.com/datacharmer/dbdeployer/common"
"github.com/datacharmer/dbdeployer/globals"
"github.com/ProxySQL/dbdeployer/common"
"github.com/ProxySQL/dbdeployer/globals"
)

func runInteractiveCmd(s string) error {
Expand Down
Loading
Loading