Skip to content

Commit 3136ffa

Browse files
scriptonisthasura-bot
scriptonist
authored and
hasura-bot
committed
cli: update go.mod
> ### Description Update `go.mod` to allow other packages to import [v2.0.0 versions](https://blog.golang.org/v2-go-modules). ### Changelog - [x] `CHANGELOG.md` is updated with user-facing content relevant to this PR. If no changelog is required, then add the `no-changelog-required` label. ### Affected components - [x] CLI hasura/graphql-engine-mono#1584 GitOrigin-RevId: a5d17ad
1 parent 0907076 commit 3136ffa

File tree

163 files changed

+426
-426
lines changed

Some content is hidden

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

163 files changed

+426
-426
lines changed

Diff for: ‎cli/Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ build:
2727
ifndef HAS_GOX
2828
cd ~ && go get github.com/mitchellh/gox && cd -
2929
endif
30-
gox -ldflags '-X github.com/hasura/graphql-engine/cli/version.BuildVersion=$(VERSION) -X github.com/hasura/graphql-engine/cli/plugins.IndexBranchRef=$(PLUGINS_BRANCH) -s -w -extldflags "-static"' \
30+
gox -ldflags '-X github.com/hasura/graphql-engine/cli/v2/version.BuildVersion=$(VERSION) -X github.com/hasura/graphql-engine/cli/v2/plugins.IndexBranchRef=$(PLUGINS_BRANCH) -s -w -extldflags "-static"' \
3131
-rebuild \
3232
-os="$(OS)" \
3333
-arch="amd64" \
@@ -61,13 +61,13 @@ copy-cli-ext: clean-cli-ext
6161
.PHONY: test
6262
test: copy-cli-ext
6363
if [ -z "${HASURA_TEST_CLI_HGE_DOCKER_IMAGE}" ]; then echo "Please set HASURA_TEST_CLI_HGE_DOCKER_IMAGE env for populating testutil.HasuraDockerImage and run test"; exit 1; fi
64-
go test -ldflags "-X github.com/hasura/graphql-engine/cli/version.BuildVersion=$(VERSION)" -v -tags="${TEST_TAGS}" `go list ./... | grep -v integration_test | grep -v commands`
64+
go test -ldflags "-X github.com/hasura/graphql-engine/cli/v2/version.BuildVersion=$(VERSION)" -v -tags="${TEST_TAGS}" `go list ./... | grep -v integration_test | grep -v commands`
6565
integration_tests_config_v3: copy-cli-ext
6666
if [ -z "${HASURA_TEST_CLI_HGE_DOCKER_IMAGE}" ]; then echo "Please set HASURA_TEST_CLI_HGE_DOCKER_IMAGE env for populating testutil.HasuraDockerImage and run test"; exit 1; fi
67-
go test -ldflags "-X github.com/hasura/graphql-engine/cli/version.BuildVersion=$(VERSION)" -v -tags="${TEST_TAGS}" -run Commands/config=v3 ./integration_test
67+
go test -ldflags "-X github.com/hasura/graphql-engine/cli/v2/version.BuildVersion=$(VERSION)" -v -tags="${TEST_TAGS}" -run Commands/config=v3 ./integration_test
6868
integration_tests_config_v2: copy-cli-ext
6969
if [ -z "${HASURA_TEST_CLI_HGE_DOCKER_IMAGE}" ]; then echo "Please set HASURA_TEST_CLI_HGE_DOCKER_IMAGE env for populating testutil.HasuraDockerImage and run test"; exit 1; fi
70-
go test -ldflags "-X github.com/hasura/graphql-engine/cli/version.BuildVersion=$(VERSION)" -v -tags="${TEST_TAGS}" -run Commands/config=v2 ./integration_test
70+
go test -ldflags "-X github.com/hasura/graphql-engine/cli/v2/version.BuildVersion=$(VERSION)" -v -tags="${TEST_TAGS}" -run Commands/config=v2 ./integration_test
7171
test-e2e:
7272
ifndef HAS_GINKGO
7373
cd ~ && go get github.com/onsi/ginkgo/ginkgo && cd -

Diff for: ‎cli/cli.go

