Sync precommit config from main (#7732)

Co-authored-by: John Bampton <jbampton@users.noreply.github.com>
Co-authored-by: dahn <daan@onecht.net>
This commit is contained in:
Vishesh 2023-07-07 14:48:16 +05:30 committed by GitHub
parent 939ee9e153
commit 594c70dde0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
663 changed files with 636 additions and 677 deletions

View File

@ -26,17 +26,18 @@ repos:
- id: identity
- id: check-hooks-apply
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.1.0
rev: v4.4.0
hooks:
#- id: check-added-large-files
#- id: check-case-conflict
- id: check-case-conflict
#- id: check-executables-have-shebangs
#- id: check-merge-conflict
#- id: check-vcs-permalinks
- id: check-vcs-permalinks
#- id: check-yaml
#- id: detect-private-key
#- id: end-of-file-fixer
- id: end-of-file-fixer
files: \.(java|md|py|txt|yaml|yml)$
#- id: fix-byte-order-marker
- id: mixed-line-ending
files: \.(java|py)$
files: \.(java|md|py|txt|yaml|yml)$
# - id: trailing-whitespace

View File

@ -81,4 +81,4 @@ public class Answer extends Command {
result1 = 31 * result1 + (details != null ? details.hashCode() : 0);
return result1;
}
}
}

View File

@ -110,4 +110,4 @@ public class DatadiskTO {
public String getConfiguration() {
return configuration;
}
}
}

View File

@ -42,4 +42,4 @@ public class DpdkTO {
public String getMode() {
return mode;
}
}
}

View File

@ -61,4 +61,4 @@ public class OVFConfigurationTO implements TemplateDeployAsIsInformationTO {
public int getIndex() {
return index;
}
}
}

View File

@ -121,4 +121,4 @@ public class OVFNetworkTO implements TemplateDeployAsIsInformationTO {
public void setNetworkDescription(String networkDescription) {
this.networkDescription = networkDescription;
}
}
}

View File

@ -368,4 +368,4 @@ public class OVFVirtualHardwareItemTO implements TemplateDeployAsIsInformationTO
public void setWeight(int weight) {
this.weight = weight;
}
}
}

View File

@ -47,4 +47,4 @@ public class OVFVirtualHardwareSectionTO implements TemplateDeployAsIsInformatio
public String getMinimiumHardwareVersion() {
return minimiumHardwareVersion;
}
}
}

View File

@ -18,4 +18,4 @@ package com.cloud.deploy;
public interface HAPlanner extends DeploymentPlanner {
}
}

View File

@ -25,4 +25,4 @@ import com.cloud.network.rules.FirewallRule;
public interface NetworkRuleApplier {
public boolean applyRules(Network network, FirewallRule.Purpose purpose, List<? extends FirewallRule> rules) throws ResourceUnavailableException;
}
}

View File

@ -19,4 +19,4 @@ package com.cloud.network.rules;
public interface StaticNatRule extends FirewallRule {
String getDestIpAddress();
}
}

View File

@ -62,4 +62,4 @@ public class DiskOfferingInfo {
public Long getMaxIops() {
return _maxIops;
}
}
}

View File

@ -143,4 +143,4 @@ public interface RollingMaintenanceManager extends Configurable {
*/
Ternary<Boolean, String, Pair<List<HostUpdated>, List<HostSkipped>>> startRollingMaintenance(StartRollingMaintenanceCmd cmd);
Pair<ResourceType, List<Long>> getResourceTypeIdPair(StartRollingMaintenanceCmd cmd);
}
}

View File

@ -85,4 +85,4 @@ public interface AffinityGroupProcessor extends Adapter {
void handleDeleteGroup(AffinityGroup group);
}
}

View File

@ -22,4 +22,4 @@ import java.util.List;
public interface PluggableAPIAuthenticator extends Adapter {
public List<Class<?>> getAuthCommands();
}
}

View File

@ -89,4 +89,4 @@ public class AcquirePodIpCmdByAdmin extends BaseCmd {
return CallContext.current().getCallingAccount().getAccountId();
}
}
}

View File

