feat(graphQL): add missing subqueries/mutations #319

aali309 · 2024-03-07T01:29:18Z

Welcome to Cryostat3! 👋

Before contributing, make sure you have:

Read the contributing guidelines
Linked a relevant issue which this PR resolves
Linked any other relevant issues, PR's, or documentation, if any
Resolved all conflicts, if any
Rebased your branch PR on top of the latest upstream main branch
Attached at least one of the following labels to the PR: [chore, ci, docs, feat, fix, test]
Signed all commits using a GPG signature

To recreate commits with GPG signature git fetch upstream && git rebase --force --gpg-sign upstream/main

Based on: #315
Fixes #322

Description of the change:

This change allows an environment variable to be configured so that...

Motivation for the change:

This change is helpful because users may want to...

How to manually test:

cd src/main/webui
checkout to correspondig PR gh pr checkout 1227 or git checkout + PR
cd -
./mvnw clean package ; podman image prune -f ; ./smoketest.bash -O
Create a new recording or using the existing recordings try to add new labels, edit the labels and delete/remove and verify all work as expected.
Archive the recordings and try the same, add, edit and delete the labels and see they work as expected.

src/main/java/io/cryostat/graphql/ActiveRecordings.java

src/main/java/io/cryostat/recordings/Recordings.java

aali309 · 2024-03-13T17:21:15Z

/build_test

github-actions · 2024-03-13T17:21:37Z

Workflow started at 3/13/2024, 1:21:37 PM. View Actions Run.

github-actions · 2024-03-13T17:23:14Z

CI build and push: At least one test failed ❌ (JDK17)
https://github.com/cryostatio/cryostat3/actions/runs/8268916468

github-actions · 2024-03-13T17:23:33Z

CI build and push: At least one test failed ❌ (JDK21)
https://github.com/cryostatio/cryostat3/actions/runs/8268916468

aali309 · 2024-03-13T17:46:42Z

/build_test

github-actions · 2024-03-13T17:47:04Z

Workflow started at 3/13/2024, 1:47:04 PM. View Actions Run.

github-actions · 2024-03-13T17:49:27Z

CI build and push: All tests pass ✅ (JDK21)
https://github.com/cryostatio/cryostat3/actions/runs/8269236271

github-actions · 2024-03-13T17:53:15Z

CI build and push: At least one test failed ❌ (JDK17)
https://github.com/cryostatio/cryostat3/actions/runs/8269236271

aali309 · 2024-03-13T20:20:06Z

/build_test

github-actions · 2024-03-13T20:20:25Z

Workflow started at 3/13/2024, 4:20:25 PM. View Actions Run.

github-actions · 2024-03-13T20:22:35Z

CI build and push: All tests pass ✅ (JDK21)
https://github.com/cryostatio/cryostat3/actions/runs/8271051291

github-actions · 2024-03-13T20:26:45Z

CI build and push: All tests pass ✅ (JDK17)
https://github.com/cryostatio/cryostat3/actions/runs/8271051291

src/main/java/io/cryostat/graphql/ArchivedRecordings.java

andrewazores · 2024-03-14T15:06:14Z

Looking good. Could you also prepare a corresponding -web PR to update the frontend? It will have similar changes to what I did here: cryostatio/cryostat-web#1224

The end result of this PR and the frontend PR should be that you can edit recording labels (on both active and archived recordings):

andrewazores · 2024-03-14T15:07:33Z

It might be easier to rebase on top of #315 since that's what also makes the target { recordings { archived } } -> target { archivedRecordings { } } change.

github-actions · 2024-03-22T18:00:25Z

CI build and push: At least one test failed ❌ (JDK17)
https://github.com/cryostatio/cryostat3/actions/runs/8394488950

github-actions · 2024-03-22T18:00:29Z

CI build and push: All tests pass ✅ (JDK21)
https://github.com/cryostatio/cryostat3/actions/runs/8394488950

github-actions · 2024-03-22T18:01:43Z

OpenAPI schema change detected:

diff --git a/schema/openapi.yaml b/schema/openapi.yaml
index 95010a6..ef6a8d4 100644
--- a/schema/openapi.yaml
+++ b/schema/openapi.yaml
@@ -24,20 +24,22 @@ components:
             type: string
           type: object
       type: object
     ArchivedRecording:
       properties:
         archivedTime:
           format: int64
           type: integer
         downloadUrl:
           type: string
