Remove awsapi leftovers

winterhazel · winterhazel · commit 1797cc4297d8 · 2026-07-26T21:55:35.000-03:00
diff --git a/api/src/main/java/com/cloud/configuration/ConfigurationService.java b/api/src/main/java/com/cloud/configuration/ConfigurationService.java
@@ -299,13 +299,6 @@ Vlan createVlanAndPublicIpRange(CreateVlanIpRangeCmd cmd) throws InsufficientCap
      */
     Vlan updateVlanAndPublicIpRange(UpdateVlanIpRangeCmd cmd) throws ConcurrentOperationException,
             ResourceUnavailableException, ResourceAllocationException;
-    /**
-     * Marks the account with the default zone-id.
-     *
-     * @return The new account object
-     */
-    Account markDefaultZone(String accountName, long domainId, long defaultZoneId);
-
     boolean deleteVlanIpRange(DeleteVlanIpRangeCmd cmd);
 
     Vlan dedicatePublicIpRange(DedicatePublicIpRangeCmd cmd) throws ResourceAllocationException;
diff --git a/api/src/main/java/com/cloud/event/EventTypes.java b/api/src/main/java/com/cloud/event/EventTypes.java
@@ -297,7 +297,7 @@ public class EventTypes {
     public static final String EVENT_ACCOUNT_CREATE = "ACCOUNT.CREATE";
     public static final String EVENT_ACCOUNT_DELETE = "ACCOUNT.DELETE";
     public static final String EVENT_ACCOUNT_UPDATE = "ACCOUNT.UPDATE";
-    public static final String EVENT_ACCOUNT_MARK_DEFAULT_ZONE = "ACCOUNT.MARK.DEFAULT.ZONE";
+    public static final String EVENT_ACCOUNT_MARK_DEFAULT_ZONE = "ACCOUNT.MARK.DEFAULT.ZONE"; // Not used anymore, but left for the Account entity mapping
 
     // UserVO Events
     public static final String EVENT_USER_LOGIN = "USER.LOGIN";
diff --git a/api/src/main/java/com/cloud/user/Account.java b/api/src/main/java/com/cloud/user/Account.java
@@ -87,8 +87,6 @@ public static Type getFromValue(Integer type){
 
     public String getNetworkDomain();
 
-    public Long getDefaultZoneId();
-
     @Override
     public String getUuid();
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
@@ -908,7 +908,6 @@ public class ApiConstants {
     public static final String HA_HOST = "hahost";
     public static final String CUSTOM_DISK_OFF_MIN_SIZE = "customdiskofferingminsize";
     public static final String CUSTOM_DISK_OFF_MAX_SIZE = "customdiskofferingmaxsize";
-    public static final String DEFAULT_ZONE_ID = "defaultzoneid";
     public static final String LIVE_MIGRATE = "livemigrate";
     public static final String MIGRATE_ALLOWED = "migrateallowed";
     public static final String MIGRATE_TO = "migrateto";
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/AccountResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/AccountResponse.java
@@ -67,10 +67,6 @@ public class AccountResponse extends BaseResponse implements ResourceLimitAndCou
     @Param(description = "Path of the Domain the Account belongs to", since = "4.13")
     private String domainPath;
 
-    @SerializedName(ApiConstants.DEFAULT_ZONE_ID)
-    @Param(description = "The default zone of the Account")
-    private String defaultZoneId;
-
     @SerializedName(ApiConstants.RECEIVED_BYTES)
     @Param(description = "The total number of Network traffic bytes received")
     private Long bytesReceived;
@@ -672,10 +668,6 @@ public void setObjectStorageAvailable(String objectStorageAvailable) {
         this.objectStorageAvailable = objectStorageAvailable;
     }
 
-    public void setDefaultZone(String defaultZoneId) {
-        this.defaultZoneId = defaultZoneId;
-    }
-
     public void setIsDefault(Boolean isDefault) {
         this.isDefault = isDefault;
     }
diff --git a/engine/schema/src/main/java/com/cloud/user/AccountVO.java b/engine/schema/src/main/java/com/cloud/user/AccountVO.java
@@ -71,9 +71,6 @@ public class AccountVO implements Account {
     @Column(name = "uuid")
     private String uuid;
 
-    @Column(name = "default_zone_id")
-    private Long defaultZoneId = null;
-
     @Column(name = "default")
     boolean isDefault;
 
@@ -158,15 +155,6 @@ public void setDomainId(long domainId) {
         this.domainId = domainId;
     }
 
-    @Override
-    public Long getDefaultZoneId() {
-        return defaultZoneId;
-    }
-
-    public void setDefaultZoneId(Long defaultZoneId) {
-        this.defaultZoneId = defaultZoneId;
-    }
-
     @Override
     public State getState() {
         return state;
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-42300to42400-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-42300to42400-cleanup.sql
@@ -0,0 +1,20 @@
+-- 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.
+
+--;
+-- Schema upgrade cleanup from 4.23.0.0 to 4.24.0.0
+--;
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-42300to42400.sql b/engine/schema/src/main/resources/META-INF/db/schema-42300to42400.sql
@@ -0,0 +1,28 @@
+-- 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.
+
+--;
+-- Schema upgrade from 4.23.0.0 to 4.24.0.0
+--;
+
+-- Remove leftovers from awsapi
+CALL `cloud`.`IDEMPOTENT_DROP_FOREIGN_KEY`('cloud.account','fk_account__default_zone_id');
+CALL `cloud`.`IDEMPOTENT_DROP_COLUMN`('cloud.account', 'default_zone_id');
+CALL `cloud`.`IDEMPOTENT_DROP_COLUMN`('cloud_usage.account', 'default_zone_id');
+
+DELETE FROM `cloud`.`configuration` WHERE name='enable.ec2.api';
+DELETE FROM `cloud`.`configuration` WHERE name='enable.s3.api';
diff --git a/engine/schema/src/main/resources/META-INF/db/views/cloud.account_view.sql b/engine/schema/src/main/resources/META-INF/db/views/cloud.account_view.sql
@@ -36,9 +36,6 @@ select
     `domain`.`uuid` AS `domain_uuid`,
     `domain`.`name` AS `domain_name`,
     `domain`.`path` AS `domain_path`,
-    `data_center`.`id` AS `data_center_id`,
-    `data_center`.`uuid` AS `data_center_uuid`,
-    `data_center`.`name` AS `data_center_name`,
     `account_netstats_view`.`bytesReceived` AS `bytesReceived`,
     `account_netstats_view`.`bytesSent` AS `bytesSent`,
     `vmlimit`.`max` AS `vmLimit`,
@@ -88,8 +85,6 @@ from
         inner join
     `cloud`.`domain` ON account.domain_id = domain.id
         left join
-    `cloud`.`data_center` ON account.default_zone_id = data_center.id
-        left join
     `cloud`.`account_netstats_view` ON account.id = account_netstats_view.account_id
         left join
     `cloud`.`resource_limit` vmlimit ON account.id = vmlimit.account_id
diff --git a/server/src/main/java/com/cloud/api/query/dao/AccountJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/AccountJoinDaoImpl.java
@@ -79,7 +79,6 @@ public AccountResponse newAccountResponse(ResponseView view, EnumSet<DomainDetai
         accountResponse.setState(account.getState().toString());
         accountResponse.setCreated(account.getCreated());
         accountResponse.setNetworkDomain(account.getNetworkDomain());
-        accountResponse.setDefaultZone(account.getDataCenterUuid());
         accountResponse.setIsDefault(account.isDefault());
         if (view == ResponseView.Full) {
             accountResponse.setApiKeyAccess(account.getApiKeyAccess());
diff --git a/server/src/main/java/com/cloud/api/query/vo/AccountJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/AccountJoinVO.java
@@ -81,15 +81,6 @@ public class AccountJoinVO extends BaseViewVO implements InternalIdentity, Ident
     @Column(name = "domain_path")
     private String domainPath = null;
 
-    @Column(name = "data_center_id")
-    private long dataCenterId;
-
-    @Column(name = "data_center_uuid")
-    private String dataCenterUuid;
-
-    @Column(name = "data_center_name")
-    private String dataCenterName;
-
     @Column(name = "bytesReceived")
     private Long bytesReceived;
 
@@ -283,18 +274,6 @@ public String getDomainPath() {
         return domainPath;
     }
 
-    public long getDataCenterId() {
-        return dataCenterId;
-    }
-
-    public String getDataCenterUuid() {
-        return dataCenterUuid;
-    }
-
-    public String getDataCenterName() {
-        return dataCenterName;
-    }
-
     public Long getBytesReceived() {
         return bytesReceived;
     }
diff --git a/server/src/main/java/com/cloud/configuration/Config.java b/server/src/main/java/com/cloud/configuration/Config.java
@@ -858,8 +858,6 @@ public enum Config {
             "30",
             "Garbage collection interval to destroy unused ELB vms in minutes. Minimum of 5",
             null),
-    EnableEC2API("Advanced", ManagementServer.class, Boolean.class, "enable.ec2.api", "false", "enable EC2 API on CloudStack", null),
-    EnableS3API("Advanced", ManagementServer.class, Boolean.class, "enable.s3.api", "false", "enable Amazon S3 API on CloudStack", null),
     RecreateSystemVmEnabled(
             "Advanced",
             ManagementServer.class,
diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -8988,36 +8988,6 @@ public List<Long> getNetworkOfferingZones(Long networkOfferingId) {
         return networkOfferingDetailsDao.findZoneIds(networkOfferingId);
     }
 
-    @Override
-    @ActionEvent(eventType = EventTypes.EVENT_ACCOUNT_MARK_DEFAULT_ZONE, eventDescription = "Marking account with the " + "default zone", async = true)
-    public AccountVO markDefaultZone(final String accountName, final long domainId, final long defaultZoneId) {
-
-        // Check if the account exists
-        final Account account = _accountDao.findEnabledAccount(accountName, domainId);
-        if (account == null) {
-            DomainVO domain = _domainDao.findById(domainId);
-            String domainStr = domain == null ? String.valueOf(domainId) : domain.toString();
-            logger.error("Unable to find account by name: {} in domain {}", accountName, domainStr);
-            throw new InvalidParameterValueException(String.format("Account by name: %s doesn't exist in domain %s", accountName, domainStr));
-        }
-
-        // Don't allow modification of system account
-        if (account.getId() == Account.ACCOUNT_ID_SYSTEM) {
-            throw new InvalidParameterValueException("Can not modify system account");
-        }
-
-        final AccountVO acctForUpdate = _accountDao.findById(account.getId());
-
-        acctForUpdate.setDefaultZoneId(defaultZoneId);
-
-        if (_accountDao.update(account.getId(), acctForUpdate)) {
-            CallContext.current().setEventDetails("Default zone ID: " + defaultZoneId);
-            return _accountDao.findById(account.getId());
-        } else {
-            return null;
-        }
-    }
-
     // Note: This method will be used for entity name validations in the coming
     // releases (place holder for now)
     @SuppressWarnings("unused")
diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
@@ -345,7 +345,6 @@
 import org.apache.cloudstack.api.command.admin.zone.CreateZoneCmd;
 import org.apache.cloudstack.api.command.admin.zone.DeleteZoneCmd;
 import org.apache.cloudstack.api.command.admin.zone.ListZonesCmdByAdmin;
-import org.apache.cloudstack.api.command.admin.zone.MarkDefaultZoneForAccountCmd;
 import org.apache.cloudstack.api.command.admin.zone.UpdateZoneCmd;
 import org.apache.cloudstack.api.command.user.account.AddAccountToProjectCmd;
 import org.apache.cloudstack.api.command.user.account.AddUserToProjectCmd;
@@ -4007,7 +4006,6 @@ public List<Class<?>> getCommands() {
         cmdList.add(UpdateVPCOfferingCmd.class);
         cmdList.add(CreateZoneCmd.class);
         cmdList.add(DeleteZoneCmd.class);
-        cmdList.add(MarkDefaultZoneForAccountCmd.class);
         cmdList.add(UpdateZoneCmd.class);
         cmdList.add(AddAccountToProjectCmd.class);
         cmdList.add(AddUserToProjectCmd.class);
diff --git a/server/src/test/java/com/cloud/vpc/MockConfigurationManagerImpl.java b/server/src/test/java/com/cloud/vpc/MockConfigurationManagerImpl.java
diff --git a/test/scripts/certDeleteEC2.sh b/test/scripts/certDeleteEC2.sh
diff --git a/test/scripts/certSubmitEC2.sh b/test/scripts/certSubmitEC2.sh
diff --git a/test/scripts/signEC2.sh b/test/scripts/signEC2.sh
diff --git a/tools/whisker/LICENSE b/tools/whisker/LICENSE
diff --git a/tools/whisker/descriptor-for-packaging.xml b/tools/whisker/descriptor-for-packaging.xml
