feat(play): improve masking schema (#127)

* chore: upgrade schema library

* feat: add inline documentation in json schema

* feat(play): use tagged JSON schema

* feat(play): use tagged JSON schema

* fix(play): linting error

* fix(play): update jsonschema

Author: adrienaury

build.yml

@@ -125,6 +125,9 @@ targets:
           - $: "echo -n ={tag}"
             1=: "tag"
             3x: true
+      - $: 'echo -n "={tag}"'
+        1=: "realtag"
+        3x: true
       - $: 'echo -n "={tag}" | tr "()" "-"'
         1=: "tag"
         3x: true
@@ -219,7 +222,8 @@ targets:
       - $: touch web/play/node_modules/go.mod
       - $: rm -rf internal/app/pimo/client/*
       - $: cp -r web/play/dist/* internal/app/pimo/client
-      - $: sed -i 's/{{version}}/={tag}/g' internal/app/pimo/client/index.html
+      - $: sed -i 's/{{version}}/={realtag}/g' internal/app/pimo/client/index.html
+      - $: sed -i 's/{{version}}/={realtag}/g' internal/app/pimo/client/main.js
       - $: git checkout -- internal/app/pimo/client
 
   # run "neon -props '{buildpaths: ["path/to/main/package1","path/to/main/package2"]}' compile" to compile specific targets

go.mod

@@ -5,9 +5,9 @@ go 1.17
 require (
 	github.com/Masterminds/sprig/v3 v3.2.2
 	github.com/Trendyol/overlog v0.1.1
-	github.com/alecthomas/jsonschema v0.0.0-20210526225647-edb03dcab7bc
 	github.com/capitalone/fpe v1.2.1
 	github.com/goccy/go-yaml v1.9.5
+	github.com/invopop/jsonschema v0.4.0
 	github.com/labstack/echo/v4 v4.7.2
 	github.com/mattn/go-isatty v0.0.14
 	github.com/rs/zerolog v1.27.0

go.sum

@@ -6,8 +6,6 @@ github.com/Masterminds/sprig/v3 v3.2.2 h1:17jRggJu518dr3QaafizSXOjKYp94wKfABxUmy
 github.com/Masterminds/sprig/v3 v3.2.2/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk=
 github.com/Trendyol/overlog v0.1.1 h1:igv/GoiOycUAdPncwQMz93x15zlABcOrwRnvbWGMIV8=
 github.com/Trendyol/overlog v0.1.1/go.mod h1:kns76uyvmPFX0xS6Xsn/adMpB/ldlO6tyvK+Ug+cLsU=
-github.com/alecthomas/jsonschema v0.0.0-20210526225647-edb03dcab7bc h1:mT8qSzuyEAkxbv4GBln7yeuQZpBnfikr3PTuiPs6Z3k=
-github.com/alecthomas/jsonschema v0.0.0-20210526225647-edb03dcab7bc/go.mod h1:/n6+1/DWPltRLWL/VKyUxg6tzsl5kHUCcraimt4vr60=
 github.com/capitalone/fpe v1.2.1 h1:/r81KhhTkfmxjjr2HKr+WYTLrMjPnn0gtK/L8gKNfts=
 github.com/capitalone/fpe v1.2.1/go.mod h1:hI6YzL2v2WkosaevH24sYHyyDAzacfqkpaOYc/0Qn7g=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
@@ -51,6 +49,8 @@ github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA=
 github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/invopop/jsonschema v0.4.0 h1:Yuy/unfgCnfV5Wl7H0HgFufp/rlurqPOOuacqyByrws=
+github.com/invopop/jsonschema v0.4.0/go.mod h1:O9uiLokuu0+MGFlyiaqtWxwqJm41/+8Nj0lD7A36YH0=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=

internal/app/pimo/pimo.go

@@ -26,7 +26,6 @@ import (
 	"time"
 
 	over "github.com/Trendyol/overlog"
-	"github.com/alecthomas/jsonschema"
 	"github.com/cgi-fr/pimo/pkg/add"
 	"github.com/cgi-fr/pimo/pkg/addtransient"
 	"github.com/cgi-fr/pimo/pkg/command"
@@ -58,6 +57,7 @@ import (
 	"github.com/cgi-fr/pimo/pkg/templatemask"
 	"github.com/cgi-fr/pimo/pkg/transcode"
 	"github.com/cgi-fr/pimo/pkg/weightedchoice"
+	"github.com/invopop/jsonschema"
 	"github.com/rs/zerolog/log"
 )