Skip to content

Commit 607fe96

Browse files
fix build
1 parent 1d6e5eb commit 607fe96

File tree

2 files changed

+8
-2
lines changed
  • api/src/main/java/org/apache/cloudstack/api/command/admin/user
  • plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management

2 files changed

+8
-2
lines changed

api/src/main/java/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class UpdateUserCmd extends BaseCmd {
4646
//////////////// API parameters /////////////////////
4747
/////////////////////////////////////////////////////
4848

49-
@Parameter(name = ApiConstants.USER_API_KEY, type = CommandType.STRING, description = "The API key for the user. Must be specified with userSecretKey")
49+
@Parameter(name = ApiConstants.USER_API_KEY, type = CommandType.STRING, description = "The API key for the user. Must be specified with usersecretkey")
5050
private String userApiKey;
5151

5252
@Parameter(name = ApiConstants.EMAIL, type = CommandType.STRING, description = "Email")
@@ -70,7 +70,7 @@ public class UpdateUserCmd extends BaseCmd {
7070
@Parameter(name = ApiConstants.CURRENT_PASSWORD, type = CommandType.STRING, description = "Current password that was being used by the user. You must inform the current password when updating the password.", acceptedOnAdminPort = false)
7171
private String currentPassword;
7272

73-
@Parameter(name = ApiConstants.USER_SECRET_KEY, type = CommandType.STRING, description = "The secret key for the user. Must be specified with userApiKey.")
73+
@Parameter(name = ApiConstants.USER_SECRET_KEY, type = CommandType.STRING, description = "The secret key for the user. Must be specified with userapikey.")
7474
private String userSecretKey;
7575

7676
@Parameter(name = ApiConstants.API_KEY_ACCESS, type = CommandType.STRING, description = "Determines if Api key access for this user is enabled, disabled or inherits the value from its parent, the owning account", since = "4.20.1.0", authorized = {RoleType.Admin})

plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/MockAccountManager.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import javax.naming.ConfigurationException;
2626

2727
import com.cloud.api.auth.SetupUserTwoFactorAuthenticationCmd;
28+
import org.apache.cloudstack.acl.RolePermissionEntity;
2829
import org.apache.cloudstack.acl.apikeypair.ApiKeyPairPermission;
2930
import org.apache.cloudstack.api.BaseCmd;
3031
import org.apache.cloudstack.api.command.admin.account.CreateAccountCmd;
@@ -562,6 +563,11 @@ public String getAccessingApiKey(BaseCmd cmd) {
562563
return null;
563564
}
564565

566+
@Override
567+
public List<RolePermissionEntity> getAllKeypairPermissions(String apiKey) {
568+
return List.of();
569+
}
570+
565571
@Override
566572
public void checkAccess(User user, ControlledEntity entity)
567573
throws PermissionDeniedException {

0 commit comments

Comments
 (0)