Skip to content
This repository has been archived by the owner on Jul 23, 2024. It is now read-only.

add task log & fix report url for mta #428

Merged
merged 1 commit into from
Jun 14, 2023
+26 −10
Merged

add task log & fix report url for mta #428

Show file tree
Hide file tree
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
8 changes: 6 additions & 2 deletions ...-tasks/src/main/java/com/redhat/parodos/tasks/migrationtoolkit/CreateApplicationTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,19 @@ public WorkReport execute(WorkContext workContext) {
Result<App> result = mtaClient.create(new App(0, appName, new Repository("git", repo, branch)));

if (result == null) {
taskLogger.logErrorWithSlf4j("MTA client returned empty result with no error");
// unexpected
return new DefaultWorkReport(WorkStatus.FAILED, new WorkContext(),
return new DefaultWorkReport(WorkStatus.REJECTED, new WorkContext(),
new IllegalStateException("MTA client returned empty result with no error"));
}
else if (result instanceof Result.Failure<App> failure) {
return new DefaultWorkReport(WorkStatus.FAILED, workContext, failure.t());
taskLogger.logErrorWithSlf4j("MTA client returned failed result");
return new DefaultWorkReport(WorkStatus.REJECTED, workContext, failure.t());
}
else if (result instanceof Result.Success<App> success) {
workContext.put("application", success.value());
taskLogger.logInfoWithSlf4j("MTA client returned success result for application creation: {}",
success.value().name());
return new DefaultWorkReport(WorkStatus.COMPLETED, workContext);
}
throw new IllegalArgumentException();
Expand Down
12 changes: 8 additions & 4 deletions prebuilt-tasks/src/main/java/com/redhat/parodos/tasks/migrationtoolkit/GetAnalysisTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,25 +85,29 @@ public WorkReport execute(WorkContext workContext) {
Result<TaskGroup> result = mtaClient.get(taskGroupID);

if (result == null) {
taskLogger.logErrorWithSlf4j("MTA client returned empty result with no error.");
// unexpected
return new DefaultWorkReport(WorkStatus.FAILED, new WorkContext(),
return new DefaultWorkReport(WorkStatus.REJECTED, new WorkContext(),
new IllegalStateException("MTA client returned empty result with no error."));
}
else if (result instanceof Result.Failure<TaskGroup> failure) {
return new DefaultWorkReport(WorkStatus.FAILED, workContext, failure.t());
taskLogger.logErrorWithSlf4j("MTA client returned failed result");
return new DefaultWorkReport(WorkStatus.REJECTED, workContext, failure.t());
}
else if (result instanceof Result.Success<TaskGroup> success) {
if ("Ready".equals(success.value().state()) && success.value().tasks() != null
&& "Succeeded".equals(success.value().tasks()[0].state())) {
String reportURL = "%s/hub/applications/%d/bucket/%s".formatted(serverUrl,
String reportURL = "%s/hub/applications/%d/bucket%s".formatted(serverUrl,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not for today, but perhaps this one can use something like URLBuilder to make sure the URL is valid.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea agree

success.value().tasks()[0].application().id(), success.value().data().output());
taskLogger.logInfoWithSlf4j("MTA client returned success result with report url: {}", reportURL);
addParameter("reportURL", reportURL);
notificationSender.send("Migration Analysis Report Completed",
"[Migration analysis report](%s) completed.".formatted(reportURL));
return new DefaultWorkReport(WorkStatus.COMPLETED, workContext);
}
else if ("Failed".equals(success.value().state())) {
return new DefaultWorkReport(WorkStatus.FAILED, workContext,
taskLogger.logErrorWithSlf4j("The underlying task failed, the report will not be ready");
return new DefaultWorkReport(WorkStatus.REJECTED, workContext,
new Throwable("The underlying task failed, the report will not be ready"));
}
return new DefaultWorkReport(WorkStatus.FAILED, workContext, new Throwable("The report is not ready yet."));
Expand Down
8 changes: 6 additions & 2 deletions ...ilt-tasks/src/main/java/com/redhat/parodos/tasks/migrationtoolkit/GetApplicationTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,19 @@ public WorkReport execute(WorkContext workContext) {
Result<App> result = mtaClient.get(applicationName);

if (result == null) {
taskLogger.logErrorWithSlf4j("MTA client returned empty result with no error");
// unexpected
return new DefaultWorkReport(WorkStatus.FAILED, new WorkContext(),
return new DefaultWorkReport(WorkStatus.REJECTED, new WorkContext(),
new IllegalStateException("MTA client returned empty result with no error"));
}
else if (result instanceof Result.Failure<App> failure) {
return new DefaultWorkReport(WorkStatus.FAILED, workContext, failure.t());
taskLogger.logErrorWithSlf4j("MTA client returned failed result");
return new DefaultWorkReport(WorkStatus.REJECTED, workContext, failure.t());
}
else if (result instanceof Result.Success<App> success) {
addParameter("applicationID", String.valueOf(success.value().id()));
taskLogger.logInfoWithSlf4j("MTA client returned success result for getting application with id: {}",
String.valueOf(success.value().id()));
return new DefaultWorkReport(WorkStatus.COMPLETED, workContext);
}
throw new IllegalArgumentException();
Expand Down
8 changes: 6 additions & 2 deletions ...ilt-tasks/src/main/java/com/redhat/parodos/tasks/migrationtoolkit/SubmitAnalysisTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,19 @@ public WorkReport execute(WorkContext workContext) {
Result<TaskGroup> result = mtaClient.create(applicationID);

if (result == null) {
taskLogger.logErrorWithSlf4j("MTA client returned empty result with no error");
// unexpected
return new DefaultWorkReport(WorkStatus.FAILED, new WorkContext(),
return new DefaultWorkReport(WorkStatus.REJECTED, new WorkContext(),
new IllegalStateException("MTA client returned result with no error"));
}
else if (result instanceof Result.Failure<TaskGroup> failure) {
return new DefaultWorkReport(WorkStatus.FAILED, workContext, failure.t());
taskLogger.logErrorWithSlf4j("MTA client returned failed result");
return new DefaultWorkReport(WorkStatus.REJECTED, workContext, failure.t());
}
else if (result instanceof Result.Success<TaskGroup> success) {
addParameter("taskGroupID", String.valueOf(success.value().id()));
taskLogger.logInfoWithSlf4j("MTA client returned success result for analysis task with id: {}",
String.valueOf(success.value().id()));
return new DefaultWorkReport(WorkStatus.COMPLETED, workContext);
}
throw new IllegalArgumentException();
Expand Down