@ -75,4 +75,4 @@ public class ReleasePodIpCmdByAdmin extends BaseCmd {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to release Pod ip ");
}
}
}
}

View File

@ -113,5 +113,3 @@ public class UploadTemplateDirectDownloadCertificateCmd extends BaseCmd {
return CallContext.current().getCallingAccount().getId();
}
}

View File

@ -24,4 +24,3 @@ import org.apache.cloudstack.api.response.TemplateResponse;
@APICommand(name = "copyTemplate", description = "Copies a template from one zone to another.", responseObject = TemplateResponse.class, responseView = ResponseView.Full,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CopyTemplateCmdByAdmin extends CopyTemplateCmd {}

View File

@ -28,4 +28,4 @@ public interface IListFirewallRulesCmd extends IBaseListTaggedResourcesCmd {
Long getId();
Long getNetworkId();
}
}

View File

@ -158,4 +158,4 @@ public class GetUploadParamsForIsoCmd extends AbstractGetUploadParamsCmd {
}
return accountId;
}
}
}

View File

@ -106,4 +106,4 @@ public class MoveNetworkAclItemCmd extends BaseAsyncCustomIdCmd {
public ApiCommandResourceType getApiResourceType() {
return ApiCommandResourceType.NetworkAclItem;
}
}
}

View File

@ -110,4 +110,4 @@ public class AcquirePodIpCmdResponse extends BaseResponse {
this.id = id;
}
}
}

View File

@ -57,4 +57,4 @@ public class HostTagResponse extends BaseResponse {
public void setName(String name) {
this.name = name;
}
}
}

View File

@ -156,4 +156,4 @@ public class ImageStoreResponse extends BaseResponseWithAnnotations {
public void setDiskSizeUsed(Long diskSizeUsed) {
this.diskSizeUsed = diskSizeUsed;
}
}
}

View File

@ -61,4 +61,4 @@ public class RolePermissionResponse extends BaseRolePermissionResponse {
public void setRoleName(String roleName) {
this.roleName = roleName;
}
}
}

View File

@ -76,4 +76,4 @@ public class RollingMaintenanceResponse extends BaseResponse {
public void setSkippedHosts(List<RollingMaintenanceHostSkippedResponse> skippedHosts) {
this.skippedHosts = skippedHosts;
}
}
}

View File

@ -231,4 +231,4 @@ public class SnapshotResponse extends BaseResponseWithTagInformation implements
public void setVirtualSize(long virtualSize) {
this.virtualSize = virtualSize;
}
}
}

View File

@ -144,4 +144,4 @@ public class StatsResponse extends BaseResponse {
this.diskIopsTotal += diskIo;
}
}
}
}

View File

@ -55,4 +55,4 @@ public class UnmanageVMInstanceResponse extends BaseResponse {
public void setDetails(String details) {
this.details = details;
}
}
}

View File

@ -299,4 +299,4 @@ public class LogContext {
.append("]")
.toString();
}
}
}

View File

@ -30,4 +30,4 @@ public interface DiagnosticsService {
Map<String, String> runDiagnosticsCommand(RunDiagnosticsCmd cmd);
String getDiagnosticsDataCommand(GetDiagnosticsDataCmd getDiagnosticsDataCmd);
}
}

View File

@ -39,4 +39,4 @@ public enum DiagnosticsType {
}
return null;
}
}
}

View File

@ -27,4 +27,4 @@ public interface DirectDownloadCertificate extends InternalIdentity, Identity {
Hypervisor.HypervisorType getHypervisorType();
Long getZoneId();
}
}

View File

@ -27,4 +27,4 @@ public interface ManagementServerHostPeer extends InternalIdentity {
long getPeerRunid();
ManagementServerHost.State getPeerState();
Date getLastUpdateTime();
}
}

View File

@ -33,4 +33,4 @@ public interface CertService {
public List<SslCertResponse> listSslCerts(ListSslCertsCmd listSslCertCmd);
public Certificate parseCertificate(final String cert);
}
}

View File

@ -24,4 +24,4 @@ public interface UnmanageVMService {
* @return true if the VM is successfully unmanaged, false if not.
*/
boolean unmanageVMInstance(long vmId);
}
}

View File