+17-17
Original file line numberDiff line numberDiff line change
@@ -23,34 +23,34 @@ import (
2323
"strings"
2424
"time"
2525

26-
"github.com/hasura/graphql-engine/cli/internal/hasura/pgdump"
27-
"github.com/hasura/graphql-engine/cli/internal/hasura/v1graphql"
28-
"github.com/hasura/graphql-engine/cli/migrate/database/hasuradb"
26+
"github.com/hasura/graphql-engine/cli/v2/internal/hasura/pgdump"
27+
"github.com/hasura/graphql-engine/cli/v2/internal/hasura/v1graphql"
28+
"github.com/hasura/graphql-engine/cli/v2/migrate/database/hasuradb"
2929

30-
"github.com/hasura/graphql-engine/cli/internal/hasura/v1metadata"
31-
"github.com/hasura/graphql-engine/cli/internal/hasura/v1query"
32-
"github.com/hasura/graphql-engine/cli/internal/hasura/v2query"
30+
"github.com/hasura/graphql-engine/cli/v2/internal/hasura/v1metadata"
31+
"github.com/hasura/graphql-engine/cli/v2/internal/hasura/v1query"
32+
"github.com/hasura/graphql-engine/cli/v2/internal/hasura/v2query"
3333

34-
"github.com/hasura/graphql-engine/cli/internal/hasura/commonmetadata"
34+
"github.com/hasura/graphql-engine/cli/v2/internal/hasura/commonmetadata"
3535

36-
"github.com/hasura/graphql-engine/cli/internal/httpc"
36+
"github.com/hasura/graphql-engine/cli/v2/internal/httpc"
3737

38-
"github.com/hasura/graphql-engine/cli/internal/statestore/settings"
38+
"github.com/hasura/graphql-engine/cli/v2/internal/statestore/settings"
3939

40-
"github.com/hasura/graphql-engine/cli/internal/statestore/migrations"
40+
"github.com/hasura/graphql-engine/cli/v2/internal/statestore/migrations"
4141

42-
"github.com/hasura/graphql-engine/cli/internal/statestore"
42+
"github.com/hasura/graphql-engine/cli/v2/internal/statestore"
4343

44-
"github.com/hasura/graphql-engine/cli/internal/hasura"
44+
"github.com/hasura/graphql-engine/cli/v2/internal/hasura"
4545

4646
"github.com/Masterminds/semver"
4747
"github.com/briandowns/spinner"
4848
"github.com/gofrs/uuid"
49-
"github.com/hasura/graphql-engine/cli/internal/metadataobject/actions/types"
50-
"github.com/hasura/graphql-engine/cli/plugins"
51-
"github.com/hasura/graphql-engine/cli/telemetry"
52-
"github.com/hasura/graphql-engine/cli/util"
53-
"github.com/hasura/graphql-engine/cli/version"
49+
"github.com/hasura/graphql-engine/cli/v2/internal/metadataobject/actions/types"
50+
"github.com/hasura/graphql-engine/cli/v2/plugins"
51+
"github.com/hasura/graphql-engine/cli/v2/telemetry"
52+
"github.com/hasura/graphql-engine/cli/v2/util"
53+
"github.com/hasura/graphql-engine/cli/v2/version"
5454
"github.com/pkg/errors"
5555
"github.com/sirupsen/logrus"
5656
"github.com/spf13/viper"

Diff for: ‎cli/cmd/hasura/hasura.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
package main
33

44
import (
5-
"github.com/hasura/graphql-engine/cli/commands"
5+
"github.com/hasura/graphql-engine/cli/v2/commands"
66
log "github.com/sirupsen/logrus"
77
)
88

Diff for: ‎cli/commands/actions.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"io/ioutil"
77
"path/filepath"
88

9-
"github.com/hasura/graphql-engine/cli"
10-
"github.com/hasura/graphql-engine/cli/util"
9+
"github.com/hasura/graphql-engine/cli/v2"
10+
"github.com/hasura/graphql-engine/cli/v2/util"
1111
"github.com/spf13/cobra"
1212
"github.com/spf13/viper"
1313
)

Diff for: ‎cli/commands/actions_codegen.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"fmt"
55
"strings"
66

7-
"github.com/hasura/graphql-engine/cli"
8-
"github.com/hasura/graphql-engine/cli/internal/metadataobject/actions"
9-
"github.com/hasura/graphql-engine/cli/internal/metadataobject/actions/types"
7+
"github.com/hasura/graphql-engine/cli/v2"
8+
"github.com/hasura/graphql-engine/cli/v2/internal/metadataobject/actions"
9+
"github.com/hasura/graphql-engine/cli/v2/internal/metadataobject/actions/types"
1010
"github.com/pkg/errors"
1111
"github.com/spf13/cobra"
1212
)