+        jvmId:
+          type: string
         metadata:
           $ref: '#/components/schemas/Metadata'
         name:
           type: string
         reportUrl:
           type: string
         size:
           format: int64
           type: integer
       type: object
@@ -375,20 +377,45 @@ paths:
                 type: array
           description: OK
         "401":
           description: Not Authorized
         "403":
           description: Not Allowed
       security:
         - SecurityScheme: []
       tags:
         - Recordings
+  /api/beta/fs/recordings/{jvmId}:
+    get:
+      parameters:
+        - in: path
+          name: jvmId
+          required: true
+          schema:
+            type: string
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                items:
+                  $ref: '#/components/schemas/ArchivedRecordingDirectory'
+                type: array
+          description: OK
+        "401":
+          description: Not Authorized
+        "403":
+          description: Not Allowed
+      security:
+        - SecurityScheme: []
+      tags:
+        - Recordings
   /api/beta/fs/recordings/{jvmId}/{filename}:
     delete:
       parameters:
         - in: path
           name: filename
           required: true
           schema:
             type: string
         - in: path
           name: jvmId
@@ -1240,20 +1267,45 @@ paths:
             application/json:
               schema:
                 additionalProperties:
                   additionalProperties:
                     type: string
                   type: object
                 type: object
           description: OK
       tags:
         - Discovery
+  /api/v2.2/graphql:
+    get:
+      responses:
+        "200":
+          description: OK
+        "401":
+          description: Not Authorized
+        "403":
+          description: Not Allowed
+      security:
+        - SecurityScheme: []
+      tags:
+        - Graph QL
+    post:
+      responses:
+        "200":
+          description: OK
+        "401":
+          description: Not Authorized
+        "403":
+          description: Not Allowed
+      security:
+        - SecurityScheme: []
+      tags:
+        - Graph QL
   /api/v2/rules:
     get:
       responses:
         "200":
           content:
             application/json:
               schema:
                 $ref: '#/components/schemas/V2Response'
           description: OK
         "401":

aali309 · 2024-03-22T20:07:20Z

/build_test

github-actions · 2024-03-22T20:07:45Z

Workflow started at 3/22/2024, 4:07:44 PM. View Actions Run.

github-actions · 2024-03-22T20:10:03Z

CI build and push: All tests pass ✅ (JDK21)
https://github.com/cryostatio/cryostat3/actions/runs/8395852036

github-actions · 2024-03-22T20:10:43Z

OpenAPI schema change detected:

diff --git a/schema/openapi.yaml b/schema/openapi.yaml
index 95010a6..ef6a8d4 100644
--- a/schema/openapi.yaml
+++ b/schema/openapi.yaml
@@ -24,20 +24,22 @@ components:
             type: string
           type: object
       type: object
     ArchivedRecording:
       properties:
         archivedTime:
           format: int64
           type: integer
         downloadUrl:
           type: string
+        jvmId:
+          type: string
         metadata:
           $ref: '#/components/schemas/Metadata'
         name:
           type: string
         reportUrl:
           type: string
         size:
           format: int64
           type: integer
       type: object
@@ -375,20 +377,45 @@ paths:
                 type: array
           description: OK
         "401":
           description: Not Authorized
         "403":
           description: Not Allowed
       security:
         - SecurityScheme: []
       tags:
         - Recordings
+  /api/beta/fs/recordings/{jvmId}:
+    get:
+      parameters:
+        - in: path
+          name: jvmId
+          required: true
+          schema:
+            type: string
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                items:
+                  $ref: '#/components/schemas/ArchivedRecordingDirectory'
+                type: array
+          description: OK
+        "401":
+          description: Not Authorized
+        "403":
+          description: Not Allowed
+      security:
+        - SecurityScheme: []
+      tags:
+        - Recordings
   /api/beta/fs/recordings/{jvmId}/{filename}:
     delete:
       parameters:
         - in: path
           name: filename
           required: true
           schema:
             type: string
         - in: path
           name: jvmId
@@ -1240,20 +1267,45 @@ paths:
             application/json:
               schema:
                 additionalProperties:
                   additionalProperties:
                     type: string
                   type: object
                 type: object
           description: OK
       tags:
         - Discovery