@ -26,4 +26,4 @@ public interface UnmanagedVMsManager extends VmImportService, UnmanageVMService,
ConfigKey<Boolean> UnmanageVMPreserveNic = new ConfigKey<>("Advanced", Boolean.class, "unmanage.vm.preserve.nics", "false",
"If set to true, do not remove VM nics (and its MAC addresses) when unmanaging a VM, leaving them allocated but not reserved. " +
"If set to false, nics are removed and MAC addresses can be reassigned", true, ConfigKey.Scope.Zone);
}
}

View File

@ -173,4 +173,4 @@ public class LoadBalancerTOTest {
List<LoadBalancerTO.AutoScalePolicyTO> policies = vmGroup.getPolicies();
Assert.assertEquals(2, policies.size());
}
}
}

View File

@ -52,4 +52,4 @@ public class AutoScalePolicyTest {
public void testInvalidAction() {
AutoScalePolicy.Action action = AutoScalePolicy.Action.fromValue("invalid");
}
}
}

View File

@ -48,4 +48,4 @@ public class AutoScaleVmGroupTest {
public void testInvalidState() {
testAutoScaleVmGroupState("invalid");
}
}
}

View File

@ -97,4 +97,4 @@ public class RoleTypeTest {
Mockito.when(role.getId()).thenReturn(100L);
Assert.assertEquals(RoleType.getAccountTypeByRole(role, null), RoleType.Admin.getAccountType());
}
}
}

View File

@ -95,4 +95,4 @@ public class RuleTest {
}
}
}
}
}

View File

@ -60,4 +60,4 @@ public class FindStoragePoolsForMigrationCmdTest {
}
}
}

View File

@ -75,4 +75,4 @@ public class UpdateVlanIpRangeCmdTest extends TestCase {
}
}
}
}

View File

@ -32,4 +32,4 @@ public class CreateZoneCmdTest {
ReflectionTestUtils.setField(createZoneCmd, "isEdge", true);
Assert.assertTrue("true value for isedge param value for API should return true", createZoneCmd.isEdge());
}
}
}

View File

@ -334,4 +334,4 @@ public class CreateNetworkCmdTest {
Assert.fail("Should successfully create the network");
}
}
}
}

View File

@ -189,4 +189,4 @@ public class UpdateNetworkCmdTest {
Assert.assertEquals(response, actualResponse);
}
}
}

View File

@ -43,4 +43,4 @@ public class CreateSnapshotPolicyCmdTest {
ReflectionTestUtils.setField(createSnapshotPolicyCmd, "tags", tagsParams);
Assert.assertEquals(createSnapshotPolicyCmd.getTags(), expectedTags);
}
}
}

View File

@ -74,4 +74,3 @@ public class CopyTemplateCmdByAdminTest{
}

View File

@ -72,4 +72,3 @@ public class CopyTemplateCmdTest{
}

View File

@ -162,4 +162,4 @@ public class CreateVPCCmdTest extends TestCase {
cmd.execute();
Mockito.verify(_vpcService, Mockito.times(1)).startVpc(Mockito.anyLong(), Mockito.anyBoolean());
}
}
}

View File

@ -91,4 +91,4 @@ public class UpdateVPCCmdTest extends TestCase {
Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyInt());
}
}
}

View File

@ -132,4 +132,4 @@ public class StatsResponseTest {
Assert.assertEquals(expectedNetworkKbsWrite, statsResponseMock.networkKbsWrite);
Assert.assertEquals(expectedNetworkWrite, statsResponseMock.networkWrite);
}
}
}

View File

@ -80,4 +80,4 @@ public class CallContextTest {
Assert.assertEquals("current context map should have exactly three entries", 3, currentContext.getContextParameters().size());
}
}
}

View File

@ -67,4 +67,4 @@ public class CheckRouterAnswer extends Answer {
public RedundantState getState() {
return state;
}
}
}

View File

@ -24,4 +24,4 @@ public class CleanupPersistentNetworkResourceAnswer extends Answer {
public CleanupPersistentNetworkResourceAnswer(CleanupPersistentNetworkResourceCommand cmd, boolean success, String result) {
super(cmd, success, result);
}
}
}