Diff for: ‎cli/commands/actions_codegen_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"os"
66
"path/filepath"
77

8-
"github.com/hasura/graphql-engine/cli/internal/testutil"
8+
"github.com/hasura/graphql-engine/cli/v2/internal/testutil"
99
. "github.com/onsi/ginkgo"
1010
. "github.com/onsi/gomega"
1111
. "github.com/onsi/gomega/gexec"

Diff for: ‎cli/commands/actions_create.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import (
44
"fmt"
55
"strings"
66

7-
"github.com/hasura/graphql-engine/cli/internal/hasura"
7+
"github.com/hasura/graphql-engine/cli/v2/internal/hasura"
88

9-
"github.com/hasura/graphql-engine/cli"
10-
"github.com/hasura/graphql-engine/cli/internal/metadataobject/actions"
11-
"github.com/hasura/graphql-engine/cli/internal/metadataobject/actions/types"
12-
"github.com/hasura/graphql-engine/cli/util"
9+
"github.com/hasura/graphql-engine/cli/v2"
10+
"github.com/hasura/graphql-engine/cli/v2/internal/metadataobject/actions"
11+
"github.com/hasura/graphql-engine/cli/v2/internal/metadataobject/actions/types"
12+
"github.com/hasura/graphql-engine/cli/v2/util"
1313
"github.com/pkg/errors"
1414
"github.com/spf13/cobra"
1515
"github.com/spf13/viper"

Diff for: ‎cli/commands/actions_use_codegen.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"sort"
77
"strconv"
88

9-
"github.com/hasura/graphql-engine/cli"
10-
"github.com/hasura/graphql-engine/cli/util"
9+
"github.com/hasura/graphql-engine/cli/v2"
10+
"github.com/hasura/graphql-engine/cli/v2/util"
1111
"github.com/pkg/errors"
1212
"github.com/spf13/cobra"
1313
)

Diff for: ‎cli/commands/actions_use_codegen_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"os"
66
"path/filepath"
77

8-
"github.com/hasura/graphql-engine/cli/internal/testutil"
8+
"github.com/hasura/graphql-engine/cli/v2/internal/testutil"
99
. "github.com/onsi/ginkgo"
1010
. "github.com/onsi/gomega"
1111
. "github.com/onsi/gomega/gexec"

Diff for: ‎cli/commands/commands_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"strings"
99
"testing"
1010

11-
"github.com/hasura/graphql-engine/cli/util"
11+
"github.com/hasura/graphql-engine/cli/v2/util"
1212

13-
"github.com/hasura/graphql-engine/cli"
13+
"github.com/hasura/graphql-engine/cli/v2"
1414
"gopkg.in/yaml.v2"
1515

1616
. "github.com/onsi/ginkgo"

Diff for: ‎cli/commands/completion.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"os"
66

7-
"github.com/hasura/graphql-engine/cli"
7+
"github.com/hasura/graphql-engine/cli/v2"
88
"github.com/spf13/cobra"
99
"github.com/spf13/viper"
1010
)

Diff for: ‎cli/commands/console.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import (
44
"os"
55
"sync"
66

7-
"github.com/hasura/graphql-engine/cli/internal/scripts"
8-
"github.com/hasura/graphql-engine/cli/util"
7+
"github.com/hasura/graphql-engine/cli/v2/internal/scripts"
8+
"github.com/hasura/graphql-engine/cli/v2/util"
99

1010
"github.com/gin-gonic/gin"
11-
"github.com/hasura/graphql-engine/cli"
12-
"github.com/hasura/graphql-engine/cli/pkg/console"
11+
"github.com/hasura/graphql-engine/cli/v2"
12+
"github.com/hasura/graphql-engine/cli/v2/pkg/console"
1313
"github.com/pkg/errors"
1414
"github.com/spf13/cobra"
1515
"github.com/spf13/viper"

Diff for: ‎cli/commands/docs.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"sort"
1010
"strings"
1111

12-
"github.com/hasura/graphql-engine/cli"
12+
"github.com/hasura/graphql-engine/cli/v2"
1313
"github.com/pkg/errors"
1414
"github.com/spf13/cobra"
1515
"github.com/spf13/cobra/doc"

Diff for: ‎cli/commands/help.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"os"
66
"text/tabwriter"
77

8-
"github.com/hasura/graphql-engine/cli"
8+
"github.com/hasura/graphql-engine/cli/v2"
99
"github.com/spf13/cobra"
1010
)
1111

