Skip to content

Commit ef08967

Browse files
committed
pre-commit upgrade codespell and fix spelling
1 parent 576b97b commit ef08967

File tree

53 files changed

+126
-105
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+126
-105
lines changed

.github/linters/codespell.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ aqcuire
3535
aqcuired
3636
aquire
3737
aquiring
38+
assertin
3839
assiciate
3940
assigne
4041
assoication
@@ -65,6 +66,7 @@ bject
6566
boardcast
6667
bootstraper
6768
bu
69+
callin
6870
cant
6971
capabilites
7072
capablity
@@ -73,6 +75,7 @@ carrefully
7375
cavaet
7476
chaing
7577
checkd
78+
checkin
7679
childs
7780
choosen
7881
chould
@@ -165,6 +168,7 @@ disover
165168
dissapper
166169
dissassociated
167170
divice
171+
dockin
168172
doesn'
169173
doesnot
170174
doesnt
@@ -195,6 +199,7 @@ excption
195199
excute
196200
execept
197201
execption
202+
exects
198203
execut
199204
executeable
200205
exeeded
@@ -237,6 +242,7 @@ hanling
237242
happend
238243
hasing
239244
hasnt
245+
havin
240246
hda
241247
hostanme
242248
hould
@@ -325,6 +331,7 @@ nin
325331
nodel
326332
nome
327333
noone
334+
notin
328335
nowe
329336
numbe
330337
numer
@@ -417,6 +424,7 @@ returing
417424
re-use
418425
rever
419426
rocessor
427+
roperty
420428
runing
421429
runnign
422430
sate
@@ -479,6 +487,7 @@ therefor
479487
theres
480488
theses
481489
thi
490+
thirdparty
482491
thorugh
483492
throught
484493
ths

.pre-commit-config.yaml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,22 @@ repos:
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
66-
rev: v2.2.6
66+
rev: v2.4.1
6767
hooks:
6868
- id: codespell
6969
name: run codespell
7070
description: Check spelling with codespell
7171
args: [--ignore-words=.github/linters/codespell.txt]
72-
exclude: ^ui/package\.json$|^ui/package-lock\.json$|^ui/public/js/less\.min\.js$|^ui/public/locales/.*[^n].*\.json$
72+
exclude: |
73+
(?x)^(
74+
systemvm/agent/noVNC/app/locale/.*\.json|
75+
systemvm/agent/noVNC/po/.*|
76+
tools/eclipse/eclipse.epf|
77+
ui/package\.json|
78+
ui/package-lock\.json|
79+
ui/public/js/less\.min\.js|
80+
ui/public/locales/.*[^n].*\.json
81+
)$
7382
- repo: https://github.com/pycqa/flake8
7483
rev: 7.0.0
7584
hooks:

agent/src/main/java/com/cloud/agent/properties/AgentProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public class AgentProperties{
117117

118118
/**
119119
* Local storage path.<br>
120-
* This property allows multiple values to be entered in a single String. The differente values must be separated by commas.<br>
120+
* This property allows multiple values to be entered in a single String. The different values must be separated by commas.<br>
121121
* Data type: String.<br>
122122
* Default value: <code>/var/lib/libvirt/images/</code>
123123
*/
@@ -134,7 +134,7 @@ public class AgentProperties{
134134

135135
/**
136136
* MANDATORY: The UUID for the local storage pool.<br>
137-
* This property allows multiple values to be entered in a single String. The differente values must be separated by commas.<br>
137+
* This property allows multiple values to be entered in a single String. The different values must be separated by commas.<br>
138138
* Data type: String.<br>
139139
* Default value: <code>null</code>
140140
*/

api/src/main/java/com/cloud/storage/Storage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public static enum FileSystem {
127127
public static enum TemplateType {
128128
ROUTING, // Router template
129129
SYSTEM, /* routing, system vm template */
130-
BUILTIN, /* buildin template */
130+
BUILTIN, /* builtin template */
131131
PERHOST, /* every host has this template, don't need to install it in secondary storage */
132132
USER, /* User supplied template/iso */
133133
VNF, /* VNFs (virtual network functions) template */

core/src/main/java/com/cloud/storage/resource/StorageProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import org.apache.cloudstack.agent.directdownload.DirectDownloadCommand;
2323
import org.apache.cloudstack.storage.command.AttachCommand;
24-
import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplainceCommand;
24+
import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplianceCommand;
2525
import org.apache.cloudstack.storage.command.CopyCommand;
2626
import org.apache.cloudstack.storage.command.CreateObjectCommand;
2727
import org.apache.cloudstack.storage.command.DeleteCommand;
@@ -82,7 +82,7 @@ public interface StorageProcessor {
8282

8383
Answer copyVolumeFromPrimaryToPrimary(CopyCommand cmd);
8484

85-
public Answer checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplainceCommand cmd);
85+
public Answer checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplianceCommand cmd);
8686

8787
public Answer syncVolumePath(SyncVolumePathCommand cmd);
8888
}

core/src/main/java/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import org.apache.cloudstack.agent.directdownload.DirectDownloadCommand;
2323
import org.apache.cloudstack.storage.command.AttachCommand;
24-
import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplainceCommand;
24+
import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplianceCommand;
2525
import org.apache.cloudstack.storage.command.CopyCommand;
2626
import org.apache.cloudstack.storage.command.CreateObjectAnswer;
2727
import org.apache.cloudstack.storage.command.CreateObjectCommand;
@@ -79,8 +79,8 @@ public Answer handleStorageCommands(StorageSubSystemCommand command) {
7979
return processor.resignature((ResignatureCommand) command);
8080
} else if (command instanceof DirectDownloadCommand) {
8181
return processor.handleDownloadTemplateToPrimaryStorage((DirectDownloadCommand) command);
82-
} else if (command instanceof CheckDataStoreStoragePolicyComplainceCommand) {
83-
return processor.checkDataStoreStoragePolicyCompliance((CheckDataStoreStoragePolicyComplainceCommand) command);
82+
} else if (command instanceof CheckDataStoreStoragePolicyComplianceCommand) {
83+
return processor.checkDataStoreStoragePolicyCompliance((CheckDataStoreStoragePolicyComplianceCommand) command);
8484
} else if (command instanceof SyncVolumePathCommand) {
8585
return processor.syncVolumePath((SyncVolumePathCommand) command);
8686
} else if (command instanceof QuerySnapshotZoneCopyCommand) {
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121

2222
import com.cloud.agent.api.to.StorageFilerTO;
2323

24-
public class CheckDataStoreStoragePolicyComplainceCommand extends StorageSubSystemCommand {
24+
public class CheckDataStoreStoragePolicyComplianceCommand extends StorageSubSystemCommand {
2525

2626
String storagePolicyId;
2727
private StorageFilerTO storagePool;
2828

29-
public CheckDataStoreStoragePolicyComplainceCommand(String storagePolicyId, StorageFilerTO storagePool) {
29+
public CheckDataStoreStoragePolicyComplianceCommand(String storagePolicyId, StorageFilerTO storagePool) {
3030
super();
3131

3232
this.storagePolicyId = storagePolicyId;

engine/components-api/src/main/java/com/cloud/storage/StorageManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ public interface StorageManager extends StorageService {
222222

223223
/**
224224
* should we execute in sequence not involving any storages?
225-
* @return tru if commands should execute in sequence
225+
* @return true if commands should execute in sequence
226226
*/
227227
static boolean shouldExecuteInSequenceOnVmware() {
228228
return shouldExecuteInSequenceOnVmware(null, null);

engine/components-api/src/main/java/com/cloud/vm/snapshot/VMSnapshotManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public interface VMSnapshotManager extends VMSnapshotService, Manager {
4242
boolean deleteAllVMSnapshots(long id, VMSnapshot.Type type);
4343

4444
/**
45-
* Sync VM snapshot state when VM snapshot in reverting or snapshoting or expunging state
45+
* Sync VM snapshot state when VM snapshot in reverting or snapshotting or expunging state
4646
* Used for fullsync after agent connects
4747
*
4848
* @param vm, the VM in question

engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ protected boolean filter(ExcludeList avoid, StoragePool pool, DiskProfile dskCh,
356356
return false;
357357
}
358358
} catch (StorageUnavailableException e) {
359-
logger.warn(String.format("Could not verify storage policy complaince against storage pool %s due to exception %s", pool.getUuid(), e.getMessage()));
359+
logger.warn(String.format("Could not verify storage policy compliance against storage pool %s due to exception %s", pool.getUuid(), e.getMessage()));
360360
return false;
361361
}
362362
}

0 commit comments

Comments
 (0)