这是indexloc提供的服务，不要输入任何密码
Skip to content

cli: add directory name as an argument to init cmd #3590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 25, 2019
Merged

cli: add directory name as an argument to init cmd #3590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50ba673
add directory-name as an argument to init command
shahidhk Dec 25, 2019
424c3d5
change dev version to a const string
shahidhk Dec 25, 2019
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
11 changes: 8 additions & 3 deletions cli/commands/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,27 @@ func NewInitCmd(ec *cli.ExecutionContext) *cobra.Command {
EC: ec,
}
initCmd := &cobra.Command{
Use: "init",
Use: "init [directory-name]",
Short: "Initialize directory for Hasura GraphQL Engine migrations",
Long: "Create directories and files required for enabling migrations on Hasura GraphQL Engine",
Example: ` # Create a directory to store migrations
hasura init
hasura init [directory-name]

# Now, edit <my-directory>/config.yaml to add endpoint and admin secret

# Create a directory with endpoint and admin secret configured:
hasura init --directory <my-project> --endpoint https://my-graphql-engine.com --admin-secret adminsecretkey
hasura init <my-project> --endpoint https://my-graphql-engine.com --admin-secret adminsecretkey

# See https://docs.hasura.io/1.0/graphql/manual/migrations/index.html for more details`,
SilenceUsage: true,
Args: cobra.MaximumNArgs(1),
PreRun: func(cmd *cobra.Command, args []string) {
ec.Viper = viper.New()
},
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 1 {
opts.InitDir = args[0]
}
return opts.run()
},
}
Expand All @@ -52,6 +56,7 @@ func NewInitCmd(ec *cli.ExecutionContext) *cobra.Command {
f.StringVar(&opts.AdminSecret, "admin-secret", "", "admin secret for Hasura GraphQL Engine")
f.StringVar(&opts.AdminSecret, "access-key", "", "access key for Hasura GraphQL Engine")
f.MarkDeprecated("access-key", "use --admin-secret instead")
f.MarkDeprecated("directory", "use directory-name argument instead")

return initCmd
}
Expand Down
5 changes: 3 additions & 2 deletions cli/commands/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package commands
import (
"github.com/hasura/graphql-engine/cli"
"github.com/hasura/graphql-engine/cli/update"
"github.com/hasura/graphql-engine/cli/version"
"github.com/pkg/errors"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -37,8 +38,8 @@ var rootCmd = &cobra.Command{
EC: ec,
}
err := u.run(true)
if err != nil {
ec.Logger.WithError(err).Error("auto-update failed, run 'hasura update-cli' to update manually")
if err != nil && u.EC.Version.GetCLIVersion() != version.DevVersion {
ec.Logger.WithError(err).Warn("auto-update failed, run 'hasura update-cli' to update manually")
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion cli/telemetry/telemetry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ import (
"testing"

"github.com/hasura/graphql-engine/cli/telemetry"
"github.com/hasura/graphql-engine/cli/version"
)

func TestBeamDev(t *testing.T) {
tm := telemetry.BuildEvent()
tm.Version = "dev"
tm.Version = version.DevVersion
tm.Command = "TEST"
tm.CanBeam = true
tm.Beam()
Expand Down
2 changes: 1 addition & 1 deletion cli/version/compatibility.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const (
// a message which states the reason for the result.
func (v *Version) CheckCLIServerCompatibility() (compatible bool, reason string) {
// mark dev builds as compatible
if v.CLI == "dev" {
if v.CLI == DevVersion {
return true, devCLI
}
// empty cli version
Expand Down
5 changes: 4 additions & 1 deletion cli/version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@ import (
"github.com/Masterminds/semver"
)

// DevVersion is the version string for development versions.
const DevVersion = "dev"

// BuildVersion is the versin string with which CLI is built. Set during
// the build time.
var BuildVersion = "dev"
var BuildVersion = DevVersion

// Version defines the version object.
type Version struct {
Expand Down