From c2214e10ba13155dff68225a04dc52d353130e6c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 20:29:20 +0000 Subject: [PATCH 1/8] Bump com.apollographql.apollo3 from 3.4.0 to 3.5.0 Bumps [com.apollographql.apollo3](https://github.com/apollographql/apollo-kotlin) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/apollographql/apollo-kotlin/releases) - [Changelog](https://github.com/apollographql/apollo-kotlin/blob/main/CHANGELOG.md) - [Commits](https://github.com/apollographql/apollo-kotlin/compare/v3.4.0...v3.5.0) --- updated-dependencies: - dependency-name: com.apollographql.apollo3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 01471b6..1fa4ea7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -10,7 +10,7 @@ pluginManagement { id 'com.avast.gradle.docker-compose' version "0.16.8" apply false id 'io.gitlab.arturbosch.detekt' version "1.21.0" apply false id 'com.github.johnrengelman.shadow' version "7.1.2" apply false - id 'com.apollographql.apollo3' version "3.4.0" apply false + id 'com.apollographql.apollo3' version "3.5.0" apply false id 'org.mikeneck.graalvm-native-image' version "1.4.1" apply false id 'com.diffplug.spotless' version '6.9.0' apply false } From cb257a37ecf9caf001a272b8ef572f61506a3d1e Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Tue, 2 Aug 2022 08:46:51 +0400 Subject: [PATCH 2/8] Update gradle.properties --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index acd6240..c32f10e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ projectVersion=0.6.2-SNAPSHOT vertxVersion=4.3.0 graalVersion = 21.3.0 -apolloVersion=3.4.0 +apolloVersion=3.5.0 commonsLang3Version = 3.12.0 cliktVersion = 3.2.0 bouncycastleVersion = 1.69 From ef477b4951e2bcafd238bb7c853b1dfe3c328d36 Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Tue, 2 Aug 2022 18:47:05 +0400 Subject: [PATCH 3/8] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e7a247a..a1fc4ff 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -156,11 +156,11 @@ jobs: - name: Build native spp-cli (Release) if: github.ref == 'refs/heads/master' - run: ./gradlew assembleUp nativeImage -Dbuild.profile=release -PcliVersion=$SPP_RELEASE_VERSION + run: ./gradlew assembleUp nativeImage -Dbuild.profile=release -PcliVersion=$SPP_RELEASE_VERSION --refresh-dependencies - name: Build native spp-cli (Snapshot) if: github.ref != 'refs/heads/master' - run: ./gradlew assembleUp nativeImage -Dbuild.profile=release + run: ./gradlew assembleUp nativeImage -Dbuild.profile=release --refresh-dependencies - name: Docker IPs run: docker inspect --format='{{.Name}} - {{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $(docker ps -aq) From 72b527a65e0b305a375e94a884106ef96cc5413f Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Tue, 2 Aug 2022 19:12:58 +0400 Subject: [PATCH 4/8] deps: update schema --- src/main/graphql/schema.json | 301 ++++++++++++++++++++++++++++++++++- 1 file changed, 296 insertions(+), 5 deletions(-) diff --git a/src/main/graphql/schema.json b/src/main/graphql/schema.json index 1a33fb6..cac6d74 100644 --- a/src/main/graphql/schema.json +++ b/src/main/graphql/schema.json @@ -278,6 +278,41 @@ "enumValues": null, "possibleTypes": null }, + { + "kind": "OBJECT", + "name": "ClientAccess", + "description": null, + "fields": [ + { + "name": "id", + "description": null, + "args": [], + "type": { + "kind": "SCALAR", + "name": "String", + "ofType": null + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "secret", + "description": null, + "args": [], + "type": { + "kind": "SCALAR", + "name": "String", + "ofType": null + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, { "kind": "OBJECT", "name": "DataRedaction", @@ -300,7 +335,39 @@ "deprecationReason": null }, { - "name": "redactionPattern", + "name": "type", + "description": null, + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "ENUM", + "name": "RedactionType", + "ofType": null + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "lookup", + "description": null, + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "String", + "ofType": null + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "replacement", "description": null, "args": [], "type": { @@ -2630,7 +2697,76 @@ "description": null, "args": [ { - "name": "redactionPattern", + "name": "id", + "description": null, + "type": { + "kind": "SCALAR", + "name": "String", + "ofType": null + }, + "defaultValue": null + }, + { + "name": "type", + "description": null, + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "ENUM", + "name": "RedactionType", + "ofType": null + } + }, + "defaultValue": null + }, + { + "name": "lookup", + "description": null, + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "String", + "ofType": null + } + }, + "defaultValue": null + }, + { + "name": "replacement", + "description": null, + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "String", + "ofType": null + } + }, + "defaultValue": null + } + ], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "OBJECT", + "name": "DataRedaction", + "ofType": null + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "updateDataRedaction", + "description": null, + "args": [ + { + "name": "id", "description": null, "type": { "kind": "NON_NULL", @@ -2642,6 +2778,36 @@ } }, "defaultValue": null + }, + { + "name": "type", + "description": null, + "type": { + "kind": "ENUM", + "name": "RedactionType", + "ofType": null + }, + "defaultValue": null + }, + { + "name": "lookup", + "description": null, + "type": { + "kind": "SCALAR", + "name": "String", + "ofType": null + }, + "defaultValue": null + }, + { + "name": "replacement", + "description": null, + "type": { + "kind": "SCALAR", + "name": "String", + "ofType": null + }, + "defaultValue": null } ], "type": { @@ -3378,6 +3544,84 @@ }, "isDeprecated": false, "deprecationReason": null + }, + { + "name": "addClientAccess", + "description": null, + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "OBJECT", + "name": "ClientAccess", + "ofType": null + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "removeClientAccess", + "description": null, + "args": [ + { + "name": "id", + "description": null, + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "String", + "ofType": null + } + }, + "defaultValue": null + } + ], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "Boolean", + "ofType": null + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "updateClientAccess", + "description": null, + "args": [ + { + "name": "id", + "description": null, + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "String", + "ofType": null + } + }, + "defaultValue": null + } + ], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "OBJECT", + "name": "ClientAccess", + "ofType": null + } + }, + "isDeprecated": false, + "deprecationReason": null } ], "inputFields": null, @@ -4004,6 +4248,30 @@ }, "isDeprecated": false, "deprecationReason": null + }, + { + "name": "getClientAccessors", + "description": null, + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "OBJECT", + "name": "ClientAccess", + "ofType": null + } + } + } + }, + "isDeprecated": false, + "deprecationReason": null } ], "inputFields": null, @@ -4011,6 +4279,29 @@ "enumValues": null, "possibleTypes": null }, + { + "kind": "ENUM", + "name": "RedactionType", + "description": null, + "fields": null, + "inputFields": null, + "interfaces": null, + "enumValues": [ + { + "name": "IDENTIFIER_MATCH", + "description": null, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "VALUE_REGEX", + "description": null, + "isDeprecated": false, + "deprecationReason": null + } + ], + "possibleTypes": null + }, { "kind": "ENUM", "name": "RolePermission", @@ -4225,7 +4516,7 @@ }, { "name": "VIEW_ACTIVITY", - "description": null, + "description": " VIEW_OVERVIEW,", "isDeprecated": false, "deprecationReason": null }, @@ -5414,7 +5705,7 @@ "FIELD_DEFINITION", "ARGUMENT_DEFINITION", "ENUM_VALUE", - "VARIABLE_DEFINITION" + "INPUT_FIELD_DEFINITION" ], "args": [ { @@ -5455,4 +5746,4 @@ ] } } -} +} \ No newline at end of file From 98c3bee8f058f39311a3371d2b7fddcecaa45f65 Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Tue, 2 Aug 2022 19:13:12 +0400 Subject: [PATCH 5/8] shouldn't be necessary --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a1fc4ff..e7a247a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -156,11 +156,11 @@ jobs: - name: Build native spp-cli (Release) if: github.ref == 'refs/heads/master' - run: ./gradlew assembleUp nativeImage -Dbuild.profile=release -PcliVersion=$SPP_RELEASE_VERSION --refresh-dependencies + run: ./gradlew assembleUp nativeImage -Dbuild.profile=release -PcliVersion=$SPP_RELEASE_VERSION - name: Build native spp-cli (Snapshot) if: github.ref != 'refs/heads/master' - run: ./gradlew assembleUp nativeImage -Dbuild.profile=release --refresh-dependencies + run: ./gradlew assembleUp nativeImage -Dbuild.profile=release - name: Docker IPs run: docker inspect --format='{{.Name}} - {{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $(docker ps -aq) From 3da40690d142fb850f740b7815f078591b97b8cf Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Tue, 2 Aug 2022 20:38:18 +0400 Subject: [PATCH 6/8] fix: add missing role permissions --- src/main/graphql/schema.json | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/main/graphql/schema.json b/src/main/graphql/schema.json index cac6d74..6515617 100644 --- a/src/main/graphql/schema.json +++ b/src/main/graphql/schema.json @@ -4316,6 +4316,30 @@ "isDeprecated": false, "deprecationReason": null }, + { + "name": "ADD_CLIENT_ACCESS", + "description": null, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "REMOVE_CLIENT_ACCESS", + "description": null, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "GET_CLIENT_ACCESSORS", + "description": null, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "UPDATE_CLIENT_ACCESS", + "description": null, + "isDeprecated": false, + "deprecationReason": null + }, { "name": "ADD_DEVELOPER", "description": null, From 0dcc34e8e88e13c3804c347b00337459c0570755 Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Tue, 2 Aug 2022 20:39:16 +0400 Subject: [PATCH 7/8] Update src/main/graphql/schema.json --- src/main/graphql/schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/graphql/schema.json b/src/main/graphql/schema.json index 6515617..3679f22 100644 --- a/src/main/graphql/schema.json +++ b/src/main/graphql/schema.json @@ -4540,7 +4540,7 @@ }, { "name": "VIEW_ACTIVITY", - "description": " VIEW_OVERVIEW,", + "description": " null", "isDeprecated": false, "deprecationReason": null }, From a5647a7b4ec5744e668829a9c1c2e2b23e9755fe Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Tue, 2 Aug 2022 20:39:40 +0400 Subject: [PATCH 8/8] Update src/main/graphql/schema.json --- src/main/graphql/schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/graphql/schema.json b/src/main/graphql/schema.json index 3679f22..9e3538e 100644 --- a/src/main/graphql/schema.json +++ b/src/main/graphql/schema.json @@ -4540,7 +4540,7 @@ }, { "name": "VIEW_ACTIVITY", - "description": " null", + "description": null, "isDeprecated": false, "deprecationReason": null },