Skip to content

Commit 7c98c3c

Browse files
jvoravongjvoravong
authored
[chore] fix formatting in values.schema.json that causes linter test failures for eks-addon releases (#1720)
* [chore] fix formatting in values.schema.json that causes linter test failures for eks-addon releases * Add pre-commit hooks to check and format json like the values.schema.json * Reformat the values.schema.json file using a pre-commit hook, fixes tabs mixed with space indentation issues, linter tests fail for the eks-addon release without some these fixes
1 parent 3016667 commit 7c98c3c

File tree

2 files changed

+85
-31
lines changed

2 files changed

+85
-31
lines changed

‎.pre-commit-config.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ repos:
1515
exclude: "^examples|^test"
1616
- id: end-of-file-fixer
1717
exclude: "^examples|^test"
18+
- id: pretty-format-json
19+
args:
20+
- --autofix
21+
- --no-sort-keys
22+
- id: check-json
1823
- id: check-yaml
1924
# Can't check source yaml since it has go templates in it.
2025
# Can't check operator-webhook.yaml due to redacted TLS certificate information causing yaml format issues.

‎helm-charts/splunk-otel-collector/values.schema.json

Lines changed: 80 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -581,22 +581,22 @@
581581
"type": "object"
582582
},
583583
"updateStrategy": {
584-
"type": "string",
585-
"enum": [
586-
"OnDelete",
587-
"RollingUpdate"
588-
]
584+
"type": "string",
585+
"enum": [
586+
"OnDelete",
587+
"RollingUpdate"
588+
]
589589
},
590-
"maxUnavailable": {
591-
"oneOf": [
592-
{
593-
"type": "string"
590+
"maxUnavailable": {
591+
"oneOf": [
592+
{
593+
"type": "string"
594594
},
595595
{
596-
"type": "integer"
597-
}
598-
]
599-
},
596+
"type": "integer"
597+
}
598+
]
599+
},
600600
"service": {
601601
"type": "object",
602602
"additionalProperties": false,
@@ -1114,7 +1114,7 @@
11141114
}
11151115
}
11161116
},
1117-
"initPatchLogDirs": {
1117+
"initPatchLogDirs": {
11181118
"type": "object",
11191119
"additionalProperties": false,
11201120
"properties": {
@@ -1543,7 +1543,10 @@
15431543
"type": "string"
15441544
}
15451545
},
1546-
"required": ["name", "value"],
1546+
"required": [
1547+
"name",
1548+
"value"
1549+
],
15471550
"additionalProperties": false
15481551
}
15491552
},
@@ -1570,12 +1573,18 @@
15701573
"type": "string"
15711574
}
15721575
},
1573-
"required": ["name", "value"],
1576+
"required": [
1577+
"name",
1578+
"value"
1579+
],
15741580
"additionalProperties": false
15751581
}
15761582
}
15771583
},
1578-
"required": ["repository", "tag"]
1584+
"required": [
1585+
"repository",
1586+
"tag"
1587+
]
15791588
},
15801589
"nodejs": {
15811590
"type": "object",
@@ -1600,12 +1609,18 @@
16001609
"type": "string"
16011610
}
16021611
},
1603-
"required": ["name", "value"],
1612+
"required": [
1613+
"name",
1614+
"value"
1615+
],
16041616
"additionalProperties": false
16051617
}
16061618
}
16071619
},
1608-
"required": ["repository", "tag"]
1620+
"required": [
1621+
"repository",
1622+
"tag"
1623+
]
16091624
},
16101625
"dotnet": {
16111626
"type": "object",
@@ -1630,12 +1645,18 @@
16301645
"type": "string"
16311646
}
16321647
},
1633-
"required": ["name", "value"],
1648+
"required": [
1649+
"name",
1650+
"value"
1651+
],
16341652
"additionalProperties": false
16351653
}
16361654
}
16371655
},
1638-
"required": ["repository", "tag"]
1656+
"required": [
1657+
"repository",
1658+
"tag"
1659+
]
16391660
},
16401661
"go": {
16411662
"type": "object",
@@ -1660,12 +1681,18 @@
16601681
"type": "string"
16611682
}
16621683
},
1663-
"required": ["name", "value"],
1684+
"required": [
1685+
"name",
1686+
"value"
1687+
],
16641688
"additionalProperties": false
16651689
}
16661690
}
16671691
},
1668-
"required": ["repository", "tag"]
1692+
"required": [
1693+
"repository",
1694+
"tag"
1695+
]
16691696
},
16701697
"apache-httpd": {
16711698
"type": "object",
@@ -1690,12 +1717,18 @@
16901717
"type": "string"
16911718
}
16921719
},
1693-
"required": ["name", "value"],
1720+
"required": [
1721+
"name",
1722+
"value"
1723+
],
16941724
"additionalProperties": false
16951725
}
16961726
}
16971727
},
1698-
"required": ["repository", "tag"]
1728+
"required": [
1729+
"repository",
1730+
"tag"
1731+
]
16991732
},
17001733
"python": {
17011734
"type": "object",
@@ -1720,12 +1753,18 @@
17201753
"type": "string"
17211754
}
17221755
},
1723-
"required": ["name", "value"],
1756+
"required": [
1757+
"name",
1758+
"value"
1759+
],
17241760
"additionalProperties": false
17251761
}
17261762
}
17271763
},
1728-
"required": ["repository", "tag"]
1764+
"required": [
1765+
"repository",
1766+
"tag"
1767+
]
17291768
},
17301769
"nginx": {
17311770
"type": "object",
@@ -1750,12 +1789,18 @@
17501789
"type": "string"
17511790
}
17521791
},
1753-
"required": ["name", "value"],
1792+
"required": [
1793+
"name",
1794+
"value"
1795+
],
17541796
"additionalProperties": false
17551797
}
17561798
}
17571799
},
1758-
"required": ["repository", "tag"]
1800+
"required": [
1801+
"repository",
1802+
"tag"
1803+
]
17591804
}
17601805
}
17611806
},
@@ -1849,9 +1894,13 @@
18491894
{
18501895
"if": {
18511896
"properties": {
1852-
"distribution": { "pattern": "^(gke|eks).*" }
1897+
"distribution": {
1898+
"pattern": "^(gke|eks).*"
1899+
}
18531900
},
1854-
"required": ["distribution"]
1901+
"required": [
1902+
"distribution"
1903+
]
18551904
},
18561905
"then": {
18571906
"properties": {

0 commit comments

Comments
 (0)