Skip to content

Commit 2b07088

Browse files
jbamptonjbampton
authored
pre-commit check .cfg files with the trailing whitespace hook (#10151)
https://github.com/pre-commit/pre-commit-hooks?tab=readme-ov-file#trailing-whitespace This hook auto trims trailing whitespace
1 parent fd24509 commit 2b07088

13 files changed

+496
-496
lines changed

‎.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ repos:
5959
- id: mixed-line-ending
6060
exclude: \.(cs|xml)$
6161
- id: trailing-whitespace
62-
files: \.(cs|bat|css|gitignore|header|in|install|java|md|properties|py|rb|sh|sql|txt|vue|xml|xsl|yaml|yml)$
62+
files: \.(bat|cfg|cs|css|gitignore|header|in|install|java|md|properties|py|rb|sh|sql|txt|vue|xml|xsl|yaml|yml)$
6363
args: [--markdown-linebreak-ext=md]
6464
exclude: ^services/console-proxy/rdpconsole/src/test/doc/freerdp-debug-log\.txt$
6565
- repo: https://github.com/codespell-project/codespell

‎setup/dev/advancedsg.cfg

+71-71
Original file line numberDiff line numberDiff line change
@@ -18,162 +18,162 @@
1818
{
1919
"zones": [
2020
{
21-
"name": "Sandbox-Simulator",
22-
"dns1": "10.147.28.6",
21+
"name": "Sandbox-Simulator",
22+
"dns1": "10.147.28.6",
2323
"physical_networks": [
2424
{
25-
"name": "Sandbox-pnet",
25+
"name": "Sandbox-pnet",
2626
"tags": [
2727
"cloud-simulator-pnet"
28-
],
29-
"broadcastdomainrange": "Zone",
28+
],
29+
"broadcastdomainrange": "Zone",
3030
"providers": [
3131
{
32-
"broadcastdomainrange": "ZONE",
32+
"broadcastdomainrange": "ZONE",
3333
"name": "VirtualRouter"
34-
},
34+
},
3535
{
36-
"broadcastdomainrange": "ZONE",
36+
"broadcastdomainrange": "ZONE",
3737
"name": "SecurityGroupProvider"
3838
}
39-
],
39+
],
4040
"traffictypes": [
4141
{
4242
"typ": "Guest"
43-
},
43+
},
4444
{
45-
"typ": "Management",
45+
"typ": "Management",
4646
"simulator": "cloud-simulator-mgmt"
4747
}
48-
],
48+
],
4949
"isolationmethods": [
5050
"VLAN"
5151
]
5252
}
53-
],
54-
"securitygroupenabled": "true",
53+
],
54+
"securitygroupenabled": "true",
5555
"ipranges": [
5656
{
57-
"startip": "10.147.31.150",
58-
"endip": "10.147.31.159",
59-
"netmask": "255.255.255.0",
60-
"vlan": "31",
57+
"startip": "10.147.31.150",
58+
"endip": "10.147.31.159",
59+
"netmask": "255.255.255.0",
60+
"vlan": "31",
6161
"gateway": "10.147.31.1"
6262
}
63-
],
64-
"networktype": "Advanced",
63+
],
64+
"networktype": "Advanced",
6565
"pods": [
6666
{
67-
"endip": "10.147.29.159",
68-
"name": "POD0",
69-
"startip": "10.147.29.150",
70-
"netmask": "255.255.255.0",
67+
"endip": "10.147.29.159",
68+
"name": "POD0",
69+
"startip": "10.147.29.150",
70+
"netmask": "255.255.255.0",
7171
"clusters": [
7272
{
73-
"clustername": "C0",
74-
"hypervisor": "Simulator",
73+
"clustername": "C0",
74+
"hypervisor": "Simulator",
7575
"hosts": [
7676
{
77-
"username": "root",
78-
"url": "http://simulator0",
77+
"username": "root",
78+
"url": "http://simulator0",
7979
"password": "password"
8080
}
81-
],
82-
"clustertype": "CloudManaged",
81+
],
82+
"clustertype": "CloudManaged",
8383
"primaryStorages": [
8484
{
85-
"url": "nfs://10.147.28.6:/export/home/sandbox/primary",
85+
"url": "nfs://10.147.28.6:/export/home/sandbox/primary",
8686
"name": "PS0"
8787
}
8888
]
8989
}
90-
],
90+
],
9191
"gateway": "10.147.29.1"
9292
}
93-
],
94-
"internaldns1": "10.147.28.6",
93+
],
94+
"internaldns1": "10.147.28.6",
9595
"secondaryStorages": [
9696
{
9797
"url": "nfs://10.147.28.6:/export/home/sandbox/sstor",
9898
"provider" : "NFS"
9999
}
100100
]
101101
}
102-
],
102+
],
103103
"dbSvr": {
104-
"dbSvr": "localhost",
105-
"passwd": "cloud",
106-
"db": "cloud",
107-
"port": 3306,
104+
"dbSvr": "localhost",
105+
"passwd": "cloud",
106+
"db": "cloud",
107+
"port": 3306,
108108
"user": "cloud"
109109
},
110-
"logger":
110+
"logger":
111111
{
112112
"LogFolderPath": "/tmp"
113113
},
114114
"globalConfig": [
115115
{
116-
"name": "storage.cleanup.interval",
116+
"name": "storage.cleanup.interval",
117117
"value": "300"
118-
},
118+
},
119119
{
120-
"name": "direct.agent.load.size",
120+
"name": "direct.agent.load.size",
121121
"value": "1000"
122-
},
122+
},
123123
{
124-
"name": "default.page.size",
124+
"name": "default.page.size",
125125
"value": "10000"
126-
},
126+
},
127127
{
128-
"name": "instance.name",
128+
"name": "instance.name",
129129
"value": "QA"
130-
},
130+
},
131131
{
132-
"name": "workers",
132+
"name": "workers",
133133
"value": "10"
134-
},
134+
},
135135
{
136-
"name": "vm.op.wait.interval",
136+
"name": "vm.op.wait.interval",
137137
"value": "5"
138-
},
138+
},
139139
{
140-
"name": "account.cleanup.interval",
140+
"name": "account.cleanup.interval",
141141
"value": "600"
142-
},
142+
},
143143
{
144-
"name": "guest.domain.suffix",
144+
"name": "guest.domain.suffix",
145145
"value": "sandbox.simulator"
146-
},
146+
},
147147
{
148-
"name": "expunge.delay",
148+
"name": "expunge.delay",
149149
"value": "60"
150-
},
150+
},
151151
{
152-
"name": "vm.allocation.algorithm",
152+
"name": "vm.allocation.algorithm",
153153
"value": "random"
154-
},
154+
},
155155
{
156-
"name": "expunge.interval",
156+
"name": "expunge.interval",
157157
"value": "60"
158-
},
158+
},
159159
{
160-
"name": "expunge.workers",
160+
"name": "expunge.workers",
161161
"value": "3"
162-
},
162+
},
163163
{
164-
"name": "secstorage.allowed.internal.sites",
164+
"name": "secstorage.allowed.internal.sites",
165165
"value": "10.147.28.0/24"
166-
},
166+
},
167167
{
168-
"name": "check.pod.cidrs",
168+
"name": "check.pod.cidrs",
169169
"value": "true"
170170
}
171-
],
171+
],
172172
"mgtSvr": [
173173
{
174-
"mgtSvrIp": "localhost",
175-
"passwd": "password",
176-
"user": "root",
174+
"mgtSvrIp": "localhost",
175+
"passwd": "password",
176+
"user": "root",
177177
"port": 8096
178178
}
179179
]

‎setup/dev/basic.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
"port": 3306,
109109
"user": "cloud"
110110
},
111-
"logger":
111+
"logger":
112112
{
113113
"LogFolderPath": "/tmp"
114114
},

0 commit comments

Comments
 (0)