Skip to content

Commit 56f9185

Browse files
khos2owrafaelweingartner
khos2ow
authored and
rafaelweingartner
committed
Remove 'iam' projects (#2817)
* Remove 'iam' projects * Drop corresponding tables
1 parent fbf4884 commit 56f9185

64 files changed

Lines changed: 9 additions & 7709 deletions

File tree

Some content is hidden

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

‎api/src/main/java/com/cloud/event/EventTypes.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -531,19 +531,6 @@ public class EventTypes {
531531

532532
public static final String EVENT_UCS_ASSOCIATED_PROFILE = "UCS.ASSOCIATEPROFILE";
533533

534-
// IAM events
535-
public static final String EVENT_IAM_POLICY_CREATE = "IAMPOLICY.CREATE";
536-
public static final String EVENT_IAM_POLICY_DELETE = "IAMPOLICY.DELETE";
537-
public static final String EVENT_IAM_POLICY_GRANT = "IAMPOLICY.GRANT";
538-
public static final String EVENT_IAM_POLICY_REVOKE = "IAMPOLICY.REVOKE";
539-
540-
public static final String EVENT_IAM_GROUP_UPDATE = "IAMGROUP.UPDATE";
541-
public static final String EVENT_IAM_GROUP_CREATE = "IAMGROUP.CREATE";
542-
public static final String EVENT_IAM_GROUP_DELETE = "IAMGROUP.DELETE";
543-
public static final String EVENT_IAM_GROUP_GRANT = "IAMGROUP.GRANT";
544-
public static final String EVENT_IAM_GROUP_REVOKE = "IAMGROUP.REVOKE";
545-
public static final String EVENT_IAM_ACCOUNT_POLICY_UPDATE = "IAMACCOUNTPOLICY.UPDATE";
546-
547534
// Object store migration
548535
public static final String EVENT_MIGRATE_PREPARE_SECONDARY_STORAGE = "MIGRATE.PREPARE.SS";
549536

‎api/src/main/java/org/apache/cloudstack/api/ApiCommandJobType.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ public enum ApiCommandJobType {
5050
AffinityGroup,
5151
InternalLbVm,
5252
DedicatedGuestVlanRange,
53-
IAMPolicy,
54-
IAMGroup,
5553
GuestOs,
5654
GuestOsMapping,
5755
Network

‎api/src/main/java/org/apache/cloudstack/api/ApiConstants.java‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -652,19 +652,7 @@ public class ApiConstants {
652652
public static final String MAX_CONNECTIONS = "maxconnections";
653653
public static final String SERVICE_STATE = "servicestate";
654654

655-
public static final String IAM_ACCOUNT_IDS = "accountids";
656-
public static final String IAM_MEMBER_ACCOUNTS = "memberaccounts";
657-
public static final String IAM_PARENT_POLICY_ID = "parentpolicyid";
658-
public static final String IAM_PARENT_POLICY_NAME = "parentpolicyname";
659-
public static final String IAM_POLICY_IDS = "policyids";
660-
public static final String IAM_POLICIES = "policies";
661-
public static final String IAM_APIS = "apis";
662655
public static final String IAM_GROUPS = "groups";
663-
public static final String IAM_PERMISSIONS = "permission";
664-
public static final String IAM_ACTION = "action";
665-
public static final String IAM_SCOPE = "scope";
666-
public static final String IAM_SCOPE_ID = "scopeid";
667-
public static final String IAM_ALLOW_DENY = "permission";
668656
public static final String ENTITY_TYPE = "entitytype";
669657
public static final String ENTITY_ID = "entityid";
670658
public static final String EXTERNAL_ID = "externalid";
@@ -737,4 +725,4 @@ public enum VMDetails {
737725
public enum DomainDetails {
738726
all, resource, min;
739727
}
740-
}
728+
}

‎engine/schema/src/main/resources/META-INF/db/schema-41110to41200-cleanup.sql‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,11 @@
1717

1818
--;
1919
-- Schema upgrade cleanup from 4.11.1.0 to 4.12.0.0
20-
--;
20+
--;
21+
22+
DROP TABLE IF EXISTS `cloud`.`iam_account_policy_map`;
23+
DROP TABLE IF EXISTS `cloud`.`iam_group_account_map`;
24+
DROP TABLE IF EXISTS `cloud`.`iam_group_policy_map`;
25+
DROP TABLE IF EXISTS `cloud`.`iam_group`;
26+
DROP TABLE IF EXISTS `cloud`.`iam_policy_permission`;
27+
DROP TABLE IF EXISTS `cloud`.`iam_policy`;

‎server/src/main/java/com/cloud/template/TemplateManagerImpl.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1546,7 +1546,6 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
15461546
permit.put(ApiConstants.ENTITY_TYPE, VirtualMachineTemplate.class);
15471547
permit.put(ApiConstants.ENTITY_ID, id);
15481548
permit.put(ApiConstants.ACCESS_TYPE, AccessType.UseEntry);
1549-
permit.put(ApiConstants.IAM_ACTION, "listTemplates");
15501549
permit.put(ApiConstants.ACCOUNTS, accountIds);
15511550
_messageBus.publish(_name, EntityManager.MESSAGE_GRANT_ENTITY_EVENT, PublishScope.LOCAL, permit);
15521551
} else if ("remove".equalsIgnoreCase(operation)) {
@@ -1563,7 +1562,6 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
15631562
permit.put(ApiConstants.ENTITY_TYPE, VirtualMachineTemplate.class);
15641563
permit.put(ApiConstants.ENTITY_ID, id);
15651564
permit.put(ApiConstants.ACCESS_TYPE, AccessType.UseEntry);
1566-
permit.put(ApiConstants.IAM_ACTION, "listTemplates");
15671565
permit.put(ApiConstants.ACCOUNTS, accountIds);
15681566
_messageBus.publish(_name, EntityManager.MESSAGE_REVOKE_ENTITY_EVENT, PublishScope.LOCAL, permit);
15691567
} else if ("reset".equalsIgnoreCase(operation)) {

‎services/iam/plugin/pom.xml‎

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎services/iam/plugin/src/main/java/org/apache/cloudstack/api/command/iam/AddAccountToIAMGroupCmd.java‎

Lines changed: 0 additions & 127 deletions
This file was deleted.

0 commit comments

Comments
 (0)