Support for specifying an API version for the GraphQL command

Author: sshaw

cmd/gql/gql.go

@@ -38,7 +38,7 @@ func findQuery(c *cli.Context) (string, error) {
 
 func queryAction(c *cli.Context) error {
 	shop := c.String("shop")
-	client := gql.NewClient(shop, cmd.LookupAccessToken(shop, c.String("access-token")))
+	client := gql.NewClient(shop, cmd.LookupAccessToken(shop, c.String("access-token")), c.String("api-version"))
 
 	query, err := findQuery(c)
 	if err != nil {
@@ -59,13 +59,21 @@ func queryAction(c *cli.Context) error {
 }
 
 func init() {
+	flags := []cli.Flag{
+		&cli.StringFlag{
+			Name:    "api-version",
+			Aliases: []string{"a"},
+			Usage:   "API version to use; default is a versionless call",
+		},
+	}
+
 	Cmd = cli.Command{
 		Name:        "graphql",
 		Aliases:     []string{"gql"},
 		ArgsUsage:   "[query-file.graphql]",
 		Usage:       "Run a GraphQL query against the Admin API",
 		Description: "If query-file.graphql is not given query is read from stdin",
-		Flags:       cmd.Flags,
+		Flags:       append(cmd.Flags, flags...),
 		Action:      queryAction,
 	}
 }

gql/client.go

@@ -17,13 +17,18 @@ type Client struct {
 	token    string
 }
 
-const endpoint = "https://%s.myshopify.com/admin/api/graphql.json"
+// We omit the "/" after API for the case where there's no version.
+const endpoint = "https://%s.myshopify.com/admin/api%s/graphql.json"
+
+func NewClient(shop, token, version string) *Client {
+	if len(version) > 0 {
+		version = "/" + version
+	}
 
-func NewClient(shop, token string) *Client {
 	// allow for NAME.myshopify.com or just NAME
 	shop = strings.SplitN(shop, ".", 2)[0]
 
-	return &Client{endpoint: fmt.Sprintf(endpoint, shop), token: token}
+	return &Client{endpoint: fmt.Sprintf(endpoint, shop, version), token: token}
 }
 
 func (c *Client) Query(q string) (mxj.Map, error) {

gql/storefront/storefront.go

@@ -54,7 +54,7 @@ const enableMutation = `
 `
 
 func New(shop, token string) *Storefront {
-	client := gql.NewClient(shop, token)
+	client := gql.NewClient(shop, token, "")
 	return &Storefront{client}
 }