Skip to content

Commit

Permalink
refactor: tools-2661 change module path to github.com/aerospike/ascon…
Browse files Browse the repository at this point in the history
…fig (#17)

* refactor: tools-2661 set mod path to github.com/aerospike/asconfig
  • Loading branch information
dwelch-spike authored Sep 20, 2023
1 parent a07f71f commit 46f0a67
Show file tree
Hide file tree
Showing 12 changed files with 62 additions and 234 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ endif
# Builds asconfig binary
.PHONY: asconfig
asconfig: dependencies
$(GO_ENV_VARS) go build -ldflags="-X 'aerospike/asconfig/cmd.VERSION=$(VERSION)'" -o bin/asconfig .
$(GO_ENV_VARS) go build -ldflags="-X 'github.com/aerospike/asconfig/cmd.VERSION=$(VERSION)'" -o bin/asconfig .

# Clean up
.PHONY: clean
Expand Down
2 changes: 1 addition & 1 deletion cmd/convert.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package cmd

import (
"aerospike/asconfig/asconf"
"errors"
"fmt"
"github.com/aerospike/asconfig/asconf"
"os"
"path/filepath"
"strings"
Expand Down
2 changes: 1 addition & 1 deletion cmd/diff.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package cmd

import (
"aerospike/asconfig/asconf"
"fmt"
"github.com/aerospike/asconfig/asconf"
"os"
"reflect"
"sort"
Expand Down
9 changes: 6 additions & 3 deletions cmd/root.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
package cmd

import (
"aerospike/asconfig/asconf"
"aerospike/asconfig/log"
"aerospike/asconfig/schema"
"fmt"
"os"

"github.com/aerospike/asconfig/log"

"github.com/aerospike/asconfig/schema"

"github.com/aerospike/asconfig/asconf"

"github.com/aerospike/aerospike-management-lib/asconfig"
"github.com/bombsimon/logrusr/v4"
"github.com/go-logr/logr"
Expand Down
2 changes: 1 addition & 1 deletion cmd/root_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
package cmd

import (
"aerospike/asconfig/asconf"
"errors"
"github.com/aerospike/asconfig/asconf"
"testing"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/utils.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cmd

import (
"aerospike/asconfig/asconf"
"github.com/aerospike/asconfig/asconf"
"path/filepath"
"strings"

Expand Down
2 changes: 1 addition & 1 deletion cmd/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package cmd

import (
"aerospike/asconfig/asconf"
"github.com/aerospike/asconfig/asconf"
"reflect"
"testing"

Expand Down
35 changes: 17 additions & 18 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
module aerospike/asconfig
module github.com/aerospike/asconfig

go 1.19
go 1.20

require (
github.com/aerospike/aerospike-management-lib v0.0.0-20230822200615-d2c51f8be9c7
github.com/aerospike/aerospike-management-lib v0.0.0-20230829224038-2327527ea1f0
github.com/bombsimon/logrusr/v4 v4.0.0
github.com/docker/docker v23.0.3+incompatible
github.com/go-logr/logr v1.2.3
github.com/docker/docker v24.0.6+incompatible
github.com/go-logr/logr v1.2.4
github.com/opencontainers/image-spec v1.0.2
github.com/sirupsen/logrus v1.9.0
github.com/spf13/cobra v1.6.1
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.7.0
gopkg.in/yaml.v3 v3.0.1
)

require (
github.com/Microsoft/go-winio v0.6.0 // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
Expand All @@ -30,11 +29,11 @@ require (
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
golang.org/x/mod v0.9.0 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.7.0 // indirect
gotest.tools/v3 v3.4.0 // indirect
k8s.io/apimachinery v0.21.2 // indirect
golang.org/x/tools v0.6.0 // indirect
gotest.tools/v3 v3.5.1 // indirect
k8s.io/apimachinery v0.26.2 // indirect
)
234 changes: 30 additions & 204 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"testing"
"time"

"aerospike/asconfig/testutils"
"github.com/aerospike/asconfig/testutils"

"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/mount"
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package main

import "aerospike/asconfig/cmd"
import "github.com/aerospike/asconfig/cmd"

func main() {
cmd.Execute()
Expand Down
2 changes: 1 addition & 1 deletion testutils/main/testgen.go
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package main

import (
"aerospike/asconfig/testutils"
"bufio"
"bytes"
"encoding/json"
"errors"
"flag"
"fmt"
"github.com/aerospike/asconfig/testutils"
"io"
"log"
"os"
Expand Down

0 comments on commit 46f0a67

Please sign in to comment.