Diff for: ‎cli/commands/init.go

+15-15
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@ import (
77
"path/filepath"
88
"strings"
99

10-
"github.com/hasura/graphql-engine/cli/internal/metadataobject"
11-
crontriggers "github.com/hasura/graphql-engine/cli/internal/metadataobject/cron_triggers"
12-
"github.com/hasura/graphql-engine/cli/internal/metadataobject/functions"
13-
"github.com/hasura/graphql-engine/cli/internal/metadataobject/sources"
14-
"github.com/hasura/graphql-engine/cli/internal/metadataobject/tables"
15-
16-
"github.com/hasura/graphql-engine/cli/internal/metadataobject/actions"
17-
actionMetadataFileTypes "github.com/hasura/graphql-engine/cli/internal/metadataobject/actions/types"
18-
"github.com/hasura/graphql-engine/cli/internal/metadataobject/allowlist"
19-
"github.com/hasura/graphql-engine/cli/internal/metadataobject/querycollections"
20-
"github.com/hasura/graphql-engine/cli/internal/metadataobject/remoteschemas"
21-
metadataVersion "github.com/hasura/graphql-engine/cli/internal/metadataobject/version"
22-
"github.com/hasura/graphql-engine/cli/util"
23-
24-
"github.com/hasura/graphql-engine/cli"
10+
"github.com/hasura/graphql-engine/cli/v2/internal/metadataobject"
11+
crontriggers "github.com/hasura/graphql-engine/cli/v2/internal/metadataobject/cron_triggers"
12+
"github.com/hasura/graphql-engine/cli/v2/internal/metadataobject/functions"
13+
"github.com/hasura/graphql-engine/cli/v2/internal/metadataobject/sources"
14+
"github.com/hasura/graphql-engine/cli/v2/internal/metadataobject/tables"
15+
16+
"github.com/hasura/graphql-engine/cli/v2/internal/metadataobject/actions"
17+
actionMetadataFileTypes "github.com/hasura/graphql-engine/cli/v2/internal/metadataobject/actions/types"
18+
"github.com/hasura/graphql-engine/cli/v2/internal/metadataobject/allowlist"
19+
"github.com/hasura/graphql-engine/cli/v2/internal/metadataobject/querycollections"
20+
"github.com/hasura/graphql-engine/cli/v2/internal/metadataobject/remoteschemas"
21+
metadataVersion "github.com/hasura/graphql-engine/cli/v2/internal/metadataobject/version"
22+
"github.com/hasura/graphql-engine/cli/v2/util"
23+
24+
"github.com/hasura/graphql-engine/cli/v2"
2525
"github.com/manifoldco/promptui"
2626
"github.com/pkg/errors"
2727
"github.com/spf13/cobra"

Diff for: ‎cli/commands/metadata.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"io"
88

99
"github.com/goccy/go-yaml"
10-
"github.com/hasura/graphql-engine/cli"
11-
"github.com/hasura/graphql-engine/cli/internal/scripts"
12-
"github.com/hasura/graphql-engine/cli/util"
10+
"github.com/hasura/graphql-engine/cli/v2"
11+
"github.com/hasura/graphql-engine/cli/v2/internal/scripts"
12+
"github.com/hasura/graphql-engine/cli/v2/util"
1313
"github.com/spf13/cobra"
1414
"github.com/spf13/viper"
1515
)

Diff for: ‎cli/commands/metadata_apply.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package commands
22

33
import (
4-
"fmt"
5-
"os"
4+
"fmt"
5+
"os"
66

7-
"github.com/hasura/graphql-engine/cli"
8-
"github.com/hasura/graphql-engine/cli/internal/metadataobject"
9-
"github.com/spf13/cobra"
7+
"github.com/hasura/graphql-engine/cli/v2"
8+
"github.com/hasura/graphql-engine/cli/v2/internal/metadataobject"
9+
"github.com/spf13/cobra"
1010
)
1111

1212
func newMetadataApplyCmd(ec *cli.ExecutionContext) *cobra.Command {
@@ -116,4 +116,4 @@ func errorApplyingMetadata(err error) error {
116116
// a helper function to have consistent error messages for errors
117117
// when applying metadata
118118
return fmt.Errorf("error applying metadata \n%w", err)
119-
}
119+
}

