Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: list deployments in order #154

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: list deployments in order #154

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 35 additions & 8 deletions server/src/main/java/com/aws/greengrass/cli/CLIEventStreamAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import com.aws.greengrass.authorization.Permission;
import com.aws.greengrass.authorization.exceptions.AuthorizationException;
import com.aws.greengrass.componentmanager.ComponentStore;
import com.aws.greengrass.config.Node;
import com.aws.greengrass.config.Topics;
import com.aws.greengrass.deployment.DeploymentQueue;
import com.aws.greengrass.deployment.model.ConfigurationUpdateOperation;
Expand Down Expand Up @@ -78,7 +79,9 @@
import java.util.ArrayList;
import java.util.Base64;
import java.util.Collection;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.UUID;
Expand Down Expand Up @@ -590,7 +593,15 @@ public ListLocalDeploymentsHandler(OperationContinuationHandlerContext context,

@Override
protected void onStreamClosed() {
}

public List<Node> sortDeploymentsByTime(Iterator<Node> deploymentsIterator, Comparator<Node> comparator) {
List<Node> list = new ArrayList<>();
while (deploymentsIterator.hasNext()) {
list.add(deploymentsIterator.next());
}
list.sort(comparator);
return list;
}

@Override
Expand All @@ -603,14 +614,18 @@ public ListLocalDeploymentsResponse handleRequest(ListLocalDeploymentsRequest re
.build());
List<LocalDeployment> persistedDeployments = new ArrayList<>();
Topics localDeployments = cliServiceConfig.findTopics(PERSISTENT_LOCAL_DEPLOYMENTS);
if (localDeployments != null) {
localDeployments.forEach(topic -> {
Topics topics = (Topics) topic;
LocalDeployment localDeployment = new LocalDeployment();
localDeployment.setDeploymentId(topics.getName());
localDeployment.setStatus(
deploymentStatusFromString(Coerce.toString(topics.find(DEPLOYMENT_STATUS_KEY_NAME))));
persistedDeployments.add(localDeployment);
List<Node> deploymentsByTime = sortDeploymentsByTime(localDeployments.iterator(),
new DeploymentTimeComparator());
if (deploymentsByTime != null) {
deploymentsByTime.forEach(node -> {
if (node instanceof Topics) {
Topics topics = (Topics) node;
LocalDeployment localDeployment = new LocalDeployment();
localDeployment.setDeploymentId(topics.getName());
localDeployment.setStatus(deploymentStatusFromString(
Coerce.toString(topics.find(DEPLOYMENT_STATUS_KEY_NAME))));
persistedDeployments.add(localDeployment);
}
});
}
ListLocalDeploymentsResponse response = new ListLocalDeploymentsResponse();
Expand All @@ -619,6 +634,18 @@ public ListLocalDeploymentsResponse handleRequest(ListLocalDeploymentsRequest re
});
}

private class DeploymentTimeComparator implements Comparator<Node> {
@Override
public int compare(Node n1, Node n2) {
if (n1.getModtime() < n2.getModtime()) {
return 1;
} else if (n1.getModtime() > n2.getModtime()) {
return -1;
}
return 0;
}
}

@Override
public void handleStreamEvent(EventStreamJsonMessage streamRequestEvent) {

Expand Down