Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 7 additions & 37 deletions .github/linters/codespell.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,8 @@ afrer
afterall
againt
ags
aktive
algoritm
allo
alloacate
allocted
alocation
alogrithm
Expand Down Expand Up @@ -65,6 +63,7 @@ bject
boardcast
bootstraper
bu
callin
cant
capabilites
capablity
Expand All @@ -73,6 +72,7 @@ carrefully
cavaet
chaing
checkd
checkin
childs
choosen
chould
Expand All @@ -93,17 +93,14 @@ confg
configruation
configuable
conneciton
connexion
constrait
constraits
containg
contex
continuesly
contro
controler
controles
controll
convienient
convinience
coputer
correcponding
Expand Down Expand Up @@ -158,13 +155,13 @@ differnet
differnt
direcotry
directroy
disale
disbale
discrepency
disover
dissapper
dissassociated
divice
dockin
doesn'
doesnot
doesnt
Expand All @@ -175,7 +172,6 @@ eanbled
earch
ect
elemnt
eles
elments
emmited
enble
Expand All @@ -188,24 +184,21 @@ environmnet
equivalant
erro
erronous
everthing
everytime
excetion
excption
excute
execept
execption
exects
execut
executeable
exeeded
exisitng
exisits
existin
existsing
exitting
expcted
expection
explaination
explicitely
faield
faild
Expand All @@ -218,7 +211,6 @@ fillled
findout
fisrt
fo
folowing
fowarding
frist
fro
Expand All @@ -237,6 +229,7 @@ hanling
happend
hasing
hasnt
havin
hda
hostanme
hould
Expand All @@ -256,18 +249,13 @@ implmeneted
implmentation
incase
includeing
incosistency
indecates
indien
infor
informations
informaton
infrastrcuture
ingore
inital
initalize
initator
initilization
inspite
instace
instal
Expand All @@ -287,12 +275,8 @@ ist
klunky
lable
leve
lief
limite
linke
listner
lokal
lokales
maintainence
maintenace
maintenence
Expand All @@ -301,7 +285,6 @@ mambers
manaully
manuel
maxium
mehtod
mergable
mesage
messge
Expand All @@ -311,7 +294,6 @@ minumum
mis
modifers
mor
mot
mulitply
multipl
multple
Expand All @@ -325,7 +307,7 @@ nin
nodel
nome
noone
nowe
notin
numbe
numer
occured
Expand Down Expand Up @@ -392,11 +374,9 @@ remaning
remore
remvoing
renabling
repeatly
reponse
reqest
reqiured
requieres
requried
reserv
reserverd
Expand All @@ -417,14 +397,13 @@ returing
re-use
rever
rocessor
roperty
runing
runnign
sate
scalled
scipt
scirpt
scrip
seconadry
seconday
seesion
sepcified
Expand All @@ -437,12 +416,10 @@ settig
sevices
shoul
shoule
sie
signle
simplier
singature
skiping
snaphsot
snpashot
specied
specifed
Expand All @@ -453,7 +430,6 @@ standy
statics
stickyness
stil
stip
storeage
strat
streched
Expand All @@ -462,7 +438,6 @@ succesfull
successfull
suceessful
suces
sucessfully
suiteable
suppots
suppport
Expand Down Expand Up @@ -495,22 +470,19 @@ uncompressible
uneccessarily
unexepected
unexpect
unknow
unkonw
unkown
unneccessary
unparseable
unrecoginized
unsupport
unxpected
updat
uptodate
usera
usign
usin
utlization
vaidate
valiate
valule
valus
varibles
Expand All @@ -519,8 +491,6 @@ verfying
verifing
virutal
visable
wakup
wil
wit
wll
wth
26 changes: 26 additions & 0 deletions .github/linters/gitleaks.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

