Skip to content

Commit

Permalink
[#6151] improve(CLI): Refactor group commands in Gavitino CLI (#6175)
Browse files Browse the repository at this point in the history
### What changes were proposed in this pull request?

Refactor group commands in Gavitino CLI.

### Why are the changes needed?

Fix: #6151 

### Does this PR introduce _any_ user-facing change?

No

### How was this patch tested?

local test.
  • Loading branch information
Abyss-lord authored Jan 10, 2025
1 parent 2a17292 commit 20bfeba
Show file tree
Hide file tree
Showing 2 changed files with 160 additions and 62 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ private void executeCommand() {
} else if (entity.equals(CommandEntities.USER)) {
handleUserCommand();
} else if (entity.equals(CommandEntities.GROUP)) {
handleGroupCommand();
new GroupCommandHandler(this, line, command, ignore).handle();
} else if (entity.equals(CommandEntities.TAG)) {
handleTagCommand();
} else if (entity.equals(CommandEntities.ROLE)) {
Expand Down Expand Up @@ -374,67 +374,6 @@ protected void handleUserCommand() {
}
}

/** Handles the command execution for Group based on command type and the command line options. */
protected void handleGroupCommand() {
String url = getUrl();
String auth = getAuth();
String userName = line.getOptionValue(GravitinoOptions.LOGIN);
FullName name = new FullName(line);
String metalake = name.getMetalakeName();
String group = line.getOptionValue(GravitinoOptions.GROUP);

Command.setAuthenticationMode(auth, userName);

if (group == null && !CommandActions.LIST.equals(command)) {
System.err.println(ErrorMessages.MISSING_GROUP);
Main.exit(-1);
}

switch (command) {
case CommandActions.DETAILS:
if (line.hasOption(GravitinoOptions.AUDIT)) {
newGroupAudit(url, ignore, metalake, group).validate().handle();
} else {
newGroupDetails(url, ignore, metalake, group).validate().handle();
}
break;

case CommandActions.LIST:
newListGroups(url, ignore, metalake).validate().handle();
break;

case CommandActions.CREATE:
newCreateGroup(url, ignore, metalake, group).validate().handle();
break;

case CommandActions.DELETE:
boolean force = line.hasOption(GravitinoOptions.FORCE);
newDeleteGroup(url, ignore, force, metalake, group).validate().handle();
break;

case CommandActions.REVOKE:
String[] revokeRoles = line.getOptionValues(GravitinoOptions.ROLE);
for (String role : revokeRoles) {
newRemoveRoleFromGroup(url, ignore, metalake, group, role).validate().handle();
}
System.out.printf("Remove roles %s from group %s%n", COMMA_JOINER.join(revokeRoles), group);
break;

case CommandActions.GRANT:
String[] grantRoles = line.getOptionValues(GravitinoOptions.ROLE);
for (String role : grantRoles) {
newAddRoleToGroup(url, ignore, metalake, group, role).validate().handle();
}
System.out.printf("Grant roles %s to group %s%n", COMMA_JOINER.join(grantRoles), group);
break;

default:
System.err.println(ErrorMessages.UNSUPPORTED_ACTION);
Main.exit(-1);
break;
}
}

/** Handles the command execution for Tags based on command type and the command line options. */
protected void handleTagCommand() {
String url = getUrl();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
/*
* 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.
*/

package org.apache.gravitino.cli;

import org.apache.commons.cli.CommandLine;
import org.apache.gravitino.cli.commands.Command;

/** Handles the command execution for Groups based on command type and the command line options. */
public class GroupCommandHandler extends CommandHandler {
private final GravitinoCommandLine gravitinoCommandLine;
private final CommandLine line;
private final String command;
private final boolean ignore;
private final String url;
private final FullName name;
private final String metalake;
private String group;

/**
* Constructs a {@link GroupCommandHandler} instance.
*
* @param gravitinoCommandLine The Gravitino command line instance.
* @param line The command line arguments.
* @param command The command to execute.
* @param ignore Ignore server version mismatch.
*/
public GroupCommandHandler(
GravitinoCommandLine gravitinoCommandLine, CommandLine line, String command, boolean ignore) {
this.gravitinoCommandLine = gravitinoCommandLine;
this.line = line;
this.command = command;
this.ignore = ignore;

this.url = getUrl(line);
this.name = new FullName(line);
this.metalake = name.getMetalakeName();
}

/** Handles the command execution logic based on the provided command. */
@Override
protected void handle() {
String userName = line.getOptionValue(GravitinoOptions.LOGIN);
Command.setAuthenticationMode(getAuth(line), userName);

if (CommandActions.LIST.equals(command)) {
handleListCommand();
return;
}

group = line.getOptionValue(GravitinoOptions.GROUP);
if (group == null) {
System.err.println(ErrorMessages.MISSING_GROUP);
Main.exit(-1);
}

if (!executeCommand()) {
System.err.println(ErrorMessages.UNSUPPORTED_COMMAND);
Main.exit(-1);
}
}

/**
* Executes the specific command based on the command type.
*
* @return true if the command is supported, false otherwise
*/
private boolean executeCommand() {
switch (command) {
case CommandActions.DETAILS:
handleDetailsCommand();
return true;

case CommandActions.CREATE:
handleCreateCommand();
return true;

case CommandActions.DELETE:
handleDeleteCommand();
return true;

case CommandActions.REVOKE:
handleRevokeCommand();
return true;

case CommandActions.GRANT:
handleGrantCommand();
return true;

default:
return false;
}
}

/** Handles the "DETAILS" command. */
private void handleDetailsCommand() {
if (line.hasOption(GravitinoOptions.AUDIT)) {
gravitinoCommandLine.newGroupAudit(url, ignore, metalake, group).validate().handle();
} else {
gravitinoCommandLine.newGroupDetails(url, ignore, metalake, group).validate().handle();
}
}

/** Handles the "CREATE" command. */
private void handleCreateCommand() {
gravitinoCommandLine.newCreateGroup(url, ignore, metalake, group).validate().handle();
}

/** Handles the "DELETE" command. */
private void handleDeleteCommand() {
boolean force = line.hasOption(GravitinoOptions.FORCE);
gravitinoCommandLine.newDeleteGroup(url, ignore, force, metalake, group).validate().handle();
}

/** Handles the "REVOKE" command. */
private void handleRevokeCommand() {
String[] revokeRoles = line.getOptionValues(GravitinoOptions.ROLE);
for (String role : revokeRoles) {
gravitinoCommandLine
.newRemoveRoleFromGroup(url, ignore, metalake, group, role)
.validate()
.handle();
}
System.out.printf("Remove roles %s from group %s%n", COMMA_JOINER.join(revokeRoles), group);
}

/** Handles the "GRANT" command. */
private void handleGrantCommand() {
String[] grantRoles = line.getOptionValues(GravitinoOptions.ROLE);
for (String role : grantRoles) {
gravitinoCommandLine
.newAddRoleToGroup(url, ignore, metalake, group, role)
.validate()
.handle();
}
System.out.printf("Grant roles %s to group %s%n", COMMA_JOINER.join(grantRoles), group);
}

/** Handles the "LIST" command. */
private void handleListCommand() {
gravitinoCommandLine.newListGroups(url, ignore, metalake).validate().handle();
}
}

0 comments on commit 20bfeba

Please sign in to comment.