Diff for: ‎cli/commands/metadata_apply_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"github.com/Pallinder/go-randomdata"
99

10-
"github.com/hasura/graphql-engine/cli/internal/testutil"
10+
"github.com/hasura/graphql-engine/cli/v2/internal/testutil"
1111
. "github.com/onsi/ginkgo"
1212
. "github.com/onsi/gomega"
1313
. "github.com/onsi/gomega/gexec"

Diff for: ‎cli/commands/metadata_clear.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package commands
22

33
import (
4-
"github.com/hasura/graphql-engine/cli"
5-
"github.com/hasura/graphql-engine/cli/internal/metadataobject"
4+
"github.com/hasura/graphql-engine/cli/v2"
5+
"github.com/hasura/graphql-engine/cli/v2/internal/metadataobject"
66
"github.com/pkg/errors"
77
"github.com/spf13/cobra"
88
)

Diff for: ‎cli/commands/metadata_clear_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"os"
66
"path/filepath"
77

8-
"github.com/hasura/graphql-engine/cli/internal/testutil"
8+
"github.com/hasura/graphql-engine/cli/v2/internal/testutil"
99
. "github.com/onsi/ginkgo"
1010
. "github.com/onsi/gomega"
1111
. "github.com/onsi/gomega/gexec"

Diff for: ‎cli/commands/metadata_diff.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"os"
88
"strings"
99

10-
"github.com/hasura/graphql-engine/cli/internal/metadataobject"
10+
"github.com/hasura/graphql-engine/cli/v2/internal/metadataobject"
1111

1212
"github.com/aryann/difflib"
13-
"github.com/hasura/graphql-engine/cli"
13+
"github.com/hasura/graphql-engine/cli/v2"
1414
"github.com/mgutz/ansi"
1515
"github.com/pkg/errors"
1616
"github.com/spf13/cobra"

Diff for: ‎cli/commands/metadata_diff_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"os"
66
"path/filepath"
77

8-
"github.com/hasura/graphql-engine/cli/internal/testutil"
8+
"github.com/hasura/graphql-engine/cli/v2/internal/testutil"
99
. "github.com/onsi/ginkgo"
1010
. "github.com/onsi/gomega"
1111
. "github.com/onsi/gomega/gexec"

Diff for: ‎cli/commands/metadata_export.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"io/ioutil"
55
"os"
66

7-
"github.com/hasura/graphql-engine/cli"
8-
"github.com/hasura/graphql-engine/cli/internal/metadataobject"
7+
"github.com/hasura/graphql-engine/cli/v2"
8+
"github.com/hasura/graphql-engine/cli/v2/internal/metadataobject"
99
"github.com/pkg/errors"
1010
"github.com/spf13/cobra"
1111
)

Diff for: ‎cli/commands/metadata_export_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"github.com/Pallinder/go-randomdata"
99

10-
"github.com/hasura/graphql-engine/cli/internal/testutil"
10+
"github.com/hasura/graphql-engine/cli/v2/internal/testutil"
1111
. "github.com/onsi/ginkgo"
1212
. "github.com/onsi/gomega"
1313
. "github.com/onsi/gomega/gexec"

Diff for: ‎cli/commands/metadata_inconsistency.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package commands
22

33
import (
4-
"github.com/hasura/graphql-engine/cli"
4+
"github.com/hasura/graphql-engine/cli/v2"
55
"github.com/spf13/cobra"
66
)
77

Diff for: ‎cli/commands/metadata_inconsistency_drop.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package commands
22

33
import (
4-
"github.com/hasura/graphql-engine/cli"
5-
"github.com/hasura/graphql-engine/cli/internal/metadataobject"
4+
"github.com/hasura/graphql-engine/cli/v2"
5+
"github.com/hasura/graphql-engine/cli/v2/internal/metadataobject"
66
"github.com/pkg/errors"
77
"github.com/spf13/cobra"
88
)

Diff for: ‎cli/commands/metadata_inconsistency_drop_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"os"
66
"path/filepath"
77

8-
"github.com/hasura/graphql-engine/cli/internal/testutil"
8+
"github.com/hasura/graphql-engine/cli/v2/internal/testutil"
99
. "github.com/onsi/ginkgo"
1010
. "github.com/onsi/gomega"
1111
. "github.com/onsi/gomega/gexec"

0 commit comments

Comments
 (0)