# gitleaks.toml
[allowlist]
description = "Global allow list for Gitleaks"
paths = [
'''gitleaks\.toml''',
'''server/src/test/java/org/apache/cloudstack/network/ssl/CertServiceTest\.java''',
'''test/integration/smoke/test_ssl_offloading\.py''',
'''utils/src/test/java/com/cloud/utils/StringUtilsTest\.java'''
]
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ repos:
- id: gitleaks
name: run gitleaks
description: detect hardcoded secrets
args: [-c=.github/linters/gitleaks.toml]
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0
hooks:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public class AgentProperties{

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

/**
* MANDATORY: The UUID for the local storage pool.<br>
* This property allows multiple values to be entered in a single String. The differente values must be separated by commas.<br>
* This property allows multiple values to be entered in a single String. The different values must be separated by commas.<br>
* Data type: String.<br>
* Default value: <code>null</code>
*/
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/com/cloud/storage/Storage.java
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public static enum FileSystem {
public static enum TemplateType {
ROUTING, // Router template
SYSTEM, /* routing, system vm template */
BUILTIN, /* buildin template */
BUILTIN, /* builtin template */
PERHOST, /* every host has this template, don't need to install it in secondary storage */
USER, /* User supplied template/iso */
VNF, /* VNFs (virtual network functions) template */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import org.apache.cloudstack.agent.directdownload.DirectDownloadCommand;
import org.apache.cloudstack.storage.command.AttachCommand;
import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplainceCommand;
import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplianceCommand;
import org.apache.cloudstack.storage.command.CopyCommand;
import org.apache.cloudstack.storage.command.CreateObjectCommand;
import org.apache.cloudstack.storage.command.DeleteCommand;
Expand Down Expand Up @@ -82,7 +82,7 @@ public interface StorageProcessor {

Answer copyVolumeFromPrimaryToPrimary(CopyCommand cmd);

public Answer checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplainceCommand cmd);
public Answer checkDataStoreStoragePolicyCompliance(CheckDataStoreStoragePolicyComplianceCommand cmd);

public Answer syncVolumePath(SyncVolumePathCommand cmd);
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import org.apache.cloudstack.agent.directdownload.DirectDownloadCommand;
import org.apache.cloudstack.storage.command.AttachCommand;
import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplainceCommand;
import org.apache.cloudstack.storage.command.CheckDataStoreStoragePolicyComplianceCommand;
import org.apache.cloudstack.storage.command.CopyCommand;
import org.apache.cloudstack.storage.command.CreateObjectAnswer;
import org.apache.cloudstack.storage.command.CreateObjectCommand;
Expand Down Expand Up @@ -79,8 +79,8 @@ public Answer handleStorageCommands(StorageSubSystemCommand command) {
return processor.resignature((ResignatureCommand) command);
} else if (command instanceof DirectDownloadCommand) {
return processor.handleDownloadTemplateToPrimaryStorage((DirectDownloadCommand) command);
} else if (command instanceof CheckDataStoreStoragePolicyComplainceCommand) {
return processor.checkDataStoreStoragePolicyCompliance((CheckDataStoreStoragePolicyComplainceCommand) command);
} else if (command instanceof CheckDataStoreStoragePolicyComplianceCommand) {
return processor.checkDataStoreStoragePolicyCompliance((CheckDataStoreStoragePolicyComplianceCommand) command);
} else if (command instanceof SyncVolumePathCommand) {
return processor.syncVolumePath((SyncVolumePathCommand) command);
} else if (command instanceof QuerySnapshotZoneCopyCommand) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@

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

public class CheckDataStoreStoragePolicyComplainceCommand extends StorageSubSystemCommand {
public class CheckDataStoreStoragePolicyComplianceCommand extends StorageSubSystemCommand {

String storagePolicyId;
private StorageFilerTO storagePool;

public CheckDataStoreStoragePolicyComplainceCommand(String storagePolicyId, StorageFilerTO storagePool) {
public CheckDataStoreStoragePolicyComplianceCommand(String storagePolicyId, StorageFilerTO storagePool) {
super();

this.storagePolicyId = storagePolicyId;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ public interface StorageManager extends StorageService {

/**
* should we execute in sequence not involving any storages?
* @return tru if commands should execute in sequence
* @return true if commands should execute in sequence
*/
static boolean shouldExecuteInSequenceOnVmware() {
return shouldExecuteInSequenceOnVmware(null, null);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public interface VMSnapshotManager extends VMSnapshotService, Manager {
boolean deleteAllVMSnapshots(long id, VMSnapshot.Type type);

/**
* Sync VM snapshot state when VM snapshot in reverting or snapshoting or expunging state
* Sync VM snapshot state when VM snapshot in reverting or snapshotting or expunging state
* Used for fullsync after agent connects
*
* @param vm, the VM in question
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ private void modifyDateColumnNameAndCreateNewOne(Connection conn) {
try (PreparedStatement pstmt = conn.prepareStatement(createNewColumn)) {
pstmt.execute();
} catch (SQLException e) {
String message = String.format("Unable to crate new backups' column date due to [%s].", e.getMessage());
String message = String.format("Unable to create new backups' column date due to [%s].", e.getMessage());
logger.error(message, e);
throw new CloudRuntimeException(message, e);
}
Expand Down
Loading
Loading