Add a flag to use a different base URL than api.tidbyt.com.

Author: IngmarStein

cmd/delete.go

@@ -10,12 +10,11 @@ import (
 	"tidbyt.dev/pixlet/cmd/config"
 )
 
-const (
-	TidbytAPIDelete = "https://api.tidbyt.com/v0/devices/%s/installations/%s"
-)
+var deleteURL string
 
 func init() {
 	DeleteCmd.Flags().StringVarP(&apiToken, "api-token", "t", "", "Tidbyt API token")
+	DeleteCmd.Flags().StringVarP(&deleteURL, "url", "u", "https://api.tidbyt.com", "base URL of Tidbyt API")
 }
 
 var DeleteCmd = &cobra.Command{
@@ -44,7 +43,7 @@ func delete(cmd *cobra.Command, args []string) error {
 	client := &http.Client{}
 	req, err := http.NewRequest(
 		"DELETE",
-		fmt.Sprintf(TidbytAPIDelete, deviceID, installationID),
+		fmt.Sprintf("%s/v0/devices/%s/installations/%s", deleteURL, deviceID, installationID),
 		nil,
 	)
 	if err != nil {

cmd/devices.go

@@ -11,9 +11,11 @@ import (
 	"tidbyt.dev/pixlet/cmd/config"
 )
 
-const (
-	TidbytAPIListDevices = "https://api.tidbyt.com/v0/devices"
-)
+var devicesURL string
+
+func init() {
+	DevicesCmd.Flags().StringVarP(&devicesURL, "url", "u", "https://api.tidbyt.com", "base URL of Tidbyt API")
+}
 
 var DevicesCmd = &cobra.Command{
 	Use:   "devices",
@@ -29,7 +31,7 @@ func devices(cmd *cobra.Command, args []string) {
 	}
 
 	client := &http.Client{}
-	req, err := http.NewRequest("GET", TidbytAPIListDevices, nil)
+	req, err := http.NewRequest("GET", fmt.Sprintf("%s/v0/devices", devicesURL), nil)
 	if err != nil {
 		fmt.Printf("creating GET request: %v\n", err)
 		os.Exit(1)

cmd/list.go

@@ -12,8 +12,8 @@ import (
 	"tidbyt.dev/pixlet/cmd/config"
 )
 
-const (
-	TidbytAPIList = "https://api.tidbyt.com/v0/devices/%s/installations"
+var (
+	listURL string
 )
 
 type TidbytInstallationJSON struct {
@@ -27,6 +27,7 @@ type TidbytInstallationListJSON struct {
 
 func init() {
 	ListCmd.Flags().StringVarP(&apiToken, "api-token", "t", "", "Tidbyt API token")
+	ListCmd.Flags().StringVarP(&listURL, "url", "u", "https://api.tidbyt.com", "base URL of Tidbyt API")
 }
 
 var ListCmd = &cobra.Command{
@@ -54,7 +55,7 @@ func listInstallations(cmd *cobra.Command, args []string) error {
 	client := &http.Client{}
 	req, err := http.NewRequest(
 		"GET",
-		fmt.Sprintf(TidbytAPIList, deviceID), nil)
+		fmt.Sprintf("%s/v0/devices/%s/installations", listURL, deviceID), nil)
 	if err != nil {
 		return fmt.Errorf("creating GET request: %w", err)
 	}

cmd/push.go

@@ -14,14 +14,14 @@ import (
 )
 
 const (
-	TidbytAPIPush = "https://api.tidbyt.com/v0/devices/%s/push"
-	APITokenEnv   = "TIDBYT_API_TOKEN"
+	APITokenEnv = "TIDBYT_API_TOKEN"
 )
 
 var (
 	apiToken       string
 	installationID string
 	background     bool
+	pushURL        string
 )
 
 type TidbytPushJSON struct {
@@ -35,6 +35,7 @@ func init() {
 	PushCmd.Flags().StringVarP(&apiToken, "api-token", "t", "", "Tidbyt API token")
 	PushCmd.Flags().StringVarP(&installationID, "installation-id", "i", "", "Give your installation an ID to keep it in the rotation")
 	PushCmd.Flags().BoolVarP(&background, "background", "b", false, "Don't immediately show the image on the device")
+	PushCmd.Flags().StringVarP(&pushURL, "url", "u", "https://api.tidbyt.com", "base URL of Tidbyt API")
 }
 
 var PushCmd = &cobra.Command{
@@ -49,14 +50,14 @@ func push(cmd *cobra.Command, args []string) error {
 	image := args[1]
 
 	// TODO (mark): This is better served as a flag, but I don't want to break
-	// folks in the short term. We should consider dropping this as an arguement
+	// folks in the short term. We should consider dropping this as an argument
 	// in a future release.
 	if len(args) == 3 {
 		installationID = args[2]
 	}
 
 	if background && len(installationID) == 0 {
-		return fmt.Errorf("Background push won't do anything unless you also specify an installation ID")
+		return fmt.Errorf("background push won't do anything unless you also specify an installation ID")
 	}
 
 	if apiToken == "" {
@@ -91,7 +92,7 @@ func push(cmd *cobra.Command, args []string) error {
 	client := &http.Client{}
 	req, err := http.NewRequest(
 		"POST",
-		fmt.Sprintf(TidbytAPIPush, deviceID),
+		fmt.Sprintf("%s/v0/devices/%s/push", pushURL, deviceID),
 		bytes.NewReader(payload),
 	)
 	if err != nil {