feat: also accept hujson files

go.mod

@@ -37,6 +37,7 @@ require (
 	github.com/sony/sonyflake v1.2.0
 	github.com/spf13/cobra v1.8.0
 	github.com/stretchr/testify v1.8.4
+	github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a
 	github.com/xhit/go-str2duration/v2 v2.1.0
 	go.uber.org/zap v1.26.0
 	golang.org/x/crypto v0.18.0

go.sum

@@ -720,6 +720,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a h1:SJy1Pu0eH1C29XwJucQo73FrleVK6t4kYz4NVhp34Yw=
+github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a/go.mod h1:DFSS3NAGHthKo1gTlmEcSBiZrRJXi28rLNd/1udP1c8=
 github.com/tailscale/netlink v1.1.1-0.20211101221916-cabfb018fe85 h1:zrsUcqrG2uQSPhaUPjUQwozcRdDdSxxqhNgNZ3drZFk=
 github.com/tailscale/netlink v1.1.1-0.20211101221916-cabfb018fe85/go.mod h1:NzVQi3Mleb+qzq8VmcWpSkcSYxXIg0DkI6XDzpVkhJ0=
 github.com/tkuchiki/go-timezone v0.2.0/go.mod h1:b1Ean9v2UXtxSq4TZF0i/TU9NuoWa9hOzOKoGCV2zqY=

internal/cmd/acl.go

@@ -9,7 +9,7 @@ import (
 	"github.com/jsiebens/go-edit/editor"
 	api "github.com/jsiebens/ionscale/pkg/gen/ionscale/v1"
 	"github.com/spf13/cobra"
-	"io/ioutil"
+	"github.com/tailscale/hujson"
 	"os"
 )
 
@@ -104,6 +104,11 @@ func editACLConfigCommand() *cobra.Command {
 
 		defer os.Remove(s)
 
+		next, err = hujson.Standardize(next)
+		if err != nil {
+			return err
+		}
+
 		var policy = &api.ACLPolicy{}
 		if err := json.Unmarshal(next, policy); err != nil {
 			return err
@@ -141,7 +146,12 @@ func setACLConfigCommand() *cobra.Command {
 
 	command.PreRunE = checkRequiredTailnetAndTailnetIdFlags
 	command.RunE = func(cmd *cobra.Command, args []string) error {
-		rawJson, err := ioutil.ReadFile(file)
+		content, err := os.ReadFile(file)
+		if err != nil {
+			return err
+		}
+
+		rawJson, err := hujson.Standardize(content)
 		if err != nil {
 			return err
 		}

internal/cmd/derp_map.go

@@ -7,6 +7,7 @@ import (
 	"github.com/bufbuild/connect-go"
 	api "github.com/jsiebens/ionscale/pkg/gen/ionscale/v1"
 	"github.com/spf13/cobra"
+	"github.com/tailscale/hujson"
 	"gopkg.in/yaml.v2"
 	"os"
 	"tailscale.com/tailcfg"
@@ -98,7 +99,12 @@ func setDefaultDERPMap() *cobra.Command {
 			return err
 		}
 
-		rawJson, err := os.ReadFile(file)
+		content, err := os.ReadFile(file)
+		if err != nil {
+			return err
+		}
+
+		rawJson, err := hujson.Standardize(content)
 		if err != nil {
 			return err
 		}

internal/cmd/iam.go

@@ -9,7 +9,7 @@ import (
 	"github.com/jsiebens/go-edit/editor"
 	api "github.com/jsiebens/ionscale/pkg/gen/ionscale/v1"
 	"github.com/spf13/cobra"
-	"io/ioutil"
+	"github.com/tailscale/hujson"
 	"os"
 )
 
@@ -102,6 +102,11 @@ func editIAMPolicyCommand() *cobra.Command {
 			return err
 		}
 
+		next, err = hujson.Standardize(next)
+		if err != nil {
+			return err
+		}
+
 		defer os.Remove(s)
 
 		var policy = &api.IAMPolicy{}
@@ -141,7 +146,12 @@ func setIAMPolicyCommand() *cobra.Command {
 
 	command.PreRunE = checkRequiredTailnetAndTailnetIdFlags
 	command.RunE = func(cmd *cobra.Command, args []string) error {
-		rawJson, err := ioutil.ReadFile(file)
+		content, err := os.ReadFile(file)
+		if err != nil {
+			return err
+		}
+
+		rawJson, err := hujson.Standardize(content)
 		if err != nil {
 			return err
 		}