+  /api/v2.2/graphql:
+    get:
+      responses:
+        "200":
+          description: OK
+        "401":
+          description: Not Authorized
+        "403":
+          description: Not Allowed
+      security:
+        - SecurityScheme: []
+      tags:
+        - Graph QL
+    post:
+      responses:
+        "200":
+          description: OK
+        "401":
+          description: Not Authorized
+        "403":
+          description: Not Allowed
+      security:
+        - SecurityScheme: []
+      tags:
+        - Graph QL
   /api/v2/rules:
     get:
       responses:
         "200":
           content:
             application/json:
               schema:
                 $ref: '#/components/schemas/V2Response'
           description: OK
         "401":

github-actions · 2024-03-22T20:14:04Z

CI build and push: All tests pass ✅ (JDK17)
https://github.com/cryostatio/cryostat3/actions/runs/8395852036

aali309 · 2024-04-01T19:19:27Z

/build_test

github-actions · 2024-04-01T19:19:51Z

Workflow started at 4/1/2024, 3:19:51 PM. View Actions Run.

github-actions · 2024-04-01T19:22:15Z

CI build and push: All tests pass ✅ (JDK21)
https://github.com/cryostatio/cryostat3/actions/runs/8512578578

github-actions · 2024-04-01T19:23:03Z

OpenAPI schema change detected:

diff --git a/schema/openapi.yaml b/schema/openapi.yaml
index 95010a6..ef6a8d4 100644
--- a/schema/openapi.yaml
+++ b/schema/openapi.yaml
@@ -24,20 +24,22 @@ components:
             type: string
           type: object
       type: object
     ArchivedRecording:
       properties:
         archivedTime:
           format: int64
           type: integer
         downloadUrl:
           type: string
+        jvmId:
+          type: string
         metadata:
           $ref: '#/components/schemas/Metadata'
         name:
           type: string
         reportUrl:
           type: string
         size:
           format: int64
           type: integer
       type: object
@@ -375,20 +377,45 @@ paths:
                 type: array
           description: OK
         "401":
           description: Not Authorized
         "403":
           description: Not Allowed
       security:
         - SecurityScheme: []
       tags:
         - Recordings
+  /api/beta/fs/recordings/{jvmId}:
+    get:
+      parameters:
+        - in: path
+          name: jvmId
+          required: true
+          schema:
+            type: string
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                items:
+                  $ref: '#/components/schemas/ArchivedRecordingDirectory'
+                type: array
+          description: OK
+        "401":
+          description: Not Authorized
+        "403":
+          description: Not Allowed
+      security:
+        - SecurityScheme: []
+      tags:
+        - Recordings
   /api/beta/fs/recordings/{jvmId}/{filename}:
     delete:
       parameters:
         - in: path
           name: filename
           required: true
           schema:
             type: string
         - in: path
           name: jvmId
@@ -1240,20 +1267,45 @@ paths:
             application/json:
               schema:
                 additionalProperties:
                   additionalProperties:
                     type: string
                   type: object
                 type: object
           description: OK
       tags:
         - Discovery
+  /api/v2.2/graphql:
+    get:
+      responses:
+        "200":
+          description: OK
+        "401":
+          description: Not Authorized
+        "403":
+          description: Not Allowed
+      security:
+        - SecurityScheme: []
+      tags:
+        - Graph QL
+    post:
+      responses:
+        "200":
+          description: OK
+        "401":
+          description: Not Authorized
+        "403":
+          description: Not Allowed
+      security:
+        - SecurityScheme: []
+      tags:
+        - Graph QL
   /api/v2/rules:
     get:
       responses:
         "200":
           content:
             application/json:
               schema:
                 $ref: '#/components/schemas/V2Response'
           description: OK
         "401":

github-actions · 2024-04-01T19:26:34Z

CI build and push: All tests pass ✅ (JDK17)
https://github.com/cryostatio/cryostat3/actions/runs/8512578578

src/main/java/io/cryostat/graphql/ActiveRecordings.java

src/main/java/io/cryostat/recordings/RecordingHelper.java

andrewazores · 2024-04-03T19:06:06Z

Server side looks great, just a couple of minor notes above but otherwise this is just about ready to merge.

aali309 · 2024-04-13T00:58:25Z

/build_test

github-actions · 2024-04-13T00:58:45Z

Workflow started at 4/12/2024, 8:58:45 PM. View Actions Run.

github-actions · 2024-04-13T01:02:25Z

OpenAPI schema change detected:

