From df14f8aee022ae14746af6ebd15dbca9622a4086 Mon Sep 17 00:00:00 2001 From: Jose Date: Wed, 7 Dec 2022 09:11:07 -0500 Subject: [PATCH] feat(agama): deploy flows from .gama files (#3250) * feat: add timer for deployment/undeployment of ADS projects #3052 * feat: add data object class for an ADS deployment #3052 * chore: remove TODOs #3052 --- .../src/main/java/io/jans/ads/Deployer.java | 555 ++++++++++++++++++ .../java/io/jans/ads/timer/DeployerTimer.java | 68 +++ .../io/jans/ads/timer/DeploymentEvent.java | 3 + .../service/AgamaPersistenceService.java | 1 + .../agama/engine/service/AppInitializer.java | 5 + .../java/io/jans/ads/model/Deployment.java | 84 +++ .../io/jans/ads/model/DeploymentDetails.java | 48 ++ .../src/main/resources/quartz.properties | 2 +- 8 files changed, 765 insertions(+), 1 deletion(-) create mode 100644 jans-auth-server/agama/engine/src/main/java/io/jans/ads/Deployer.java create mode 100644 jans-auth-server/agama/engine/src/main/java/io/jans/ads/timer/DeployerTimer.java create mode 100644 jans-auth-server/agama/engine/src/main/java/io/jans/ads/timer/DeploymentEvent.java create mode 100644 jans-auth-server/agama/model/src/main/java/io/jans/ads/model/Deployment.java create mode 100644 jans-auth-server/agama/model/src/main/java/io/jans/ads/model/DeploymentDetails.java diff --git a/jans-auth-server/agama/engine/src/main/java/io/jans/ads/Deployer.java b/jans-auth-server/agama/engine/src/main/java/io/jans/ads/Deployer.java new file mode 100644 index 00000000000..3580474d9ab --- /dev/null +++ b/jans-auth-server/agama/engine/src/main/java/io/jans/ads/Deployer.java @@ -0,0 +1,555 @@ +package io.jans.ads; + +import io.jans.ads.model.Deployment; +import io.jans.ads.model.DeploymentDetails; +import io.jans.agama.dsl.TranspilationResult; +import io.jans.agama.dsl.Transpiler; +import io.jans.agama.dsl.TranspilerException; +import io.jans.agama.dsl.error.SyntaxException; +import io.jans.agama.engine.misc.FlowUtils; +import io.jans.agama.engine.service.AgamaPersistenceService; +import io.jans.agama.model.Flow; +import io.jans.agama.model.FlowMetadata; +import io.jans.orm.PersistenceEntryManager; +import io.jans.orm.search.filter.Filter; + +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; + +import java.io.IOException; +import java.nio.file.attribute.BasicFileAttributes; +import java.nio.file.Files; +import java.nio.file.FileAlreadyExistsException; +import java.nio.file.FileVisitor; +import java.nio.file.FileVisitResult; +import java.nio.file.SimpleFileVisitor; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Base64; +import java.util.Base64.Decoder; +import java.util.Base64.Encoder; +import java.util.Collections; +import java.util.function.BiPredicate; +import java.util.Date; +import java.util.List; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import net.lingala.zip4j.ZipFile; +import net.lingala.zip4j.model.enums.CompressionMethod; +import net.lingala.zip4j.model.ZipParameters; + +import org.slf4j.Logger; + +import static java.nio.charset.StandardCharsets.UTF_8; + +/* + * This bean deploys .gama project files. Modifications of this file must not only account a single + * VM scenario but a multi-node environment, e.g. several containers running this code concurrently + */ +@ApplicationScoped +public class Deployer { + + private static final String BASE_DN = "ou=deployments,ou=agama,o=jans"; + private static final String ASSETS_DIR = "/opt/jans/jetty/jans-auth/agama"; + private static final String[] ASSETS_SUBDIRS = { "ftl", "fl" }; + private static final String[] TEMPLATES_EXTENSIONS = new String[] { "ftl", "ftlh" }; + private static final String FLOW_EXT = "flow"; + + @Inject + private Logger logger; + + @Inject + private PersistenceEntryManager entryManager; + + @Inject + private FlowUtils futils; + + @Inject + private AgamaPersistenceService aps; + + private Base64.Encoder b64Encoder; + private Base64.Decoder b64Decoder; + + private Map projectsFinishTimes; + private Map> projectsBasePaths; + private Map> projectsFlows; + + public void process() throws IOException { + + Filter filter = Filter.createANDFilter( + Filter.createEqualityFilter("jansActive", false), + Filter.createPresenceFilter("jansStartDate")); + + List depls = entryManager.findEntries(BASE_DN, Deployment.class, filter, + new String[]{ "jansId", "jansStartDate", "jansEndDate", "adsPrjDeplDetails" }); + + //Find the oldest, non-active entry without finish timestamp. Pick that one + Deployment deployment = depls.stream().filter(d -> d.getFinishedAt() == null) + .min((d1, d2) -> d1.getCreatedAt().compareTo(d2.getCreatedAt())).orElse(null); + + if (deployment == null) { + updateFlowsAndAssets(depls); + } else { + deployProject(deployment.getDn(), deployment.getId(), deployment.getDetails().getProjectName()); + } + + } + + private void deployProject(String dn, String prjId, String name) throws IOException { + + logger.info("Deploying project {}", name); + DeploymentDetails dd = new DeploymentDetails(); + dd.setProjectName(name); + + Deployment dep = entryManager.find(dn, Deployment.class, null); + String b64EncodedAssets = dep.getAssets(); + //Here, b64EncodedAssets has the layout of a .gama file + dep.setTaskActive(true); + dep.setAssets(null); + + logger.info("Marking deployment task as active"); + //This merge helps other nodes/pods not to take charge of this very deployment task + entryManager.merge(dep); + + //Check the zip has the expected layout + Path p = extractGamaFile(b64EncodedAssets); + String tmpdir = p.toString(); + Path pcode = Paths.get(tmpdir, "code"); + Path pweb = Paths.get(tmpdir, "web"); + + if (Files.isDirectory(pcode) && Files.isDirectory(pweb)) { + + try { + Set flowIds = createFlows(pcode, dd); + if (dd.getError() == null) { + projectsFlows.put(prjId, flowIds); + + ZipFile zip = compileAssetsArchive(p, pweb); + byte[] bytes = extractZipFileWithPurge(zip, ASSETS_DIR, projectsBasePaths.get(prjId)); + + Set basePaths = new HashSet<>(); + //Update this project's base paths: use the subdirs of web folder + Files.find​(pweb, 1, (pa, attrs) -> attrs.isDirectory()) + .map(pa -> pa.getFileName().toString()).forEach(basePaths::add); + basePaths.remove(pweb.getFileName().toString()); + projectsBasePaths.put(prjId, basePaths); + + dd.setFolders(new ArrayList<>(basePaths)); + //Update binary in DB - not a gama file anymore! + dep.setAssets(new String(b64Encoder.encode(bytes), UTF_8)); + } + } catch (Exception e) { + String msg = e.getMessage(); + logger.error(msg, e); + dd.setError("An error occurred: " + msg); + } + + } else { + logger.warn("This does not seem to be a .gama file"); + dd.setError("Archive missing web and/or code subdirectories"); + } + + dep.setDetails(dd); + //Mark as finished + dep.setTaskActive(false); + Date d = new Date(); + dep.setFinishedAt(d); + + if (dd.getError() != null) { + logger.warn("Deployment of project {} was not successful: {}", name, dd.getError()); + } + logger.info("Finishing deployment task..."); + + projectsFinishTimes.put(prjId, d.getTime()); + entryManager.merge(dep); + + try { + logger.debug("Cleaning .gama extraction dir"); + removeDir(p); + } catch (IOException e) { + logger.error(e.getMessage(), e); + } + + } + + private Set createFlows(Path dir, DeploymentDetails dd) throws IOException { + + BiPredicate matcher = + (path, attrs) -> attrs.isRegularFile() && path.getFileName().toString().endsWith("." + FLOW_EXT); + + logger.info("Looking for .{} files under {}", FLOW_EXT, dir); + Map flowsCode = Files.find​(dir, 2, matcher).collect(Collectors.toMap(p -> p, p -> "")); + flowsCode = new HashMap<>(flowsCode); //Make map modifiable + + Set flowsPaths = flowsCode.keySet(); + for (Path p: flowsPaths) { + logger.debug("Reading {}", p); + flowsCode.put(p, Files.readString(p)); + } + + if (flowsPaths.isEmpty()) { + dd.setError("There are no flows in this archive"); + } + + Map flowsOutcome = new HashMap<>(); + + for (Path p: flowsPaths) { + String error = null; + String source = flowsCode.get(p); + String qname = p.getFileName().toString(); + + try { + qname = qname.substring(0, qname.length() - FLOW_EXT.length() - 1); + + logger.info("Processing flow {}", qname); + //Despite the Transpilation timer automatically processes the flows as they are added + //to DB, we make transpilation here to be able to supply an immediate response, i.e. + //no need to wait for an async task to occur + TranspilationResult tresult = Transpiler.transpile(qname, source); + logger.info("Successful transpilation"); + + Flow fl = aps.getFlow(qname, true); + boolean add = fl == null; + if (add) { + fl = new Flow(); + } else { + logger.info("Flow already existing in DB"); + } + + FlowMetadata meta = fl.getMetadata(); + meta.setFuncName(tresult.getFuncName()); + meta.setInputs(tresult.getInputs()); + meta.setTimeout(tresult.getTimeout()); + meta.setTimestamp(System.currentTimeMillis()); + //No displayname, author or description. No handling of properties either + + String compiled = tresult.getCode(); + fl.setMetadata(meta); + fl.setSource(source); + fl.setTranspiled(compiled); + + fl.setQname(qname); + fl.setTransHash(futils.hash(compiled)); + // revision = 0 and enabled by default assumed + fl.setEnabled(true); + + if (add) { + fl.setDn(dnFromQname(qname)); + logger.info("Persisting flow {}", qname); + entryManager.persist(fl); + } else { + logger.info("Updating flow {}", qname); + entryManager.merge(fl); + } + + } catch (SyntaxException se) { + error = se.getMessage(); + } catch (TranspilerException te) { + error = te.getMessage(); + if (te.getCause() != null) { + error += "\n" + te.getCause().getMessage(); + } + } catch (Exception e) { + error = e.getMessage(); + logger.error(error, e); + } + + if (error != null) { + logger.error("Transpilation failed!"); + + if (dd.getError() == null) { + dd.setError("There were problems processing one or more flows"); + } + } + flowsOutcome.put(qname, error); + } + dd.setFlowsError(flowsOutcome); + return new HashSet<>(flowsOutcome.keySet()); + + } + + private ZipFile compileAssetsArchive(Path root, Path webroot) throws IOException { + + String rnd = rndName(); + + Path agama = Files.createDirectory(Paths.get(root.toString(), rnd)); + logger.debug("Created temp directory {}", agama); + + Path ftl = Files.createDirectory(Paths.get(agama.toString(), "ftl")); + Path fl = Files.createDirectory(Paths.get(agama.toString(), "fl")); + + logger.debug("Copying templates to {}", ftl); + Files.walkFileTree(webroot, copyVisitor(webroot, ftl, TEMPLATES_EXTENSIONS, true)); + logger.debug("Copying assets to {}", fl); + Files.walkFileTree(webroot, copyVisitor(webroot, fl, TEMPLATES_EXTENSIONS, false)); + + //Make a zip with ftl and fl folders + ZipParameters params = new ZipParameters(); + params.setCompressionMethod(CompressionMethod.STORE); + + Path newZipPath = Paths.get(root.toString(), rndName()); + logger.info("Compressing to {}", newZipPath); + + ZipFile newZip = new ZipFile(newZipPath.toFile()); + newZip.addFolder(ftl.toFile(), params); + newZip.addFolder(fl.toFile(), params); + + return newZip; + + } + + private void updateFlowsAndAssets(List deployments) { + + logger.info("Syncing in-memory state with DB state"); + Set actualPrjIds = new HashSet<>(); + + //Retrieve all finished, successfully processed deployments + List depls = deployments.stream().filter(d -> d.getFinishedAt() != null && + d.getDetails().getError() == null).collect(Collectors.toList()); + logger.info("{} successful deployments found", depls.size()); + + for (Deployment d : depls) { + //In this case d only has id, start date, and end date populated + String prjId = d.getId(); + actualPrjIds.add(prjId); + String name = d.getDetails().getProjectName(); + + Long finishedAt = projectsFinishTimes.get(prjId); + + //If local map does not contain the given project or the local finishedAt value is less + //than the DB value, extract to disk the assets (including a previous directory purge) + if (finishedAt == null || finishedAt < d.getFinishedAt().getTime()) { + //Retrieve associated assets + String b64EncodedAssets = entryManager.find(d.getDn(), Deployment.class, + new String[]{ Deployment.ASSETS_ATTR }).getAssets(); + + try { + if (finishedAt != null) { + purge(projectsBasePaths.get(prjId)); + } + if (b64EncodedAssets != null) { + extract(b64EncodedAssets, ASSETS_DIR); + } + + logger.info("Assets of project {} were synced", name); + projectsFinishTimes.put(prjId, d.getFinishedAt().getTime()); + } catch (IOException e) { + logger.error("Error syncing assets of project " + name, e); + } + + } else { + logger.info("Assets of project {} are already synced to disk", name); + } + } + + //Iterate over the projects "known" to this bean. Note these may differ from the + //currently stored projects (actualPrjIds) + for (String prjId : projectsFlows.keySet()) { + + if (!actualPrjIds.contains(prjId)) { + //If a project has disappeared, do flows removal and directories removal + logger.info("Project with id {} has been removed recently. Removing references...", prjId); + + try { + projectsFinishTimes.remove(prjId); + purge(projectsBasePaths.get(prjId)); + } catch(IOException e) { + logger.error(e.getMessage()); + } + + removeFlows(projectsFlows.get(prjId)); + } + } + + Set set; + projectsFlows.clear(); + projectsBasePaths.clear(); + //Refresh maps wrt DB content + for (Deployment d : depls) { + String prjId = d.getId(); + + set = Optional.ofNullable(d.getDetails().getFlowsError()).map(Map::keySet) + .orElse(new HashSet<>()); + projectsFlows.put(prjId, set); + + set = Optional.ofNullable(d.getDetails().getFolders()).map(HashSet::new) + .orElse(new HashSet<>()); + projectsBasePaths.put(prjId, set); + } + + } + + private void removeFlows(Set flows) { + + for (String flow : flows) { + try { + String dn = dnFromQname(flow); + if (entryManager.contains(dn, Flow.class)) { + logger.info("Removing flow {}", flow); + entryManager.remove(dn, Flow.class); + } + } catch (Exception e) { + logger.error("Error removing flow " + flow, e); + } + } + + } + + private static String dnFromQname(String qname) { + return String.format("%s=%s,%s", Flow.ATTR_NAMES.QNAME, + qname, AgamaPersistenceService.AGAMA_FLOWS_BASE); + } + + // ========== File-system related utilities follow: =========== + + //Walpurgis + private void purge(Set dirs) throws IOException { + + if (dirs == null) return; + + for (String dir : dirs) { + for (String subdir : ASSETS_SUBDIRS) { + Path p = Paths.get(ASSETS_DIR, subdir, dir); + + if (Files.isDirectory(p)) { + logger.info("Flushing folder {}", p); + removeDir(p); + } + } + } + + } + + private void extract(String b64EncodedAssets, String destination) throws IOException { + + if (b64EncodedAssets == null) return; + + String name = rndName(); + Path p = Files.createTempFile​(name, null); + logger.debug("Dumping decoded Base64 representation to {}", p); + Files.write(p, b64Decoder.decode(b64EncodedAssets.getBytes(UTF_8))); + + try (ZipFile zip = new ZipFile(p.toFile())) { + logger.info("Extracting contents of {} to {}", p, destination); + zip.extractAll(destination); + } finally { + logger.trace("Removing temp file"); + Files.delete(p); + } + + } + + private Path extractGamaFile(String b64EncodedContents) throws IOException { + + String tmpdir = rndName(); + Path p = Files.createTempDirectory(tmpdir); + + logger.info("Extracting .gama file to {}", p); + extract(b64EncodedContents, p.toString()); + return p; + + } + + private byte[] extractZipFileWithPurge(ZipFile zip, String destination, + Set dirsPurge) throws IOException { + + Path zipPath = zip.getFile().toPath(); + purge(dirsPurge); + + logger.debug("Extracting contents of {} to {}", zipPath, destination); + zip.extractAll(destination); + return Files.readAllBytes(zipPath); + + } + + private static void removeDir(Path p) throws IOException { + + Files.walkFileTree(p, new SimpleFileVisitor() { + + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) + throws IOException { + + Files.delete(file); + return FileVisitResult.CONTINUE; + } + + @Override + public FileVisitResult postVisitDirectory(Path dir, IOException e) + throws IOException { + + if (e == null) { + Files.delete(dir); + return FileVisitResult.CONTINUE; + } else { + throw e; + } + } + + }); + + } + + private static FileVisitor copyVisitor(Path source, Path target, String[] extensions, boolean include) { + + List suffixes = Stream.of(extensions).map(s -> "." + s).collect(Collectors.toList()); + + return new SimpleFileVisitor() { + + @Override + public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) + throws IOException { + + Path targetdir = target.resolve(source.relativize(dir)); + try { + Files.copy(dir, targetdir); + } catch (FileAlreadyExistsException e) { + if (!Files.isDirectory(targetdir)) + throw e; + } + return FileVisitResult.CONTINUE; + + } + + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) + throws IOException { + + String fn = file.getFileName().toString().toLowerCase(); + boolean match = suffixes.stream().anyMatch(fn::endsWith); + + if ((match && include) || (!match && !include)) { + Files.copy(file, target.resolve(source.relativize(file))); + } + return FileVisitResult.CONTINUE; + + } + + }; + + } + + private static String rndName() { + return ("" + Math.random()).substring(2); + } + + @PostConstruct + private void init() { + + b64Encoder = Base64.getEncoder(); + b64Decoder = Base64.getDecoder(); + projectsBasePaths = new HashMap<>(); + projectsFinishTimes = new HashMap<>(); + projectsFlows = new HashMap<>(); + + } + +} \ No newline at end of file diff --git a/jans-auth-server/agama/engine/src/main/java/io/jans/ads/timer/DeployerTimer.java b/jans-auth-server/agama/engine/src/main/java/io/jans/ads/timer/DeployerTimer.java new file mode 100644 index 00000000000..418369b9dc5 --- /dev/null +++ b/jans-auth-server/agama/engine/src/main/java/io/jans/ads/timer/DeployerTimer.java @@ -0,0 +1,68 @@ +package io.jans.ads.timer; + +import io.jans.ads.Deployer; +import io.jans.agama.engine.misc.FlowUtils; +import io.jans.service.cdi.async.Asynchronous; +import io.jans.service.cdi.event.Scheduled; +import io.jans.service.timer.event.TimerEvent; +import io.jans.service.timer.schedule.TimerSchedule; + +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Event; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; + +import java.util.concurrent.atomic.AtomicBoolean; + +import org.slf4j.Logger; + +@ApplicationScoped +public class DeployerTimer { + + @Inject + private Deployer deployer; + + @Inject + private Logger logger; + + @Inject + private Event timerEvent; + + @Inject + private FlowUtils futils; + + private AtomicBoolean isActive; + + private static final int DELAY = 5 + (int) (10 * Math.random()); //seconds + private static final int INTERVAL = 30; // seconds + + public void initTimer() { + + logger.info("Initializing Agama transpilation Timer"); + isActive = new AtomicBoolean(false); + timerEvent.fire(new TimerEvent(new TimerSchedule(DELAY, INTERVAL), + new DeploymentEvent(), Scheduled.Literal.INSTANCE)); + + } + + @Asynchronous + public void run(@Observes @Scheduled DeploymentEvent event) { + + if (!futils.serviceEnabled()) return; + + if (isActive.get()) return; + + if (!isActive.compareAndSet(false, true)) return; + + try { + deployer.process(); + logger.debug("ADS deployer timer has run."); + } catch (Exception e) { + logger.error("An error occurred while running ADS deployer timer", e); + } finally { + isActive.set(false); + } + + } + +} diff --git a/jans-auth-server/agama/engine/src/main/java/io/jans/ads/timer/DeploymentEvent.java b/jans-auth-server/agama/engine/src/main/java/io/jans/ads/timer/DeploymentEvent.java new file mode 100644 index 00000000000..9aba591717c --- /dev/null +++ b/jans-auth-server/agama/engine/src/main/java/io/jans/ads/timer/DeploymentEvent.java @@ -0,0 +1,3 @@ +package io.jans.ads.timer; + +public class DeploymentEvent { } diff --git a/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/service/AgamaPersistenceService.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/service/AgamaPersistenceService.java index 9c0f3c8d2fe..d9f3641af58 100644 --- a/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/service/AgamaPersistenceService.java +++ b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/service/AgamaPersistenceService.java @@ -139,6 +139,7 @@ public Flow getFlow(String flowName, boolean full) throws IOException { if (fls.isEmpty()) { logger.warn("Flow '{}' does not exist!", flowName); + return null; } return fls.get(0); diff --git a/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/service/AppInitializer.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/service/AppInitializer.java index 95f21203e91..fd48ab32925 100644 --- a/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/service/AppInitializer.java +++ b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/service/AppInitializer.java @@ -1,5 +1,6 @@ package io.jans.agama.engine.service; +import io.jans.ads.timer.DeployerTimer; import io.jans.agama.timer.FlowRunsCleaner; import io.jans.agama.timer.Transpilation; import io.jans.service.cdi.event.ApplicationInitialized; @@ -17,12 +18,16 @@ public class AppInitializer { @Inject private FlowRunsCleaner fcleaner; + + @Inject + private DeployerTimer deployerTimer; public void run(@Observes @ApplicationInitialized(ApplicationScoped.class) ApplicationInitializedEvent event) { trTimer.initTimer(); fcleaner.initTimer(); + deployerTimer.initTimer(); } diff --git a/jans-auth-server/agama/model/src/main/java/io/jans/ads/model/Deployment.java b/jans-auth-server/agama/model/src/main/java/io/jans/ads/model/Deployment.java new file mode 100644 index 00000000000..18d0037e1f0 --- /dev/null +++ b/jans-auth-server/agama/model/src/main/java/io/jans/ads/model/Deployment.java @@ -0,0 +1,84 @@ +package io.jans.ads.model; + +import io.jans.orm.annotation.AttributeName; +import io.jans.orm.annotation.DataEntry; +import io.jans.orm.annotation.JsonObject; +import io.jans.orm.annotation.ObjectClass; +import io.jans.orm.model.base.Entry; + +import java.util.Date; + +@DataEntry +@ObjectClass(value = "adsPrjDeployment") +public class Deployment extends Entry { + + public static final String ASSETS_ATTR = "adsPrjAssets"; + + @AttributeName(name = "jansId") + private String id; + + @AttributeName(name = "jansStartDate") + private Date createdAt; + + @AttributeName(name = "jansActive") + private boolean taskActive; + + @AttributeName(name = "jansEndDate") + private Date finishedAt; + + @AttributeName(name = Deployment.ASSETS_ATTR) + private String assets; + + @JsonObject + @AttributeName(name = "adsPrjDeplDetails") + private DeploymentDetails details; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public boolean isTaskActive() { + return taskActive; + } + + public void setTaskActive(boolean taskActive) { + this.taskActive = taskActive; + } + + public Date getFinishedAt() { + return finishedAt; + } + + public void setFinishedAt(Date finishedAt) { + this.finishedAt = finishedAt; + } + + public String getAssets() { + return assets; + } + + public void setAssets(String assets) { + this.assets = assets; + } + + public DeploymentDetails getDetails() { + return details; + } + + public void setDetails(DeploymentDetails details) { + this.details = details; + } + +} \ No newline at end of file diff --git a/jans-auth-server/agama/model/src/main/java/io/jans/ads/model/DeploymentDetails.java b/jans-auth-server/agama/model/src/main/java/io/jans/ads/model/DeploymentDetails.java new file mode 100644 index 00000000000..70a9bf5fa3f --- /dev/null +++ b/jans-auth-server/agama/model/src/main/java/io/jans/ads/model/DeploymentDetails.java @@ -0,0 +1,48 @@ +package io.jans.ads.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +import java.util.List; +import java.util.Map; + +@JsonIgnoreProperties(ignoreUnknown = true) +public class DeploymentDetails { + + private String projectName; + private List folders; + private Map flowsError; + private String error; + + public String getProjectName() { + return projectName; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + + public List getFolders() { + return folders; + } + + public void setFolders(List folders) { + this.folders = folders; + } + + public String getError() { + return error; + } + + public void setError(String error) { + this.error = error; + } + + public Map getFlowsError() { + return flowsError; + } + + public void setFlowsError(Map flowsError) { + this.flowsError = flowsError; + } + +} \ No newline at end of file diff --git a/jans-auth-server/server/src/main/resources/quartz.properties b/jans-auth-server/server/src/main/resources/quartz.properties index a53f80c6f88..968fb1d3a43 100644 --- a/jans-auth-server/server/src/main/resources/quartz.properties +++ b/jans-auth-server/server/src/main/resources/quartz.properties @@ -1,4 +1,4 @@ org.quartz.scheduler.instanceName=Jans AuthScheduler -org.quartz.threadPool.threadCount=6 +org.quartz.threadPool.threadCount=8 org.quartz.jobStore.class=org.quartz.simpl.RAMJobStore org.quartz.scheduler.skipUpdateCheck=true