Skip to content

Commit

Permalink
tools-2661 include github in module path
Browse files Browse the repository at this point in the history
  • Loading branch information
dwelch-spike committed Sep 18, 2023
1 parent 02d5028 commit e0343e0
Show file tree
Hide file tree
Showing 14 changed files with 64 additions and 212 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/draft-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
# workflows to pull release artifacts from
snyk-test:
uses: aerospike/asconfig/.github/workflows/snyk-test.yml@main
uses: github.com/aerospike/asconfig/.github/workflows/snyk-test.yml@main
secrets: inherit
draft-release-notes:
needs: snyk-test
Expand Down
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ For more information and usage examples see the [Aerospike Configuration Tool do
Build asconfig using the included makefile and display usage information.

```shell
git clone https://github.com/aerospike/asconfig.git
git clone https://github.com/github.com/aerospike/asconfig.git
cd asconfig
make
./bin/asconfig --help
Expand All @@ -23,7 +23,7 @@ The built binary is available at bin/asconfig.
You can also build asconfig using `go build`.

```shell
git clone https://github.com/aerospike/asconfig.git
git clone https://github.com/github.com/aerospike/asconfig.git
cd asconfig
git submodule update --init
go build -o ./bin/asconfig
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
33 changes: 16 additions & 17 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
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
)
Loading

0 comments on commit e0343e0

Please sign in to comment.