diff --git a/schema/openapi.yaml b/schema/openapi.yaml
index 95010a6..ef6a8d4 100644
--- a/schema/openapi.yaml
+++ b/schema/openapi.yaml
@@ -24,20 +24,22 @@ components:
             type: string
           type: object
       type: object
     ArchivedRecording:
       properties:
         archivedTime:
           format: int64
           type: integer
         downloadUrl:
           type: string
+        jvmId:
+          type: string
         metadata:
           $ref: '#/components/schemas/Metadata'
         name:
           type: string
         reportUrl:
           type: string
         size:
           format: int64
           type: integer
       type: object
@@ -375,20 +377,45 @@ paths:
                 type: array
           description: OK
         "401":
           description: Not Authorized
         "403":
           description: Not Allowed
       security:
         - SecurityScheme: []
       tags:
         - Recordings
+  /api/beta/fs/recordings/{jvmId}:
+    get:
+      parameters:
+        - in: path
+          name: jvmId
+          required: true
+          schema:
+            type: string
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                items:
+                  $ref: '#/components/schemas/ArchivedRecordingDirectory'
+                type: array
+          description: OK
+        "401":
+          description: Not Authorized
+        "403":
+          description: Not Allowed
+      security:
+        - SecurityScheme: []
+      tags:
+        - Recordings
   /api/beta/fs/recordings/{jvmId}/{filename}:
     delete:
       parameters:
         - in: path
           name: filename
           required: true
           schema:
             type: string
         - in: path
           name: jvmId
@@ -1240,20 +1267,45 @@ paths:
             application/json:
               schema:
                 additionalProperties:
                   additionalProperties:
                     type: string
                   type: object
                 type: object
           description: OK
       tags:
         - Discovery
+  /api/v2.2/graphql:
+    get:
+      responses:
+        "200":
+          description: OK
+        "401":
+          description: Not Authorized
+        "403":
+          description: Not Allowed
+      security:
+        - SecurityScheme: []
+      tags:
+        - Graph QL
+    post:
+      responses:
+        "200":
+          description: OK
+        "401":
+          description: Not Authorized
+        "403":
+          description: Not Allowed
+      security:
+        - SecurityScheme: []
+      tags:
+        - Graph QL
   /api/v2/rules:
     get:
       responses:
         "200":
           content:
             application/json:
               schema:
                 $ref: '#/components/schemas/V2Response'
           description: OK
         "401":

github-actions · 2024-04-13T01:05:05Z

CI build and push: All tests pass ✅ (JDK17)
https://github.com/cryostatio/cryostat3/actions/runs/8669811913

aali309 added the feat New feature or request label Mar 7, 2024

aali309 closed this Mar 7, 2024

aali309 force-pushed the missingSubqueries branch from 41b80d9 to e3a364b Compare March 7, 2024 16:03

aali309 reopened this Mar 7, 2024

aali309 force-pushed the missingSubqueries branch from 35f2e5f to b357d04 Compare March 7, 2024 16:18

andrewazores force-pushed the graphql branch from e3a364b to 8255856 Compare March 7, 2024 17:37

aali309 force-pushed the missingSubqueries branch from b357d04 to bf588c2 Compare March 7, 2024 19:08

andrewazores force-pushed the graphql branch from 8255856 to cead773 Compare March 11, 2024 14:39

andrewazores mentioned this pull request Mar 11, 2024

fix(topology): update for new GraphQL schema cryostatio/cryostat-web#1224

Merged

7 tasks

aali309 force-pushed the missingSubqueries branch from a192439 to a337fef Compare March 11, 2024 16:18

aali309 marked this pull request as ready for review March 11, 2024 17:50

aali309 added the safe-to-test label Mar 11, 2024

aali309 requested a review from andrewazores March 11, 2024 17:51

andrewazores reviewed Mar 11, 2024

View reviewed changes

src/main/java/io/cryostat/graphql/ActiveRecordings.java Outdated Show resolved Hide resolved

andrewazores reviewed Mar 12, 2024

View reviewed changes

src/main/java/io/cryostat/recordings/Recordings.java Outdated Show resolved Hide resolved

andrewazores reviewed Mar 14, 2024

View reviewed changes

src/main/java/io/cryostat/graphql/ArchivedRecordings.java Outdated Show resolved Hide resolved

mvn spotless:apply

dc2bd03

resolve front end issues

ba36dda

remove unused imports

9c20944

