Skip to content

Commit ee64f66

Browse files
committed
lint
1 parent b51c49b commit ee64f66

File tree

3 files changed

+27
-18
lines changed

3 files changed

+27
-18
lines changed

go.mod

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ retract v0.14.0
88

99
require (
1010
github.com/alecthomas/chroma/v2 v2.13.0
11-
github.com/ccojocar/zxcvbn-go v1.0.1
11+
github.com/ccojocar/zxcvbn-go v1.0.2
1212
github.com/charmbracelet/glamour v0.6.0
1313
github.com/gofrs/uuid v4.2.0+incompatible
1414
github.com/google/go-querystring v1.1.0
@@ -20,8 +20,8 @@ require (
2020
github.com/pgavlin/fx/v2 v2.0.10
2121
github.com/pulumi/pulumi/pkg/v3 v3.209.0
2222
github.com/pulumi/pulumi/sdk/v3 v3.209.0
23-
github.com/rivo/uniseg v0.4.4
24-
github.com/rogpeppe/go-internal v1.13.1
23+
github.com/rivo/uniseg v0.4.7
24+
github.com/rogpeppe/go-internal v1.14.1
2525
github.com/spf13/cobra v1.10.1
2626
github.com/spf13/pflag v1.0.9
2727
github.com/stretchr/testify v1.10.0
@@ -112,6 +112,7 @@ require (
112112
github.com/golang/glog v1.2.4 // indirect
113113
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
114114
github.com/golang/protobuf v1.5.4 // indirect
115+
github.com/golangci/golangci-lint v1.64.8 // indirect
115116
github.com/google/s2a-go v0.1.7 // indirect
116117
github.com/google/uuid v1.6.0 // indirect
117118
github.com/google/wire v0.6.0 // indirect
@@ -139,10 +140,10 @@ require (
139140
github.com/kylelemons/godebug v1.1.0 // indirect
140141
github.com/lib/pq v1.10.9 // indirect
141142
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
142-
github.com/mattn/go-colorable v0.1.13 // indirect
143+
github.com/mattn/go-colorable v0.1.14 // indirect
143144
github.com/mattn/go-isatty v0.0.20 // indirect
144145
github.com/mattn/go-localereader v0.0.1 // indirect
145-
github.com/mattn/go-runewidth v0.0.15 // indirect
146+
github.com/mattn/go-runewidth v0.0.16 // indirect
146147
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
147148
github.com/microcosm-cc/bluemonday v1.0.21 // indirect
148149
github.com/mitchellh/copystructure v1.2.0 // indirect

go.sum

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdn
126126
github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
127127
github.com/ccojocar/zxcvbn-go v1.0.1 h1:+sxrANSCj6CdadkcMnvde/GWU1vZiiXRbqYSCalV4/4=
128128
github.com/ccojocar/zxcvbn-go v1.0.1/go.mod h1:g1qkXtUSvHP8lhHp5GrSmTz6uWALGRMQdw6Qnz/hi60=
129+
github.com/ccojocar/zxcvbn-go v1.0.2 h1:na/czXU8RrhXO4EZme6eQJLR4PzcGsahsBOAwU6I3Vg=
130+
github.com/ccojocar/zxcvbn-go v1.0.2/go.mod h1:g1qkXtUSvHP8lhHp5GrSmTz6uWALGRMQdw6Qnz/hi60=
129131
github.com/cenkalti/backoff/v3 v3.2.2 h1:cfUAAO3yvKMYKPrvhDuHSwQnhZNk/RMHKdZqKTxfm6M=
130132
github.com/cenkalti/backoff/v3 v3.2.2/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
131133
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
@@ -181,6 +183,7 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
181183
github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
182184
github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
183185
github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
186+
github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
184187
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
185188
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
186189
github.com/frankban/quicktest v1.14.5 h1:dfYrrRyLtiqT9GyKXgdh+k4inNeTvmGbuSgZ3lx3GhA=
@@ -231,6 +234,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD
231234
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
232235
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
233236
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
237+
github.com/golangci/golangci-lint v1.64.8 h1:y5TdeVidMtBGG32zgSC7ZXTFNHrsJkDnpO4ItB3Am+I=
238+
github.com/golangci/golangci-lint v1.64.8/go.mod h1:5cEsUQBSr6zi8XI8OjmcY2Xmliqc4iYL7YoPrL+zLJ4=
234239
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
235240
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
236241
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -335,6 +340,8 @@ github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVc
335340
github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
336341
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
337342
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
343+
github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
344+
github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
338345
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
339346
github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
340347
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
@@ -348,6 +355,8 @@ github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRC
348355
github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
349356
github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
350357
github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
358+
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
359+
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
351360
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4=
352361
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
353362
github.com/microcosm-cc/bluemonday v1.0.21 h1:dNH3e4PSyE4vNX+KlRGHT5KrSvjeUkoNPwEORjffHJg=
@@ -421,8 +430,12 @@ github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJ
421430
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
422431
github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
423432
github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
433+
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
434+
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
424435
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
425436
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
437+
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
438+
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
426439
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
427440
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
428441
github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=

schema/json_schema.go

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,17 @@ func JSONSchemaSchema() *Schema {
4040
Type: "array",
4141
Items: &Schema{Ref: "#/$defs/schema"},
4242
},
43-
"items": &Schema{Ref: "#/$defs/schema"},
44-
"additionalProperties": &Schema{Ref: "#/$defs/schema"},
43+
"items": {Ref: "#/$defs/schema"},
44+
"additionalProperties": {Ref: "#/$defs/schema"},
4545
"properties": {
4646
Type: "object",
4747
AdditionalProperties: &Schema{Ref: "#/$defs/schema"},
4848
},
4949

5050
// Validation vocabulary
5151
"type": {
52-
AnyOf: []*Schema{
53-
{
54-
Type: "string",
55-
Enum: []any{"string", "number", "boolean", "array", "object", "null"},
56-
},
57-
},
52+
Type: "string",
53+
Enum: []any{"string", "number", "boolean", "array", "object", "null"},
5854
},
5955
"const": {}, // Any value
6056
"enum": {Type: "array"},
@@ -71,7 +67,10 @@ func JSONSchemaSchema() *Schema {
7167
"uniqueItems": {Type: "boolean"},
7268
"maxProperties": {Type: "number"},
7369
"minProperties": {Type: "number"},
74-
"required": {Type: "array", Items: &Schema{Type: "string"}},
70+
"required": {
71+
Type: "array",
72+
Items: &Schema{Type: "string"},
73+
},
7574
"dependentRequired": {
7675
Type: "object",
7776
AdditionalProperties: &Schema{Type: "array", Items: &Schema{Type: "string"}},
@@ -83,10 +82,6 @@ func JSONSchemaSchema() *Schema {
8382
"default": {}, // Any value
8483
"deprecated": {Type: "boolean"},
8584
"examples": {Type: "array"},
86-
87-
// ESC extensions
88-
"secret": {Type: "boolean"},
89-
"rotateOnly": {Type: "array", Items: &Schema{Type: "string"}},
9085
},
9186
},
9287
},

0 commit comments

Comments
 (0)