View File

@ -40,4 +40,4 @@ public class CleanupPersistentNetworkResourceCommand extends Command {
public boolean executeInSequence() {
return false;
}
}
}

View File

@ -40,4 +40,4 @@ public class GetGPUStatsAnswer extends Answer {
public HashMap<String, HashMap<String, VgpuTypesInfo>> getGroupDetails() {
return groupDetails;
}
}
}

View File

@ -73,4 +73,4 @@ public class GetVmConfigAnswer extends Answer {
public boolean executeInSequence() {
return false;
}
}
}

View File

@ -72,4 +72,4 @@ public class GetVolumeStatsCommand extends Command {
public String getString() {
return "GetVolumeStatsCommand [volumeUuids=" + volumeUuids + ", poolType=" + poolType + ", poolUuid=" + poolUuid + "]";
}
}
}

View File

@ -24,4 +24,4 @@ public class PrepareUnmanageVMInstanceAnswer extends Answer {
public PrepareUnmanageVMInstanceAnswer(PrepareUnmanageVMInstanceCommand cmd, boolean result, String details) {
super(cmd, result, details);
}
}
}

View File

@ -36,4 +36,4 @@ public class PrepareUnmanageVMInstanceCommand extends Command {
public boolean executeInSequence() {
return false;
}
}
}

View File

@ -60,4 +60,4 @@ public class UpdateHostPasswordCommand extends Command {
public boolean executeInSequence() {
return false;
}
}
}

View File

@ -189,4 +189,4 @@ public class VmStatsEntryBase implements VmStats {
this.entityType = entityType;
}
}
}

View File

@ -62,4 +62,4 @@ public class GetAutoScaleMetricsCommand extends Command {
public boolean executeInSequence() {
return false;
}
}
}

View File

@ -41,4 +41,4 @@ public class GetRouterMonitorResultsCommand extends NetworkElementCommand {
public boolean shouldValidateBasicTestsOnly() {
return validateBasicTestsOnly;
}
}
}

View File

@ -41,4 +41,3 @@ public class SetPortForwardingRulesCommand extends NetworkElementCommand {
return rules;
}
}

View File

@ -131,4 +131,4 @@ public class SiteLoadBalancerConfig {
return weight;
}
}
}

View File

@ -35,4 +35,4 @@ public class CreateDatadiskTemplateAnswer extends Answer {
public CreateDatadiskTemplateAnswer(String errMsg) {
super(null, false, errMsg);
}
}
}

View File

@ -74,4 +74,4 @@ public final class CreateDatadiskTemplateCommand extends Command {
return ReflectionToStringBuilder.toString(this, ToStringStyle.SIMPLE_STYLE);
}
}
}

View File

@ -37,4 +37,4 @@ public class GetDatadisksAnswer extends Answer {
public GetDatadisksAnswer(String errMsg) {
super(null, false, errMsg);
}
}
}

View File

@ -45,4 +45,4 @@ public final class GetDatadisksCommand extends Command {
public String getConfigurationId() {
return configurationId;
}
}
}

View File

@ -47,4 +47,4 @@ public class MigrateVolumeAnswer extends Answer {
public String getVolumeChainInfo() {
return volumeChain;
}
}
}

View File

@ -81,4 +81,4 @@ public class VRScripts {
public static final String VR_UPDATE_INTERFACE_CONFIG = "update_interface_config.sh";
public static final String ROUTER_FILESYSTEM_WRITABLE_CHECK = "filesystem_writable_check.py";
}
}

View File

@ -36,4 +36,4 @@ public class BumpUpPriorityConfigItem extends AbstractConfigItemFacade {
return cfg;
}
}
}

View File

@ -54,4 +54,4 @@ public class CreateIpAliasConfigItem extends AbstractConfigItemFacade {
return super.generateConfigItems(configuration);
}
}
}

View File

@ -61,4 +61,4 @@ public class DeleteIpAliasConfigItem extends AbstractConfigItemFacade {
return super.generateConfigItems(configuration);
}
}
}

View File

@ -46,4 +46,4 @@ public class DhcpEntryConfigItem extends AbstractConfigItemFacade {
return super.generateConfigItems(configuration);
}
}
}

