server: api resource for list kv (#681)

brig · ibodrov · web-flow · commit 256548359eeb · 2022-12-07T01:27:31.000+01:00
Co-authored-by: Ivan Bodrov &lt;ibodrov@gmail.com&gt;
diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/console/ConsoleService.java b/server/impl/src/main/java/com/walmartlabs/concord/server/console/ConsoleService.java
@@ -114,7 +114,7 @@ public ConsoleService(ProjectDao projectDao,
     public UserResponse whoami() {
         UserPrincipal p = UserPrincipal.getCurrent();
         if (p == null) {
-            throw new ConcordApplicationException("Can't determine current user: pricipal not found",
+            throw new ConcordApplicationException("Can't determine current user: principal not found",
                     Status.INTERNAL_SERVER_ERROR);
         }
 
diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/org/project/KvDao.java b/server/impl/src/main/java/com/walmartlabs/concord/server/org/project/KvDao.java
@@ -24,12 +24,14 @@
 import com.walmartlabs.concord.db.MainDB;
 import com.walmartlabs.concord.server.Locks;
 import com.walmartlabs.concord.server.jooq.tables.ProjectKvStore;
-import org.jooq.Configuration;
-import org.jooq.Record1;
+import org.jooq.*;
 import org.jooq.exception.DataAccessException;
 
 import javax.inject.Inject;
 import javax.inject.Named;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 import static com.walmartlabs.concord.server.jooq.tables.ProjectKvStore.PROJECT_KV_STORE;
@@ -132,4 +134,41 @@ public synchronized long inc(UUID projectId, String key) {
                     .fetchOne(kv.VALUE_LONG);
         });
     }
+
+    public List<Map<String, Object>> list(UUID projectId, int offset, int limit, String filter) {
+        ProjectKvStore kv = PROJECT_KV_STORE.as("kv");
+
+        return txResult(tx -> {
+            SelectJoinStep<Record3<String, Long, String>> q = tx.select(kv.VALUE_KEY, kv.VALUE_LONG, kv.VALUE_STRING)
+                    .from(kv);
+
+            if (filter != null) {
+                q.where(kv.VALUE_KEY.containsIgnoreCase(filter));
+            }
+
+            if (offset > 0) {
+                q.offset(offset);
+            }
+
+            if (limit > 0) {
+                q.limit(limit);
+            }
+
+            return q
+                    .where(kv.PROJECT_ID.eq(projectId))
+                    .orderBy(kv.VALUE_KEY)
+                    .fetch(KvDao::toEntry);
+        });
+    }
+
+    private static Map<String, Object> toEntry(Record3<String, Long, String> r) {
+        Object value = r.get(PROJECT_KV_STORE.VALUE_STRING);
+        if (value == null) {
+            value = r.get(PROJECT_KV_STORE.VALUE_LONG);
+        }
+        Map<String, Object> m = new HashMap<>();
+        m.put("key", r.get(PROJECT_KV_STORE.VALUE_KEY));
+        m.put("value", value);
+        return m;
+    }
 }
diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/org/project/ProjectResource.java b/server/impl/src/main/java/com/walmartlabs/concord/server/org/project/ProjectResource.java
@@ -58,6 +58,7 @@ public class ProjectResource implements Resource {
     private final ProjectAccessManager accessManager;
     private final OrganizationDao orgDao;
     private final TeamDao teamDao;
+    private final KvDao kvDao;
     private final EncryptedProjectValueManager encryptedValueManager;
 
     private final ProjectRepositoryManager projectRepositoryManager;
@@ -69,13 +70,15 @@ public ProjectResource(OrganizationManager orgManager,
                            ProjectAccessManager accessManager,
                            OrganizationDao orgDao,
                            TeamDao teamDao,
+                           KvDao kvDao,
                            EncryptedProjectValueManager encryptedValueManager,
                            ProjectRepositoryManager projectRepositoryManager) {
 
         this.orgManager = orgManager;
         this.projectDao = projectDao;
         this.projectManager = projectManager;
         this.accessManager = accessManager;
+        this.kvDao = kvDao;
         this.encryptedValueManager = encryptedValueManager;
         this.orgDao = orgDao;
         this.teamDao = teamDao;
@@ -125,6 +128,23 @@ public List<ProjectEntry> find(@ApiParam @PathParam("orgName") @ConcordKey Strin
         return projectManager.list(org.getId(), offset, limit, filter);
     }
 
+    @GET
+    @ApiOperation("list KV")
+    @Path("/{orgName}/project/{projectName}/kv")
+    @Produces(MediaType.APPLICATION_JSON)
+    public List<Map<String, Object>> findKV(@ApiParam @PathParam("orgName") @ConcordKey String orgName,
+                                            @ApiParam @PathParam("projectName") @ConcordKey String projectName,
+                                            @QueryParam("offset") int offset,
+                                            @QueryParam("limit") int limit,
+                                            @QueryParam("filter") String filter) {
+
+        OrganizationEntry org = orgManager.assertAccess(orgName, false);
+
+        ProjectEntry project = accessManager.assertAccess(org.getId(), null, projectName, ResourceAccessLevel.READER, false);
+
+        return kvDao.list(project.getId(), offset, limit, filter);
+    }
+
     @GET
     @ApiOperation("Get a project's configuration")
     @Path("/{orgName}/project/{projectName}/cfg{path: (.*)?}")
diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessKvResource.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/ProcessKvResource.java
@@ -22,7 +22,6 @@
 
 import com.walmartlabs.concord.server.org.project.KvDao;
 import com.walmartlabs.concord.server.process.queue.ProcessQueueManager;
-import com.walmartlabs.concord.server.sdk.ConcordApplicationException;
 import com.walmartlabs.concord.server.sdk.PartialProcessKey;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -37,7 +36,6 @@
 import javax.inject.Singleton;
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
 import java.util.UUID;
 
 @Named
@@ -127,17 +125,9 @@ public long incLong(@PathParam("id") UUID instanceId,
     }
 
     private UUID assertProjectId(UUID instanceId) {
-        PartialProcessKey processKey = PartialProcessKey.from(instanceId);
-
-        // TODO replace with getProjectId
-        ProcessEntry entry = processQueueManager.get(processKey);
-        if (entry == null) {
-            throw new ConcordApplicationException("Process instance not found", Response.Status.NOT_FOUND);
-        }
-
-        UUID projectId = entry.projectId();
+        UUID projectId = processQueueManager.getProjectId(PartialProcessKey.from(instanceId));
         if (projectId == null) {
-            log.warn("assertProjectId ['{}'] -> no project found, using the default value", processKey);
+            log.warn("assertProjectId ['{}'] -> no project found, using the default value", instanceId);
             projectId = DEFAULT_PROJECT_ID;
         }
 
diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/queue/ProcessQueueDao.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/queue/ProcessQueueDao.java
@@ -452,6 +452,13 @@ public UUID getOrgId(UUID instanceId) {
                 .fetchOne(orgId);
     }
 
+    public UUID getProjectId(UUID instanceId) {
+        return dsl().select(PROCESS_QUEUE.PROJECT_ID)
+                .from(PROCESS_QUEUE)
+                .where(PROCESS_QUEUE.INSTANCE_ID.eq(instanceId))
+                .fetchOne(PROCESS_QUEUE.PROJECT_ID);
+    }
+
     public Imports getImports(PartialProcessKey processKey) {
         return dsl().select(PROCESS_QUEUE.IMPORTS).from(PROCESS_QUEUE)
                 .where(PROCESS_QUEUE.INSTANCE_ID.eq(processKey.getInstanceId()))
diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/queue/ProcessQueueManager.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/queue/ProcessQueueManager.java
@@ -206,6 +206,10 @@ public ProcessEntry get(PartialProcessKey partialProcessKey) {
         return queueDao.get(key);
     }
 
+    public UUID getProjectId(PartialProcessKey partialProcessKey) {
+        return queueDao.getProjectId(partialProcessKey.getInstanceId());
+    }
+
     public ProcessInitiatorEntry getInitiator(PartialProcessKey partialProcessKey) {
         ProcessKey key = keyCache.get(partialProcessKey.getInstanceId());
         if (key == null) {
diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/user/UserManager.java b/server/impl/src/main/java/com/walmartlabs/concord/server/user/UserManager.java
@@ -75,7 +75,6 @@ public Optional<UserEntry> getOrCreate(String username, String userDomain, UserT
         return getOrCreate(username, userDomain, type, null, null, null);
     }
 
-
     public Optional<UserEntry> getOrCreate(String username, String userDomain, UserType type, String displayName, String email, Set<String> roles) {
         Optional<UserEntry> result = get(username, userDomain, type);
         if (result.isPresent()) {

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public ConsoleService(ProjectDao projectDao,`
`114`	`114`	`public UserResponse whoami() {`
`115`	`115`	`UserPrincipal p = UserPrincipal.getCurrent();`
`116`	`116`	`if (p == null) {`
`117`		`- throw new ConcordApplicationException("Can't determine current user: pricipal not found",`
	`117`	`+ throw new ConcordApplicationException("Can't determine current user: principal not found",`
`118`	`118`	`Status.INTERNAL_SERVER_ERROR);`
`119`	`119`	`}`
`120`	`120`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,6 @@ public Optional<UserEntry> getOrCreate(String username, String userDomain, UserT`
`75`	`75`	`return getOrCreate(username, userDomain, type, null, null, null);`
`76`	`76`	`}`
`77`	`77`
`78`		`-`
`79`	`78`	`public Optional<UserEntry> getOrCreate(String username, String userDomain, UserType type, String displayName, String email, Set<String> roles) {`
`80`	`79`	`Optional<UserEntry> result = get(username, userDomain, type);`
`81`	`80`	`if (result.isPresent()) {`