andrewazores reviewed Apr 3, 2024

View reviewed changes

src/main/java/io/cryostat/graphql/ActiveRecordings.java Outdated Show resolved Hide resolved

andrewazores reviewed Apr 3, 2024

View reviewed changes

src/main/java/io/cryostat/recordings/RecordingHelper.java Show resolved Hide resolved

andrewazores reviewed Apr 3, 2024

View reviewed changes

src/main/java/io/cryostat/recordings/RecordingHelper.java Outdated Show resolved Hide resolved

aali309 requested a review from andrewazores April 13, 2024 00:51

resolve issues

c8c5905

andrewazores approved these changes Apr 13, 2024

View reviewed changes

andrewazores merged commit f23774c into cryostatio:graphql Apr 13, 2024
8 checks passed

andrewazores pushed a commit that referenced this pull request Apr 13, 2024

feat(graphQL): add missing labels/archives subqueries/mutations (#319)

4c50721

aali309 deleted the missingSubqueries branch July 23, 2024 18:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(graphQL): add missing subqueries/mutations #319

feat(graphQL): add missing subqueries/mutations #319

aali309 commented Mar 7, 2024 •

edited

Loading

aali309 commented Mar 13, 2024

github-actions bot commented Mar 13, 2024

github-actions bot commented Mar 13, 2024

github-actions bot commented Mar 13, 2024

aali309 commented Mar 13, 2024

github-actions bot commented Mar 13, 2024

github-actions bot commented Mar 13, 2024

github-actions bot commented Mar 13, 2024

aali309 commented Mar 13, 2024

github-actions bot commented Mar 13, 2024

github-actions bot commented Mar 13, 2024

github-actions bot commented Mar 13, 2024

andrewazores commented Mar 14, 2024

andrewazores commented Mar 14, 2024

github-actions bot commented Mar 22, 2024

github-actions bot commented Mar 22, 2024

github-actions bot commented Mar 22, 2024

aali309 commented Mar 22, 2024

github-actions bot commented Mar 22, 2024

github-actions bot commented Mar 22, 2024

github-actions bot commented Mar 22, 2024

github-actions bot commented Mar 22, 2024

aali309 commented Apr 1, 2024

github-actions bot commented Apr 1, 2024

github-actions bot commented Apr 1, 2024

github-actions bot commented Apr 1, 2024

github-actions bot commented Apr 1, 2024

andrewazores commented Apr 3, 2024

aali309 commented Apr 13, 2024

github-actions bot commented Apr 13, 2024

github-actions bot commented Apr 13, 2024

github-actions bot commented Apr 13, 2024

feat(graphQL): add missing subqueries/mutations #319

feat(graphQL): add missing subqueries/mutations #319

Conversation

aali309 commented Mar 7, 2024 • edited Loading

Welcome to Cryostat3! 👋

Before contributing, make sure you have:

Description of the change:

Motivation for the change:

How to manually test:

aali309 commented Mar 13, 2024

github-actions bot commented Mar 13, 2024

github-actions bot commented Mar 13, 2024

github-actions bot commented Mar 13, 2024

aali309 commented Mar 13, 2024

github-actions bot commented Mar 13, 2024

github-actions bot commented Mar 13, 2024

github-actions bot commented Mar 13, 2024

aali309 commented Mar 13, 2024

github-actions bot commented Mar 13, 2024

github-actions bot commented Mar 13, 2024

github-actions bot commented Mar 13, 2024

andrewazores commented Mar 14, 2024

andrewazores commented Mar 14, 2024

github-actions bot commented Mar 22, 2024

github-actions bot commented Mar 22, 2024

github-actions bot commented Mar 22, 2024

aali309 commented Mar 22, 2024

github-actions bot commented Mar 22, 2024

github-actions bot commented Mar 22, 2024

github-actions bot commented Mar 22, 2024

github-actions bot commented Mar 22, 2024

aali309 commented Apr 1, 2024

github-actions bot commented Apr 1, 2024

github-actions bot commented Apr 1, 2024

github-actions bot commented Apr 1, 2024

github-actions bot commented Apr 1, 2024

andrewazores commented Apr 3, 2024

aali309 commented Apr 13, 2024

github-actions bot commented Apr 13, 2024

github-actions bot commented Apr 13, 2024

github-actions bot commented Apr 13, 2024

aali309 commented Mar 7, 2024 •

edited

Loading