View File

@ -53,4 +53,4 @@ public class DnsMasqConfigItem extends AbstractConfigItemFacade {
return super.generateConfigItems(configuration);
}
}
}

View File

@ -71,4 +71,4 @@ public class LoadBalancerConfigItem extends AbstractConfigItemFacade {
return super.generateConfigItems(configuration);
}
}
}

View File

@ -45,4 +45,4 @@ public class RemoteAccessVpnConfigItem extends AbstractConfigItemFacade {
return super.generateConfigItems(configuration);
}
}
}

View File

@ -44,4 +44,4 @@ public class SavePasswordConfigItem extends AbstractConfigItemFacade {
return super.generateConfigItems(configuration);
}
}
}

View File

@ -55,4 +55,4 @@ public class SetFirewallRulesConfigItem extends AbstractConfigItemFacade{
return super.generateConfigItems(configuration);
}
}
}

View File

@ -85,4 +85,4 @@ public class SetGuestNetworkConfigItem extends AbstractConfigItemFacade {
return super.generateConfigItems(configuration);
}
}
}

View File

@ -57,4 +57,4 @@ public class SetIpv6FirewallRulesConfigItem extends AbstractConfigItemFacade{
return super.generateConfigItems(configuration);
}
}
}

View File

@ -79,4 +79,4 @@ public class SetMonitorServiceConfigItem extends AbstractConfigItemFacade {
return super.generateConfigItems(configuration);
}
}
}

View File

@ -56,4 +56,4 @@ public class SetPortForwardingRulesConfigItem extends AbstractConfigItemFacade {
return super.generateConfigItems(configuration);
}
}
}

View File

@ -30,4 +30,4 @@ public class SetPortForwardingRulesVpcConfigItem extends SetPortForwardingRulesC
public List<ConfigItem> generateConfig(final NetworkElementCommand cmd) {
return super.generateConfig(cmd);
}
}
}

View File

@ -51,4 +51,4 @@ public class SetSourceNatConfigItem extends AbstractConfigItemFacade {
protected List<ConfigItem> generateConfigItems(final ConfigBase configuration) {
return null;
}
}
}

View File

@ -53,4 +53,4 @@ public class SetStaticNatRulesConfigItem extends AbstractConfigItemFacade {
return super.generateConfigItems(configuration);
}
}
}

View File

@ -58,4 +58,4 @@ public class SetStaticRouteConfigItem extends AbstractConfigItemFacade {
return super.generateConfigItems(configuration);
}
}
}

View File

@ -46,4 +46,4 @@ public class Site2SiteVpnConfigItem extends AbstractConfigItemFacade {
return super.generateConfigItems(configuration);
}
}
}

View File

@ -45,4 +45,4 @@ public class VmDataConfigItem extends AbstractConfigItemFacade {
return super.generateConfigItems(configuration);
}
}
}

View File

@ -51,4 +51,4 @@ public class VpnUsersConfigItem extends AbstractConfigItemFacade {
return super.generateConfigItems(configuration);
}
}
}

View File

@ -57,4 +57,4 @@ public abstract class AclRule {
+ "Ingress:icmp:8:-1:192.168.3.0/24:ACCEPT:,"
+ "Ingress:udp:8080:8081:192.168.2.0/24:ACCEPT:,"
+ "Ingress:tcp:22:22:192.168.1.0/24:ACCEPT:,","type":"networkacl"}
*/
*/

View File

@ -39,4 +39,4 @@ public class FirewallRules extends ConfigBase {
this.rules = rules;
}
}
}

View File

@ -202,4 +202,4 @@ public class GuestNetwork extends ConfigBase {
public Integer getMtu() {
return mtu;
}
}
}

View File

@ -101,4 +101,4 @@ public class LoadBalancerRule {
public void setRouterIp(final String routerIp) {
this.routerIp = routerIp;
}
}
}

View File

@ -40,4 +40,4 @@ public class LoadBalancerRules extends ConfigBase {
public void setRules(final List<LoadBalancerRule> rules) {
this.rules = rules;
}
}
}

Some files were not shown because too many files have changed in this diff Show More