From 61ab0adc09bf55cdc508766fed7f445cb4ca72fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Nov 2021 20:15:10 +0000 Subject: [PATCH 01/83] chore(deps): bump postcss from 7.0.14 to 7.0.39 in /front-end/studio Bumps [postcss](https://github.com/postcss/postcss) from 7.0.14 to 7.0.39. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/7.0.39/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/7.0.14...7.0.39) --- updated-dependencies: - dependency-name: postcss dependency-type: indirect ... Signed-off-by: dependabot[bot] --- front-end/studio/yarn.lock | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/front-end/studio/yarn.lock b/front-end/studio/yarn.lock index e00f34975..fdd1bda06 100644 --- a/front-end/studio/yarn.lock +++ b/front-end/studio/yarn.lock @@ -2649,7 +2649,7 @@ caseless@~0.12.0: resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= -chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: +chalk@^2.0.0, chalk@^2.4.1: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -7042,6 +7042,11 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= +picocolors@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f" + integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA== + picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3: version "2.3.0" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" @@ -7657,23 +7662,13 @@ postcss@8.2.15: nanoid "^3.1.23" source-map "^0.6.1" -postcss@^7.0.0, postcss@^7.0.1: - version "7.0.14" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5" - integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg== +postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.27, postcss@^7.0.35: + version "7.0.39" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309" + integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA== dependencies: - chalk "^2.4.2" + picocolors "^0.2.1" source-map "^0.6.1" - supports-color "^6.1.0" - -postcss@^7.0.27, postcss@^7.0.35: - version "7.0.36" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.36.tgz#056f8cffa939662a8f5905950c07d5285644dfcb" - integrity sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw== - dependencies: - chalk "^2.4.2" - source-map "^0.6.1" - supports-color "^6.1.0" postcss@^8.1.4, postcss@^8.2.4: version "8.3.5" From 1706a5f4d6617d9a30be0f3118fd174d7ef81e3d Mon Sep 17 00:00:00 2001 From: Eric Wittmann Date: Mon, 22 Nov 2021 10:09:36 -0500 Subject: [PATCH 02/83] Upgraded codegen to 1.0.3.Final --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 362510895..5b92c46d4 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ 1.1.19 1.3.2.Final - 1.0.2.Final + 1.0.3.Final 2.6.4 From 101e7b4949293cb3759325d0f8a287d7ccde6f88 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Nov 2021 19:02:39 +0000 Subject: [PATCH 03/83] chore(deps): bump version.io.gatling from 3.6.1 to 3.7.1 Bumps `version.io.gatling` from 3.6.1 to 3.7.1. Updates `gatling-app` from 3.6.1 to 3.7.1 - [Release notes](https://github.com/gatling/gatling/releases) - [Commits](https://github.com/gatling/gatling/compare/v3.6.1...v3.7.1) Updates `gatling-charts-highcharts` from 3.6.1 to 3.7.1 - [Release notes](https://github.com/gatling/gatling-highcharts/releases) - [Commits](https://github.com/gatling/gatling-highcharts/compare/v3.6.1...v3.7.1) --- updated-dependencies: - dependency-name: io.gatling:gatling-app dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.gatling.highcharts:gatling-charts-highcharts dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b92c46d4..300b2d308 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ 2.11.0 2.6 3.12.0 - 3.6.1 + 3.7.1 0.12.0 1.3.2 2.0 From 05d4964a94336ee2a6f151bd9c761108b41fe2dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Nov 2021 19:01:42 +0000 Subject: [PATCH 04/83] chore(deps): bump gatling-maven-plugin from 3.1.2 to 4.0.1 Bumps [gatling-maven-plugin](https://github.com/gatling/gatling-maven-plugin) from 3.1.2 to 4.0.1. - [Release notes](https://github.com/gatling/gatling-maven-plugin/releases) - [Commits](https://github.com/gatling/gatling-maven-plugin/compare/3.1.2...v4.0.1) --- updated-dependencies: - dependency-name: io.gatling:gatling-maven-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 300b2d308..e90c8330f 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ 3.8.1 3.2.0 2.8.2 - 3.1.2 + 4.0.1 2.5.2 3.2.0 3.3.1 From f9c89e1f027ab487c919eede1d8e904cf035529f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Nov 2021 19:01:52 +0000 Subject: [PATCH 05/83] chore(deps-dev): bump selenide from 6.0.3 to 6.1.1 Bumps [selenide](https://github.com/selenide/selenide) from 6.0.3 to 6.1.1. - [Release notes](https://github.com/selenide/selenide/releases) - [Changelog](https://github.com/selenide/selenide/blob/master/CHANGELOG.md) - [Commits](https://github.com/selenide/selenide/compare/v6.0.3...v6.1.1) --- updated-dependencies: - dependency-name: com.codeborne:selenide dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test/integration/single-node-keycloak/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/single-node-keycloak/pom.xml b/test/integration/single-node-keycloak/pom.xml index ad87300e4..7ef2aee50 100644 --- a/test/integration/single-node-keycloak/pom.xml +++ b/test/integration/single-node-keycloak/pom.xml @@ -115,7 +115,7 @@ com.codeborne selenide - 6.0.3 + 6.1.1 test From 188ccd48897fa955af9dcfa96be3f144e1d7133c Mon Sep 17 00:00:00 2001 From: DyspC Date: Thu, 25 Nov 2021 10:37:32 +0100 Subject: [PATCH 06/83] Follow up for #1679, adds null safety for realms with no default roles fixes #1724 --- .../KeycloakAuthenticationFilter.java | 13 ++++++++---- .../security/QuarkusAuthenticationFilter.java | 21 ++++++++++++------- .../filters/KeycloakAuthenticationFilter.java | 13 ++++++++---- .../filters/QuarkusAuthenticationFilter.java | 21 ++++++++++++------- 4 files changed, 44 insertions(+), 24 deletions(-) diff --git a/back-end/hub-api/src/main/java/io/apicurio/hub/api/security/KeycloakAuthenticationFilter.java b/back-end/hub-api/src/main/java/io/apicurio/hub/api/security/KeycloakAuthenticationFilter.java index 1ef333624..f6c80521f 100644 --- a/back-end/hub-api/src/main/java/io/apicurio/hub/api/security/KeycloakAuthenticationFilter.java +++ b/back-end/hub-api/src/main/java/io/apicurio/hub/api/security/KeycloakAuthenticationFilter.java @@ -17,6 +17,7 @@ package io.apicurio.hub.api.security; import java.io.IOException; +import java.util.Collections; import java.util.Objects; import java.util.stream.Collectors; @@ -68,10 +69,14 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha user.setEmail(token.getEmail()); user.setLogin(token.getPreferredUsername()); user.setName(token.getName()); - user.setRoles(token.getRealmAccess().getRoles().stream() - .map(StudioRole::forName) - .filter(Objects::nonNull) - .collect(Collectors.toUnmodifiableList())); + if (token.getRealmAccess() == null || token.getRealmAccess().getRoles() == null) { + user.setRoles(Collections.emptyList()); + } else { + user.setRoles(token.getRealmAccess().getRoles().stream() + .map(StudioRole::forName) + .filter(Objects::nonNull) + .collect(Collectors.toUnmodifiableList())); + } ((SecurityContext) security).setUser(user); ((SecurityContext) security).setToken(session.getTokenString()); } diff --git a/back-end/hub-api/src/main/java/io/apicurio/hub/api/security/QuarkusAuthenticationFilter.java b/back-end/hub-api/src/main/java/io/apicurio/hub/api/security/QuarkusAuthenticationFilter.java index 4bd322d12..3a9ec828d 100644 --- a/back-end/hub-api/src/main/java/io/apicurio/hub/api/security/QuarkusAuthenticationFilter.java +++ b/back-end/hub-api/src/main/java/io/apicurio/hub/api/security/QuarkusAuthenticationFilter.java @@ -27,6 +27,7 @@ import javax.servlet.*; import javax.servlet.http.HttpServletRequest; import java.io.IOException; +import java.util.Collections; import java.util.Objects; import java.util.stream.Collectors; @@ -64,14 +65,18 @@ public class QuarkusAuthenticationFilter implements Filter { user.setEmail(principal.getClaim("email")); user.setLogin(principal.getClaim("preferred_username")); user.setName(principal.getClaim("name")); - user.setRoles( - principal.getClaim("realm_access") - .getJsonArray("roles").stream() - .map(JsonString.class::cast) - .map(JsonString::getString) - .map(StudioRole::forName) - .filter(Objects::nonNull) - .collect(Collectors.toUnmodifiableList())); + if (!principal.containsClaim("realm_access") || principal.getClaim("realm_access").isNull("roles")) { + user.setRoles(Collections.emptyList()); + } else { + user.setRoles( + principal.getClaim("realm_access") + .getJsonArray("roles").stream() + .map(JsonString.class::cast) + .map(JsonString::getString) + .map(StudioRole::forName) + .filter(Objects::nonNull) + .collect(Collectors.toUnmodifiableList())); + } ((SecurityContext) security).setUser(user); ((SecurityContext) security).setToken(principal.getRawToken()); diff --git a/front-end/servlet/src/main/java/io/apicurio/studio/fe/servlet/filters/KeycloakAuthenticationFilter.java b/front-end/servlet/src/main/java/io/apicurio/studio/fe/servlet/filters/KeycloakAuthenticationFilter.java index f57547e7e..15ceae34f 100644 --- a/front-end/servlet/src/main/java/io/apicurio/studio/fe/servlet/filters/KeycloakAuthenticationFilter.java +++ b/front-end/servlet/src/main/java/io/apicurio/studio/fe/servlet/filters/KeycloakAuthenticationFilter.java @@ -17,6 +17,7 @@ package io.apicurio.studio.fe.servlet.filters; import java.io.IOException; +import java.util.Collections; import java.util.Objects; import java.util.stream.Collectors; @@ -78,10 +79,14 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha user.setEmail(token.getEmail()); user.setLogin(token.getPreferredUsername()); user.setName(token.getName()); - user.setRoles(token.getRealmAccess().getRoles().stream() - .map(StudioRole::forName) - .filter(Objects::nonNull) - .collect(Collectors.toUnmodifiableList())); + if (token.getRealmAccess() == null || token.getRealmAccess().getRoles() == null) { + user.setRoles(Collections.emptyList()); + } else { + user.setRoles(token.getRealmAccess().getRoles().stream() + .map(StudioRole::forName) + .filter(Objects::nonNull) + .collect(Collectors.toUnmodifiableList())); + } httpSession.setAttribute(RequestAttributeKeys.USER_KEY, user); } } diff --git a/front-end/servlet/src/main/java/io/apicurio/studio/fe/servlet/filters/QuarkusAuthenticationFilter.java b/front-end/servlet/src/main/java/io/apicurio/studio/fe/servlet/filters/QuarkusAuthenticationFilter.java index 6e440e1ec..258f88ac2 100644 --- a/front-end/servlet/src/main/java/io/apicurio/studio/fe/servlet/filters/QuarkusAuthenticationFilter.java +++ b/front-end/servlet/src/main/java/io/apicurio/studio/fe/servlet/filters/QuarkusAuthenticationFilter.java @@ -29,6 +29,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import java.io.IOException; +import java.util.Collections; import java.util.Objects; import java.util.stream.Collectors; @@ -73,14 +74,18 @@ public class QuarkusAuthenticationFilter implements Filter { user.setEmail(principal.getClaim("email")); user.setLogin(principal.getClaim("preferred_username")); user.setName(principal.getClaim("name")); - user.setRoles( - principal.getClaim("realm_access") - .getJsonArray("roles").stream() - .map(JsonString.class::cast) - .map(JsonString::getString) - .map(StudioRole::forName) - .filter(Objects::nonNull) - .collect(Collectors.toUnmodifiableList())); + if (!principal.containsClaim("realm_access") || principal.getClaim("realm_access").isNull("roles")) { + user.setRoles(Collections.emptyList()); + } else { + user.setRoles( + principal.getClaim("realm_access") + .getJsonArray("roles").stream() + .map(JsonString.class::cast) + .map(JsonString::getString) + .map(StudioRole::forName) + .filter(Objects::nonNull) + .collect(Collectors.toUnmodifiableList())); + } httpSession.setAttribute(RequestAttributeKeys.USER_KEY, user); chain.doFilter(request, response); From e13dd6fee5a6af110fbe2d41e5f5c19d01b4ba71 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Nov 2021 19:01:22 +0000 Subject: [PATCH 07/83] chore(deps): bump version.io.gatling from 3.7.1 to 3.7.2 Bumps `version.io.gatling` from 3.7.1 to 3.7.2. Updates `gatling-app` from 3.7.1 to 3.7.2 - [Release notes](https://github.com/gatling/gatling/releases) - [Commits](https://github.com/gatling/gatling/compare/v3.7.1...v3.7.2) Updates `gatling-charts-highcharts` from 3.7.1 to 3.7.2 - [Release notes](https://github.com/gatling/gatling-highcharts/releases) - [Commits](https://github.com/gatling/gatling-highcharts/compare/v3.7.1...v3.7.2) --- updated-dependencies: - dependency-name: io.gatling:gatling-app dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.gatling.highcharts:gatling-charts-highcharts dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 300b2d308..3ca7d9b1a 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ 2.11.0 2.6 3.12.0 - 3.7.1 + 3.7.2 0.12.0 1.3.2 2.0 From cb2376e635c30098deb9afcbfec2bd1c6d861ba8 Mon Sep 17 00:00:00 2001 From: DyspC Date: Wed, 24 Nov 2021 16:44:08 +0100 Subject: [PATCH 08/83] Handle swagger reusable responses in response-tab --- .../path/operation/response-tab.component.css | 7 ++++ .../operation/response-tab.component.html | 14 ++++++-- .../path/operation/response-tab.component.ts | 36 ++++++++++++++++++- 3 files changed, 53 insertions(+), 4 deletions(-) diff --git a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/path/operation/response-tab.component.css b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/path/operation/response-tab.component.css index a0bfe229b..af14b931b 100644 --- a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/path/operation/response-tab.component.css +++ b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/path/operation/response-tab.component.css @@ -47,4 +47,11 @@ .response .response-examples a { cursor: pointer; +} + +.response .response-ref em { + font-style: normal; +} +.response .response-ref em > a { + font-weight: bold; } \ No newline at end of file diff --git a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/path/operation/response-tab.component.html b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/path/operation/response-tab.component.html index 82e581143..9ff1ca975 100644 --- a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/path/operation/response-tab.component.html +++ b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/path/operation/response-tab.component.html @@ -1,5 +1,5 @@
-
+
Description
@@ -10,7 +10,7 @@
-
+
Response Type
@@ -20,7 +20,7 @@
-
+
Examples
@@ -54,6 +54,14 @@
+ +
+
Response Definition
+ + This response references the + {{ definitionName() }} + Response Definition. +
diff --git a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/path/operation/response-tab.component.ts b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/path/operation/response-tab.component.ts index 968f5d891..e86765297 100644 --- a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/path/operation/response-tab.component.ts +++ b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/path/operation/response-tab.component.ts @@ -23,7 +23,7 @@ import { SimpleChanges, ViewEncapsulation } from "@angular/core"; -import {CommandFactory, ICommand, Library, Oas20Response, OasDocument, SimplifiedType} from "apicurio-data-models"; +import {CommandFactory, DocumentType, ICommand, Library, NodePath, Oas20Response, OasDocument, SimplifiedType} from "apicurio-data-models"; import {CommandService} from "../../../../_services/command.service"; import {DocumentService} from "../../../../_services/document.service"; import {EditExample20Event} from "../../../dialogs/edit-example-20.component"; @@ -50,6 +50,40 @@ export class ResponseTabComponent extends AbstractBaseComponent { super(changeDetectorRef, documentService, selectionService); } + isRef(): boolean { + return this.response.$ref !== null && this.response.$ref !== undefined; + } + + responseDefRefPrefix(): string { + let prefix: string = "#/components/responses/"; + if (this.response.ownerDocument().getDocumentType() === DocumentType.openapi2) { + prefix = "#/responses/"; + } + return prefix; + } + + responseDefPathPrefix(): string { + return this.responseDefRefPrefix().substr(1); + } + + definitionName(): string { + if (this.isRef()) { + let prefix: string = this.responseDefRefPrefix(); + let $ref: string = this.response.$ref; + if ($ref.startsWith(prefix)) { + return $ref.substr(prefix.length); + } + return this.response.$ref + } + return null; + } + + navigateToDefinition(): void { + let path: NodePath = new NodePath(this.responseDefPathPrefix()); + path.appendSegment(this.definitionName(), true); + this.selectionService.select(path.toString()); + } + protected onDocumentChange(): void { this._model = SimplifiedType.fromSchema(this.response.schema); } From 2e6c7756cd2959e19b2db539d7bf1d1e34476a87 Mon Sep 17 00:00:00 2001 From: Dysp Date: Tue, 30 Nov 2021 12:26:28 +0100 Subject: [PATCH 09/83] Remove pre-encoding of &ref query param for gitlab publication as it is handled by toString() --- .../java/io/apicurio/hub/api/gitlab/GitLabSourceConnector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back-end/hub-api/src/main/java/io/apicurio/hub/api/gitlab/GitLabSourceConnector.java b/back-end/hub-api/src/main/java/io/apicurio/hub/api/gitlab/GitLabSourceConnector.java index 8a25a9cb2..1a4f8591c 100644 --- a/back-end/hub-api/src/main/java/io/apicurio/hub/api/gitlab/GitLabSourceConnector.java +++ b/back-end/hub-api/src/main/java/io/apicurio/hub/api/gitlab/GitLabSourceConnector.java @@ -638,7 +638,7 @@ private ResourceContent getResourceContentFromGitLab(GitLabResource resource) th String getContentUrl = this.endpoint("/api/v4/projects/:id/repository/files/:path") .bind("id", toEncodedId(resource)) .bind("path", toEncodedPath(resource)) - .queryParam("ref", toEncodedBranch(resource)) + .queryParam("ref", resource.getBranch()) .toString(); HttpGet get = new HttpGet(getContentUrl); From 15d30f1196cae94d1b4937ccad0943ea6ccb2f3e Mon Sep 17 00:00:00 2001 From: Dysp Date: Tue, 30 Nov 2021 12:28:23 +0100 Subject: [PATCH 10/83] Fix encoding of space characters in path params being '+' instead of '%20' during gitlab publications --- .../java/io/apicurio/hub/api/gitlab/GitLabSourceConnector.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/back-end/hub-api/src/main/java/io/apicurio/hub/api/gitlab/GitLabSourceConnector.java b/back-end/hub-api/src/main/java/io/apicurio/hub/api/gitlab/GitLabSourceConnector.java index 1a4f8591c..21a1138f2 100644 --- a/back-end/hub-api/src/main/java/io/apicurio/hub/api/gitlab/GitLabSourceConnector.java +++ b/back-end/hub-api/src/main/java/io/apicurio/hub/api/gitlab/GitLabSourceConnector.java @@ -691,7 +691,8 @@ public String createPullRequestFromZipContent(String repositoryUrl, String commi private String toId(String value) { try { - return URLEncoder.encode(value, StandardCharsets.UTF_8.name()); + return URLEncoder.encode(value, StandardCharsets.UTF_8.name()) + .replaceAll("\\+", "%20"); } catch (UnsupportedEncodingException e) { return value; } From 2ff74316bd3d2c3911670c903e12ea3bb368ebaf Mon Sep 17 00:00:00 2001 From: Dysp Date: Tue, 30 Nov 2021 12:31:32 +0100 Subject: [PATCH 11/83] Fix dev mode launch commands for darwin users --- DEV_MODE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEV_MODE.md b/DEV_MODE.md index cc0dfbb21..0339caeec 100644 --- a/DEV_MODE.md +++ b/DEV_MODE.md @@ -15,13 +15,13 @@ mvn clean install -am -pl platforms/quarkus/api -pl platforms/quarkus/ws To start the API ```bash qApiPath=platforms/quarkus/api -mvn $(test -f "$qApiPath/java.env" && sed -e "/^$/d" -e "/^#/d" "$qApiPath/java.env" | xargs -r -n1 printf "-D%s ") -f $qApiPath/pom.xml quarkus:dev +mvn $(test -f "$qApiPath/java.env" && sed -e "/^$/d" -e "/^#/d" "$qApiPath/java.env" | xargs -r -n1 printf -- "-D%s ") -f $qApiPath/pom.xml quarkus:dev ``` To start the WS ```bash qWsPath=platforms/quarkus/ws -mvn $(test -f "$qWsPath/java.env" && sed -e "/^$/d" -e "/^#/d" "$qWsPath/java.env" | xargs -r -n1 printf "-D%s ") -f $qWsPath/pom.xml quarkus:dev +mvn $(test -f "$qWsPath/java.env" && sed -e "/^$/d" -e "/^#/d" "$qWsPath/java.env" | xargs -r -n1 printf -- "-D%s ") -f $qWsPath/pom.xml quarkus:dev ``` To start the UI (Tested with node 10) From 2191535d2b914cf2d572f8128a3ef2a6e927e1eb Mon Sep 17 00:00:00 2001 From: DyspC Date: Tue, 30 Nov 2021 12:50:53 +0100 Subject: [PATCH 12/83] Prevent unencoded % characters in paths being decoded when loading a gitlab resource --- .../io/apicurio/hub/api/gitlab/GitLabResourceResolver.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/back-end/hub-api/src/main/java/io/apicurio/hub/api/gitlab/GitLabResourceResolver.java b/back-end/hub-api/src/main/java/io/apicurio/hub/api/gitlab/GitLabResourceResolver.java index b8b74db26..23bc377dc 100644 --- a/back-end/hub-api/src/main/java/io/apicurio/hub/api/gitlab/GitLabResourceResolver.java +++ b/back-end/hub-api/src/main/java/io/apicurio/hub/api/gitlab/GitLabResourceResolver.java @@ -83,7 +83,7 @@ public GitLabResource resolve(String glUrl) { String group = AbstractResourceResolver.decode(matcher.group(1)); String project = AbstractResourceResolver.decode(matcher.group(2)); String branch = AbstractResourceResolver.decode(matcher.group(3)); - String path = AbstractResourceResolver.decode(matcher.group(4)); + String path = matcher.group(4); resource.setGroup(group); resource.setProject(project); resource.setBranch(branch); @@ -97,7 +97,7 @@ public GitLabResource resolve(String glUrl) { String subGroup = AbstractResourceResolver.decode(matcher.group(2)); String project = AbstractResourceResolver.decode(matcher.group(3)); String branch = AbstractResourceResolver.decode(matcher.group(4)); - String path = AbstractResourceResolver.decode(matcher.group(5)); + String path = matcher.group(5); resource.setGroup(group + "/" + subGroup); resource.setProject(project); resource.setBranch(branch); @@ -112,7 +112,7 @@ public GitLabResource resolve(String glUrl) { String subSubGroup = AbstractResourceResolver.decode(matcher.group(3)); String project = AbstractResourceResolver.decode(matcher.group(4)); String branch = AbstractResourceResolver.decode(matcher.group(5)); - String path = AbstractResourceResolver.decode(matcher.group(6)); + String path = matcher.group(6); resource.setGroup(group + "/" + subGroup + "/" + subSubGroup); resource.setProject(project); resource.setBranch(branch); From d9373b68c25e0a8146cd94e75a7d8c1e3aac3a25 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Nov 2021 19:02:20 +0000 Subject: [PATCH 13/83] chore(deps): bump resteasy-jaxrs from 3.15.2.Final to 3.15.3.Final Bumps resteasy-jaxrs from 3.15.2.Final to 3.15.3.Final. --- updated-dependencies: - dependency-name: org.jboss.resteasy:resteasy-jaxrs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 300b2d308..9a6ff392f 100644 --- a/pom.xml +++ b/pom.xml @@ -123,7 +123,7 @@ 4.4.14 2.11.1 2.1.5 - 3.15.2.Final + 3.15.3.Final 1.0.2.Final 2.0.0.Final 2.0.2.Final From 6e951f727a2a6cb7bb6bb9b5a0b45d983a900ccf Mon Sep 17 00:00:00 2001 From: Enda Phelan Date: Fri, 3 Dec 2021 12:56:22 +0000 Subject: [PATCH 14/83] Update Ingress version and fix breaking changes --- .../templates/apicurio-studio-ingresses.yaml | 27 ++++++++++++------- .../kubernetes/apicurio-studio-ingresses.yaml | 27 ++++++++++++------- 2 files changed, 36 insertions(+), 18 deletions(-) diff --git a/distro/helm/templates/apicurio-studio-ingresses.yaml b/distro/helm/templates/apicurio-studio-ingresses.yaml index 471f761b4..40197ddef 100644 --- a/distro/helm/templates/apicurio-studio-ingresses.yaml +++ b/distro/helm/templates/apicurio-studio-ingresses.yaml @@ -1,5 +1,5 @@ kind: Ingress -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 metadata: name: {{ .Values.api.name }} annotations: @@ -13,12 +13,15 @@ spec: http: paths: - backend: - serviceName: {{ .Values.api.name }} - servicePort: {{ .Values.api.port }} + service: + name: {{ .Values.api.name }} + port: + number: {{ .Values.api.port }} path: /studio-api/?(.*) + pathType: Prefix --- kind: Ingress -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 metadata: name: {{ .Values.ui.name }} annotations: @@ -31,12 +34,15 @@ spec: http: paths: - backend: - serviceName: {{ .Values.ui.name }} - servicePort: {{ .Values.ui.port }} + service: + name: {{ .Values.ui.name }} + port: + number: {{ .Values.ui.port }} path: / + pathType: Prefix --- kind: Ingress -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 metadata: name: {{ .Values.ws.name }} annotations: @@ -57,6 +63,9 @@ spec: http: paths: - backend: - serviceName: {{ .Values.ws.name }} - servicePort: {{ .Values.ws.port }} + service: + name: {{ .Values.ws.name }} + port: + number: {{ .Values.ws.port }} path: /ws/?(.*) + pathType: Prefix diff --git a/distro/kubernetes/apicurio-studio-ingresses.yaml b/distro/kubernetes/apicurio-studio-ingresses.yaml index af9f0e225..7fc7a6b40 100644 --- a/distro/kubernetes/apicurio-studio-ingresses.yaml +++ b/distro/kubernetes/apicurio-studio-ingresses.yaml @@ -1,5 +1,5 @@ kind: Ingress -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 metadata: name: apicurio-studio-api annotations: @@ -12,12 +12,15 @@ spec: http: paths: - backend: - serviceName: "apicurio-studio-api" - servicePort: 8091 + service: + name: "apicurio-studio-api" + port: + number: 8091 path: /studio-api/?(.*) + pathType: Prefix --- kind: Ingress -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 metadata: name: apicurio-studio-ui labels: @@ -28,12 +31,15 @@ spec: http: paths: - backend: - serviceName: "apicurio-studio-ui" - servicePort: 8093 + service: + name: "apicurio-studio-ui" + port: + number: 8093 path: / + pathType: Prefix --- kind: Ingress -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 metadata: name: apicurio-studio-ws annotations: @@ -45,6 +51,9 @@ spec: http: paths: - backend: - serviceName: "apicurio-studio-ws" - servicePort: 8092 + service: + name: "apicurio-studio-ws" + port: + number: 8092 path: /designs + pathType: Prefix From 5b2a25ee64192a37e0a9a57669b3ad23bef137d1 Mon Sep 17 00:00:00 2001 From: Enda Phelan Date: Mon, 6 Dec 2021 14:17:16 +0000 Subject: [PATCH 15/83] Fix unparseable regexp Fixes error when applying deployment: `found character that cannot start any token` --- distro/kubernetes/apicurio-studio-ui-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distro/kubernetes/apicurio-studio-ui-deployment.yaml b/distro/kubernetes/apicurio-studio-ui-deployment.yaml index ff3ece128..0c3554cc0 100644 --- a/distro/kubernetes/apicurio-studio-ui-deployment.yaml +++ b/distro/kubernetes/apicurio-studio-ui-deployment.yaml @@ -67,7 +67,7 @@ spec: - name: JAVA_TOOL_OPTIONS value: -Djava.net.preferIPv4Stack=true - name: APICURIO_UI_VALIDATION_CHANNELNAME_REGEXP - value: '{([^\x00-\x20\x7f"\'%<>\\^`{|}]|%[0-9A-Fa-f]{2}|\{[+#./;?&=,!@|]?((\w|%[0-9A-Fa-f]{2})(\.?(\w|%[0-9A-Fa-f]{2}))*(:[1-9]\d{0,3}|\*)?)(,((\w|%[0-9A-Fa-f]{2})(\.?(\w|%[0-9A-Fa-f]{2}))*(:[1-9]\d{0,3}|\*)?))*\})*' + value: "{([^\x00-\x20\x7f\\\"'%<>\\^`{|}]|%[0-9A-Fa-f]{2}|\\{[+#./;?&=,!@|]?((\\w|%[0-9A-Fa-f]{2})(\\.?(\\w|%[0-9A-Fa-f]{2}))*(:[1-9]\\d{0,3}|\\*)?)(,((\\w|%[0-9A-Fa-f]{2})(\\.?(\\w|%[0-9A-Fa-f]{2}))*(:[1-9]\\d{0,3}|\\*)?))*\\})*" - name: APICURIO_MICROCKS_API_URL valueFrom: configMapKeyRef: From 7bdc2c9a72db68866d5b3bff116b5ac7f9a7af12 Mon Sep 17 00:00:00 2001 From: Enda Phelan Date: Mon, 6 Dec 2021 14:18:30 +0000 Subject: [PATCH 16/83] Fix invalid Helm Chart version Fixes error "validation: chart.metadata.version "Beta 2.46" is invalid" --- distro/helm/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distro/helm/Chart.yaml b/distro/helm/Chart.yaml index fd38deaa5..71b148985 100644 --- a/distro/helm/Chart.yaml +++ b/distro/helm/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: apicurio -version: Beta 2.46 +version: 2.46.0-beta description: API design studio type: application keywords: From 492528e0deea72090ee42b270469e026410d674a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Dec 2021 19:02:03 +0000 Subject: [PATCH 17/83] chore(deps): bump buildnumber-maven-plugin from 1.4 to 3.0.0 Bumps [buildnumber-maven-plugin](https://github.com/mojohaus/buildnumber-maven-plugin) from 1.4 to 3.0.0. - [Release notes](https://github.com/mojohaus/buildnumber-maven-plugin/releases) - [Commits](https://github.com/mojohaus/buildnumber-maven-plugin/compare/buildnumber-maven-plugin-1.4...buildnumber-maven-plugin-3.0.0) --- updated-dependencies: - dependency-name: org.codehaus.mojo:buildnumber-maven-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 81c1d91f5..ecbc880f2 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ 3.0.0 3.3.0 - 1.4 + 3.0.0 3.1.0 3.8.1 3.2.0 From 4d35ca121ee44e7a8978ea0f778f9f6243849355 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Dec 2021 19:02:05 +0000 Subject: [PATCH 18/83] chore(deps): bump json from 20210307 to 20211205 Bumps [json](https://github.com/douglascrockford/JSON-java) from 20210307 to 20211205. - [Release notes](https://github.com/douglascrockford/JSON-java/releases) - [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md) - [Commits](https://github.com/douglascrockford/JSON-java/commits) --- updated-dependencies: - dependency-name: org.json:json dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 81c1d91f5..d7ed5c588 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ 2.0.2.Final 1.1.1.Final 3.24.1 - 20210307 + 20211205 1.1.1 14.0.0 8.0.22 From 65500f59f57dcb5281ed73074db9e523c5bc63c7 Mon Sep 17 00:00:00 2001 From: Eric Wittmann Date: Tue, 7 Dec 2021 07:04:21 -0500 Subject: [PATCH 19/83] Upgraded codegen to 1.0.4.Final --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 81c1d91f5..67b52d74e 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ 1.1.19 1.3.2.Final - 1.0.3.Final + 1.0.4.Final 2.6.4 From 308a49725795fd8b4c86fdd6a533d5f05dcfaa38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Dec 2021 23:40:03 +0000 Subject: [PATCH 20/83] chore(deps): bump jdbi3-bom from 3.24.1 to 3.25.0 Bumps [jdbi3-bom](https://github.com/jdbi/jdbi) from 3.24.1 to 3.25.0. - [Release notes](https://github.com/jdbi/jdbi/releases) - [Changelog](https://github.com/jdbi/jdbi/blob/master/RELEASE_NOTES.md) - [Commits](https://github.com/jdbi/jdbi/compare/v3.24.1...v3.25.0) --- updated-dependencies: - dependency-name: org.jdbi:jdbi3-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6ce818f4e..78e827c16 100644 --- a/pom.xml +++ b/pom.xml @@ -128,7 +128,7 @@ 2.0.0.Final 2.0.2.Final 1.1.1.Final - 3.24.1 + 3.25.0 20211205 1.1.1 14.0.0 From 34f6c8ffea1dcbc34caa0f9717304b1522dd34b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Dec 2021 23:40:53 +0000 Subject: [PATCH 21/83] chore(deps): bump httpcore from 4.4.14 to 4.4.15 Bumps httpcore from 4.4.14 to 4.4.15. --- updated-dependencies: - dependency-name: org.apache.httpcomponents:httpcore dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6ce818f4e..3299f706e 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ 1.1.4 4.13.2 4.5.13 - 4.4.14 + 4.4.15 2.11.1 2.1.5 3.15.3.Final From 55fd7707330dc67e0acd684095cd5d23ac904218 Mon Sep 17 00:00:00 2001 From: vvilerio Date: Thu, 9 Dec 2021 16:10:31 +0100 Subject: [PATCH 22/83] update messages/oneOf/reference OK from operations --- .../common/activity-item.component.ts | 12 +++++ .../channel/operation/enum-payload-tab.ts | 4 ++ .../operation/message-section.component.html | 2 +- .../operation/payload-tab.component.ts | 31 +++++++------ .../forms/definition/oneof-row.component.html | 13 +++--- .../forms/definition/oneof-row.component.ts | 46 ++++++++++--------- .../forms/message-form.component.html | 2 +- 7 files changed, 65 insertions(+), 45 deletions(-) create mode 100644 front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/enum-payload-tab.ts diff --git a/front-end/studio/src/app/components/common/activity-item.component.ts b/front-end/studio/src/app/components/common/activity-item.component.ts index 0c712fae0..090146b5d 100644 --- a/front-end/studio/src/app/components/common/activity-item.component.ts +++ b/front-end/studio/src/app/components/common/activity-item.component.ts @@ -111,6 +111,7 @@ export class ActivityItemComponent { case "AddChannelItemCommand": case "AddChildSchemaCommand": case "AddMessageExampleCommand_Aai20": + case "AddOneOfInMessageCommand": case "AddResponseDefinitionCommand": case "AddResponseDefinitionCommand_20": case "AddResponseDefinitionCommand_30": @@ -147,6 +148,7 @@ export class ActivityItemComponent { case "ChangeSchemaTypeCommand": case "ChangeResponseDefinitionTypeCommand": case "ChangeResponseDefinitionTypeCommand_20": + case "ChangePayloadRefCommand_Aai20": rval = "info"; break; case "ChangePropertyCommand": @@ -190,6 +192,7 @@ export class ActivityItemComponent { case "DeleteAllOperationsCommand_Aai20": case "DeleteAllParameterExamplesCommand": case "DeleteAllServersCommand_Aai20": + case "DeleteOneOfMessageCommand": case "DeleteMediaTypeCommand": case "DeleteOperationCommand": case "DeleteOperationCommand_20": @@ -409,6 +412,9 @@ export class ActivityItemComponent { case "AddResponseDefinitionCommand_30": rval = "added a Response Definition named " + this.command()["_newDefinitionName"] + "."; break; + case "AddOneOfInMessageCommand": + rval = "added a Message in a(n) component/operation (OneOf section) " + JSON.stringify(this.command()["_newOneOf"]) + "."; + break; case "AddSecurityRequirementCommand": rval = `added a Security Requirement at location ${this.command()["_parentPath"]}.`; break; @@ -452,6 +458,9 @@ export class ActivityItemComponent { case "ChangeResponseDefinitionTypeCommand_20": rval = "changed the type of an operation Response at location " + this.command()["_responsePath"] + "."; break; + case "ChangePayloadRefCommand_Aai20": + rval = "change the payload of a message " + this.command()["_oldPayloadRef"] + "."; + break; case "ChangePropertyCommand": case "ChangePropertyCommand_20": case "ChangePropertyCommand_30": @@ -526,6 +535,9 @@ export class ActivityItemComponent { case "DeleteMediaTypeCommand": rval = "deleted Media Type '" + this.command()["_mediaTypeName"] + "' at location " + this.command()["_mediaTypePath"] + "."; break; + case "DeleteOneOfMessageCommand": + rval = "deleted Message from component/operation'" + JSON.stringify(this.command()["_oldMessage"]) + "."; + break; case "DeleteOperationCommand": case "DeleteOperationCommand_20": case "DeleteOperationCommand_30": diff --git a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/enum-payload-tab.ts b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/enum-payload-tab.ts new file mode 100644 index 000000000..192d020f4 --- /dev/null +++ b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/enum-payload-tab.ts @@ -0,0 +1,4 @@ +export enum PayloadType { + OPE = "OPERATION", + COMP = "COMPONENT", +} \ No newline at end of file diff --git a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/message-section.component.html b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/message-section.component.html index f759613d3..233bcb7f9 100644 --- a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/message-section.component.html +++ b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/message-section.component.html @@ -134,7 +134,7 @@
- +
diff --git a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/payload-tab.component.ts b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/payload-tab.component.ts index ffd161bcf..32765c3ed 100644 --- a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/payload-tab.component.ts +++ b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/payload-tab.component.ts @@ -15,30 +15,24 @@ * limitations under the License. */ +import {ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, ViewEncapsulation} from "@angular/core"; import { - ChangeDetectionStrategy, - ChangeDetectorRef, - Component, - Input, - SimpleChanges, - ViewEncapsulation -} from "@angular/core"; -import { + Aai20Schema, AaiComponents, AaiDocument, - AaiMessage, + AaiMessage, AaiOperation, - Aai20Schema, CommandFactory, ICommand, - SimplifiedType, + Library, ReferenceUtil, - Library + SimplifiedType } from "apicurio-data-models"; import {CommandService} from "../../../../_services/command.service"; import {DocumentService} from "../../../../_services/document.service"; import {AbstractBaseComponent} from "../../../common/base-component"; import {SelectionService} from "../../../../_services/selection.service"; -import { EditExampleEvent } from "../../../dialogs/edit-aai-example.component"; +import {EditExampleEvent} from "../../../dialogs/edit-aai-example.component"; +import {PayloadType} from "./enum-payload-tab" @Component({ selector: "payload-tab", @@ -50,6 +44,7 @@ import { EditExampleEvent } from "../../../dialogs/edit-aai-example.component"; export class PayloadTabComponent extends AbstractBaseComponent { @Input() message: AaiMessage; + @Input() from: string; protected _model: SimplifiedType = null; protected editing: boolean = false; @@ -123,8 +118,14 @@ export class PayloadTabComponent extends AbstractBaseComponent { nt.of = newType.of; nt.as = newType.as; - let command: ICommand = CommandFactory.createChangePayloadRefCommand_Aai20(nt.type, this.message.parent() as AaiOperation); - this.commandService.emit(command); + if(this.from == PayloadType.OPE.toString()){ + let command: ICommand = CommandFactory.createChangePayloadRefCommand_Aai20(nt.type, this.message.parent() as AaiOperation); + this.commandService.emit(command); + }else if(this.from == PayloadType.COMP.toString()){ + let command: ICommand = CommandFactory.createChangePayloadRefCommand_Aai20(nt.type, this.message.parent() as AaiComponents, this.message._name); //the name like key + this.commandService.emit(command); + } + this._model = nt; } diff --git a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/definition/oneof-row.component.html b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/definition/oneof-row.component.html index 486936689..ac04bc94c 100644 --- a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/definition/oneof-row.component.html +++ b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/definition/oneof-row.component.html @@ -4,12 +4,11 @@ Reference
- {{oneOfName}} + {{displayOneOf()}}
-
- - {{item.oneOf}} - +
+ +
@@ -27,9 +26,9 @@
-
+
- OneOf is + Message (OneOf type) is = new EventEmitter(); @Input() oneOfName: string; - _ptab: string = null; - /** * C'tor. * @param changeDetectorRef @@ -87,13 +82,17 @@ export class OneOfRowComponent extends AbstractRowComponent = []; var doc: AaiDocument = (this.item.ownerDocument()); doc.components.getMessagesList().filter(f => f.getName() !== this.deref(item).getName()).forEach(mess => { - vals.push(new Value(mess.getName(), "#/component/messages/".concat(mess.getName()))); + vals.push(new Value(mess.getName(), "#/components/messages/".concat(mess.getName()))); }) return vals; } - public toggleOneOf(): void { - this.toggleTab("oneOf"); + public toggleDropDown(): void { + if (this.isEditing()) { + this._editing = false; + } else { + this._editing = true; + } } public delete(): void { @@ -104,6 +103,14 @@ export class OneOfRowComponent extends AbstractRowComponent
- +
From a2a5c8496903d87e3bf7348dfdd65c37ecb4a3d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Dec 2021 19:02:40 +0000 Subject: [PATCH 23/83] chore(deps): bump version.io.prometheus from 0.12.0 to 0.13.0 Bumps `version.io.prometheus` from 0.12.0 to 0.13.0. Updates `simpleclient` from 0.12.0 to 0.13.0 - [Release notes](https://github.com/prometheus/client_java/releases) - [Commits](https://github.com/prometheus/client_java/compare/parent-0.12.0...parent-0.13.0) Updates `simpleclient_hotspot` from 0.12.0 to 0.13.0 - [Release notes](https://github.com/prometheus/client_java/releases) - [Commits](https://github.com/prometheus/client_java/compare/parent-0.12.0...parent-0.13.0) Updates `simpleclient_common` from 0.12.0 to 0.13.0 - [Release notes](https://github.com/prometheus/client_java/releases) - [Commits](https://github.com/prometheus/client_java/compare/parent-0.12.0...parent-0.13.0) --- updated-dependencies: - dependency-name: io.prometheus:simpleclient dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.prometheus:simpleclient_hotspot dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.prometheus:simpleclient_common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6ce818f4e..b865bb8fb 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ 2.6 3.12.0 3.7.2 - 0.12.0 + 0.13.0 1.3.2 2.0 2.0.1 From 3ee25d0204b0435adb0349971d369ade9e89c3e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Dec 2021 19:02:56 +0000 Subject: [PATCH 24/83] chore(deps): bump scala-maven-plugin from 4.5.4 to 4.5.6 Bumps scala-maven-plugin from 4.5.4 to 4.5.6. --- updated-dependencies: - dependency-name: net.alchim31.maven:scala-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6ce818f4e..7de1de0ea 100644 --- a/pom.xml +++ b/pom.xml @@ -93,7 +93,7 @@ 2.22.2 3.3.2 1.12.0 - 4.5.4 + 4.5.6 1.2.1 1.0.0 From 31b0b5d5285439bc59fad8f07836a053c664ed79 Mon Sep 17 00:00:00 2001 From: Fadhlan Rizal Date: Sun, 19 Dec 2021 21:05:00 +0700 Subject: [PATCH 25/83] - adding docker-compose combine all mysql - fix wrong env variable - fix docker-compose apicurio --- distro/docker-compose/.env.template | 2 +- .../docker-compose-all-mysql.yml | 146 ++++++++++++++++++ .../docker-compose.apicurio.yml | 3 - distro/docker-compose/setup.sh | 4 +- 4 files changed, 149 insertions(+), 6 deletions(-) create mode 100644 distro/docker-compose/docker-compose-all-mysql.yml diff --git a/distro/docker-compose/.env.template b/distro/docker-compose/.env.template index fc29cd158..d0f81e1ad 100644 --- a/distro/docker-compose/.env.template +++ b/distro/docker-compose/.env.template @@ -66,4 +66,4 @@ APICURIO_UI_FEATURE_MICROCKS=true APICURIO_SHARE_FOR_EVERYONE=false APICURIO_UI_FEATURE_SHARE_WITH_EVERYONE=false -APICURIO_UI_VALIDATION_CHANNELNAME_REGEXP='([^\x00-\x20\x7f"'\''%<>\\^`{|}]|%[0-9A-Fa-f]{2}|\{[+#./;?&=,!@|]?((\w|%[0-9A-Fa-f]{2})(\.?(\w|%[0-9A-Fa-f]{2}))*(:[1-9]\d{0,3}|\*)?)(,((\w|%[0-9A-Fa-f]{2})(\.?(\w|%[0-9A-Fa-f]{2}))*(:[1-9]\d{0,3}|\*)?))*\})*' +APICURIO_UI_VALIDATION_CHANNELNAME_REGEXP='*' diff --git a/distro/docker-compose/docker-compose-all-mysql.yml b/distro/docker-compose/docker-compose-all-mysql.yml new file mode 100644 index 000000000..b36910313 --- /dev/null +++ b/distro/docker-compose/docker-compose-all-mysql.yml @@ -0,0 +1,146 @@ +version: '3' +services: + jboss-keycloak-mysql: + image: 'percona:5.7' + environment: + MYSQL_DATABASE: ${KC_SQL_DATABASE} + MYSQL_ROOT_PASSWORD: ${KC_SQL_ROOT_PASSWORD} + MYSQL_USER: ${KC_SQL_USER} + MYSQL_PASSWORD: ${KC_SQL_PASSWORD} + volumes: + - 'mysql2:/var/lib/mysql' + + jboss-keycloak: + image: 'as-keycloak' + build: ./keycloak + depends_on: [jboss-keycloak-mysql] + ports: + - '8090:8080' + volumes: + - ./config/keycloak:/microcks-keycloak-config + environment: + JDBC_PARAMS: "useSSL=false" + KEYCLOAK_USER: ${KEYCLOAK_USER} + KEYCLOAK_PASSWORD: ${KEYCLOAK_PASSWORD} + KEYCLOAK_IMPORT: /microcks-keycloak-config/apicurio-realm.json,/microcks-keycloak-config/microcks-realm.json + + DB_VENDOR: ${DB_VENDOR} + DB_ADDR: ${DB_ADDR} + DB_USER: ${DB_USER} + DB_PASSWORD: ${DB_PASSWORD} + + mongo: + image: mongo:3.4.23 + container_name: microcks-mongo + volumes: + - "mongo_data2:/data/db" + + postman: + image: microcks/microcks-postman-runtime:latest + container_name: microcks-postman-runtime + + microcks: + depends_on: + - mongo + - postman + - jboss-keycloak + image: microcks/microcks:latest + container_name: microcks + volumes: + - ./config:/deployments/config + ports: + - "8900:8080" + environment: + SPRING_PROFILES_ACTIVE: ${MR_SPRING_PROFILES_ACTIVE} + SPRING_DATA_MONGODB_URI: ${MR_SPRING_DATA_MONGODB_URI} + SPRING_DATA_MONGODB_DATABASE: ${MR_SPRING_DATA_MONGODB_DATABASE} + POSTMAN_RUNNER_URL: ${MR_POSTMAN_RUNNER_URL} + TEST_CALLBACK_URL: ${MR_TEST_CALLBACK_URL} + KEYCLOAK_URL: ${MR_KEYCLOAK_URL} + + apicurio-studio-ws: + image: 'apicurio/apicurio-studio-ws:${APICURIO_WS_VERSION}' + depends_on: [apicurio-studio-db] + ports: + - '8092:8080' + environment: + JAVA_TOOL_OPTIONS: '-Djava.net.preferIPv4Stack=true' + + APICURIO_HUB_STORAGE_JDBC_TYPE: ${APICURIO_DB_TYPE} + APICURIO_DB_DRIVER_NAME: ${APICURIO_DB_DRIVER_NAME} + APICURIO_DB_CONNECTION_URL: ${APICURIO_DB_CONNECTION_URL} + APICURIO_DB_USER_NAME: ${APICURIO_DB_USER_NAME} + APICURIO_DB_PASSWORD: ${APICURIO_DB_PASSWORD} + APICURIO_DB_INITIALIZE: ${WS_APICURIO_DB_INITIALIZE} + APICURIO_SHARE_FOR_EVERYONE: ${APICURIO_SHARE_FOR_EVERYONE} + + + apicurio-studio-api: + image: 'apicurio/apicurio-studio-api:${APICURIO_API_VERSION}' + depends_on: [apicurio-studio-db, apicurio-studio-ws] + ports: + - '8091:8080' + environment: + JAVA_TOOL_OPTIONS: '-Djava.net.preferIPv4Stack=true' + + APICURIO_KC_AUTH_URL: ${APICURIO_KC_AUTH_URL} + APICURIO_KC_CLIENT_ID: ${API_APICURIO_KC_CLIENT_ID} + APICURIO_KC_REALM: ${APICURIO_KC_REALM} + + APICURIO_HUB_STORAGE_JDBC_TYPE: ${APICURIO_DB_TYPE} + APICURIO_DB_DRIVER_NAME: ${APICURIO_DB_DRIVER_NAME} + APICURIO_DB_CONNECTION_URL: ${APICURIO_DB_CONNECTION_URL} + APICURIO_DB_USER_NAME: ${APICURIO_DB_USER_NAME} + APICURIO_DB_PASSWORD: ${APICURIO_DB_PASSWORD} + APICURIO_DB_INITIALIZE: ${API_APICURIO_DB_INITIALIZE} + + APICURIO_MICROCKS_API_URL: ${APICURIO_MICROCKS_API_URL} + APICURIO_MICROCKS_CLIENT_ID: ${APICURIO_MICROCKS_CLIENT_ID} + APICURIO_MICROCKS_CLIENT_SECRET: ${APICURIO_MICROCKS_CLIENT_SECRET} + + APICURIO_GITHUB_API_URL: ${APICURIO_GITHUB_API_URL} + APICURIO_GITLAB_API_URL: ${APICURIO_GITLAB_API_URL} + APICURIO_BITBUCKET_API_URL: ${APICURIO_BITBUCKET_API_URL} + APICURIO_SHARE_FOR_EVERYONE: ${APICURIO_SHARE_FOR_EVERYONE} + + + apicurio-studio-ui: + image: 'apicurio/apicurio-studio-ui:${APICURIO_UI_VERSION}' + depends_on: [apicurio-studio-db, apicurio-studio-api, apicurio-studio-ws] + ports: + - '8093:8080' + environment: + JAVA_TOOL_OPTIONS: '-Djava.net.preferIPv4Stack=true' + + APICURIO_KC_CLIENT_ID: ${APICURIO_UI_KC_CLIENT_ID} + APICURIO_KC_AUTH_URL: ${APICURIO_KC_AUTH_URL} + APICURIO_KC_REALM: ${APICURIO_KC_REALM} + + APICURIO_UI_HUB_API_URL: ${APICURIO_UI_HUB_API_URL} + APICURIO_UI_EDITING_URL: ${APICURIO_UI_EDITING_URL} + APICURIO_UI_FEATURE_MICROCKS: ${APICURIO_UI_FEATURE_MICROCKS} + APICURIO_UI_FEATURE_SHARE_WITH_EVERYONE: ${APICURIO_UI_FEATURE_SHARE_WITH_EVERYONE} + APICURIO_UI_LOGOUT_REDIRECT_URI: / + APICURIO_UI_VALIDATION_CHANNELNAME_REGEXP: ${APICURIO_UI_VALIDATION_CHANNELNAME_REGEXP} + + apicurio-studio-db: + image: 'percona:5.7' + command: [ + '--character-set-server=utf8mb4', + '--collation-server=utf8mb4_unicode_ci' + ] + environment: + MYSQL_DATABASE: ${AS_DATABASE} + MYSQL_ROOT_PASSWORD: ${AS_MYSQL_ROOT_PASSWORD} + MYSQL_USER: ${AS_DB_USER} + MYSQL_PASSWORD: ${AS_DB_PASSWORD} + volumes: + - 'mysql_apicurio:/var/lib/mysql' + +networks: + main: + +volumes: + mysql2: + mongo_data2: {} + mysql_apicurio: \ No newline at end of file diff --git a/distro/docker-compose/docker-compose.apicurio.yml b/distro/docker-compose/docker-compose.apicurio.yml index 73286604e..f7593eb53 100644 --- a/distro/docker-compose/docker-compose.apicurio.yml +++ b/distro/docker-compose/docker-compose.apicurio.yml @@ -1,9 +1,6 @@ version: '3' services: - - apicurio-studio-db: - apicurio-studio-ws: image: 'apicurio/apicurio-studio-ws:${APICURIO_WS_VERSION}' depends_on: [apicurio-studio-db] diff --git a/distro/docker-compose/setup.sh b/distro/docker-compose/setup.sh index 36bf334de..1ac2b7d88 100755 --- a/distro/docker-compose/setup.sh +++ b/distro/docker-compose/setup.sh @@ -25,7 +25,7 @@ fi KC_ROOT_DB_PASSWORD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c6) KC_DB_PASSWORD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c6) KC_PASSWORD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c6) -AS_SQL_ROOT_PASSWORD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c6) +AS_MYSQL_ROOT_PASSWORD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c6) AS_DB_PASSWORD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c6) SERVICE_CLIENT_SECRET=$(uuidgen) @@ -35,7 +35,7 @@ sed 's/$HOST/'"$HOST_IP"'/g' $P/.env.template > $P/tmp; mv $P/tmp $P/.env sed 's/$KC_ROOT_DB_PASSWORD/'"$KC_ROOT_DB_PASSWORD"'/g' $P/.env > $P/tmp; mv $P/tmp $P/.env sed 's/$KC_DB_PASSWORD/'"$KC_DB_PASSWORD"'/g' $P/.env > $P/tmp; mv $P/tmp $P/.env sed 's/$KC_PASSWORD/'"$KC_PASSWORD"'/g' $P/.env > $P/tmp; mv $P/tmp $P/.env -sed 's/$AS_SQL_ROOT_PASSWORD/'"$AS_SQL_ROOT_PASSWORD"'/g' $P/.env > $P/tmp; mv $P/tmp $P/.env +sed 's/$AS_MYSQL_ROOT_PASSWORD/'"$AS_MYSQL_ROOT_PASSWORD"'/g' $P/.env > $P/tmp; mv $P/tmp $P/.env sed 's/$AS_DB_PASSWORD/'"$AS_DB_PASSWORD"'/g' $P/.env > $P/tmp; mv $P/tmp $P/.env sed 's/$SERVICE_CLIENT_SECRET/'"$SERVICE_CLIENT_SECRET"'/g' $P/.env > $P/tmp; mv $P/tmp $P/.env From e256400b8a2d82d21725095d36164e84d1074291 Mon Sep 17 00:00:00 2001 From: Fadhlan Rizal Date: Mon, 20 Dec 2021 13:18:32 +0700 Subject: [PATCH 26/83] fix on mac error --- distro/docker-compose/setup.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/distro/docker-compose/setup.sh b/distro/docker-compose/setup.sh index 1ac2b7d88..3b710f2e2 100755 --- a/distro/docker-compose/setup.sh +++ b/distro/docker-compose/setup.sh @@ -22,11 +22,11 @@ then export P=/apicurio fi -KC_ROOT_DB_PASSWORD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c6) -KC_DB_PASSWORD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c6) -KC_PASSWORD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c6) -AS_MYSQL_ROOT_PASSWORD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c6) -AS_DB_PASSWORD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c6) +KC_ROOT_DB_PASSWORD=$(LC_CTYPE=C tr -dc _A-Z-a-z-0-9 < /dev/urandom | head -c6) +KC_DB_PASSWORD=$(LC_CTYPE=C tr -dc _A-Z-a-z-0-9 < /dev/urandom | head -c6) +KC_PASSWORD=$(LC_CTYPE=C tr -dc _A-Z-a-z-0-9 < /dev/urandom | head -c6) +AS_MYSQL_ROOT_PASSWORD=$(LC_CTYPE=C tr -dc _A-Z-a-z-0-9 < /dev/urandom | head -c6) +AS_DB_PASSWORD=$(LC_CTYPE=C tr -dc _A-Z-a-z-0-9 < /dev/urandom | head -c6) SERVICE_CLIENT_SECRET=$(uuidgen) From 35786fb56a011351f6832cc4041d08b8c6e34166 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Dec 2021 19:02:14 +0000 Subject: [PATCH 27/83] chore(deps): bump version.infinispan from 13.0.2.Final to 13.0.5.Final Bumps `version.infinispan` from 13.0.2.Final to 13.0.5.Final. Updates `infinispan-commons` from 13.0.2.Final to 13.0.5.Final Updates `infinispan-core` from 13.0.2.Final to 13.0.5.Final - [Release notes](https://github.com/infinispan/infinispan/releases) - [Changelog](https://github.com/infinispan/infinispan/blob/main/Jenkinsfile-release) - [Commits](https://github.com/infinispan/infinispan/compare/13.0.2.Final...13.0.5.Final) --- updated-dependencies: - dependency-name: org.infinispan:infinispan-commons dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.infinispan:infinispan-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ee5c58d92..5d7c782ac 100644 --- a/pom.xml +++ b/pom.xml @@ -136,7 +136,7 @@ 42.2.20 1.7.32 2.13.7 - 13.0.2.Final + 13.0.5.Final From fd904643f854d2eac58dee69ae19aced63159710 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Dec 2021 19:02:40 +0000 Subject: [PATCH 28/83] chore(deps): bump version.io.gatling from 3.7.2 to 3.7.3 Bumps `version.io.gatling` from 3.7.2 to 3.7.3. Updates `gatling-app` from 3.7.2 to 3.7.3 - [Release notes](https://github.com/gatling/gatling/releases) - [Commits](https://github.com/gatling/gatling/compare/v3.7.2...v3.7.3) Updates `gatling-charts-highcharts` from 3.7.2 to 3.7.3 - [Release notes](https://github.com/gatling/gatling-highcharts/releases) - [Commits](https://github.com/gatling/gatling-highcharts/compare/v3.7.2...v3.7.3) --- updated-dependencies: - dependency-name: io.gatling:gatling-app dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.gatling.highcharts:gatling-charts-highcharts dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ee5c58d92..ffda0acd0 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ 2.11.0 2.6 3.12.0 - 3.7.2 + 3.7.3 0.13.0 1.3.2 2.0 From e5ff6d3db833dad65c5de8f63a43ac7917cde701 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Dec 2021 19:01:38 +0000 Subject: [PATCH 29/83] chore(deps): bump jdbi3-bom from 3.25.0 to 3.26.0 Bumps [jdbi3-bom](https://github.com/jdbi/jdbi) from 3.25.0 to 3.26.0. - [Release notes](https://github.com/jdbi/jdbi/releases) - [Changelog](https://github.com/jdbi/jdbi/blob/master/RELEASE_NOTES.md) - [Commits](https://github.com/jdbi/jdbi/compare/v3.25.0...v3.26.0) --- updated-dependencies: - dependency-name: org.jdbi:jdbi3-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ee5c58d92..a8f66dc55 100644 --- a/pom.xml +++ b/pom.xml @@ -128,7 +128,7 @@ 2.0.0.Final 2.0.2.Final 1.1.1.Final - 3.25.0 + 3.26.0 20211205 1.1.1 14.0.0 From 6c1800e7f04ce27b9cd8d2f32d9a79c379e98299 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Dec 2021 19:01:58 +0000 Subject: [PATCH 30/83] chore(deps): bump version.org.keycloak from 14.0.0 to 16.1.0 Bumps `version.org.keycloak` from 14.0.0 to 16.1.0. Updates `keycloak-core` from 14.0.0 to 16.1.0 - [Release notes](https://github.com/keycloak/keycloak/releases) - [Commits](https://github.com/keycloak/keycloak/compare/14.0.0...16.1.0) Updates `keycloak-common` from 14.0.0 to 16.1.0 - [Release notes](https://github.com/keycloak/keycloak/releases) - [Commits](https://github.com/keycloak/keycloak/compare/14.0.0...16.1.0) Updates `keycloak-adapter-core` from 14.0.0 to 16.1.0 - [Release notes](https://github.com/keycloak/keycloak/releases) - [Commits](https://github.com/keycloak/keycloak/compare/14.0.0...16.1.0) Updates `keycloak-adapter-spi` from 14.0.0 to 16.1.0 --- updated-dependencies: - dependency-name: org.keycloak:keycloak-core dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.keycloak:keycloak-common dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.keycloak:keycloak-adapter-core dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.keycloak:keycloak-adapter-spi dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ee5c58d92..d9dd48da2 100644 --- a/pom.xml +++ b/pom.xml @@ -131,7 +131,7 @@ 3.25.0 20211205 1.1.1 - 14.0.0 + 16.1.0 8.0.22 42.2.20 1.7.32 From 089ed265ab0cd08c58f225a6ead20c30446f493e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Dec 2021 21:35:36 +0000 Subject: [PATCH 31/83] chore(deps): bump version.io.prometheus from 0.13.0 to 0.14.1 Bumps `version.io.prometheus` from 0.13.0 to 0.14.1. Updates `simpleclient` from 0.13.0 to 0.14.1 - [Release notes](https://github.com/prometheus/client_java/releases) - [Commits](https://github.com/prometheus/client_java/compare/parent-0.13.0...parent-0.14.1) Updates `simpleclient_hotspot` from 0.13.0 to 0.14.1 - [Release notes](https://github.com/prometheus/client_java/releases) - [Commits](https://github.com/prometheus/client_java/compare/parent-0.13.0...parent-0.14.1) Updates `simpleclient_common` from 0.13.0 to 0.14.1 - [Release notes](https://github.com/prometheus/client_java/releases) - [Commits](https://github.com/prometheus/client_java/compare/parent-0.13.0...parent-0.14.1) --- updated-dependencies: - dependency-name: io.prometheus:simpleclient dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.prometheus:simpleclient_hotspot dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.prometheus:simpleclient_common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dbfa674cc..43542f6ad 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ 2.6 3.12.0 3.7.3 - 0.13.0 + 0.14.1 1.3.2 2.0 2.0.1 From 9bdb8fb6b34f26e7ab3da7ba54dc786b792347e4 Mon Sep 17 00:00:00 2001 From: Eric Wittmann Date: Wed, 22 Dec 2021 07:07:20 -0500 Subject: [PATCH 32/83] Incremented keycloak and PG versions --- distro/docker-compose/docker-compose-as-postgre.yml | 2 +- distro/docker-compose/docker-compose.keycloak-postgresql.yml | 2 +- distro/docker-compose/keycloak/Dockerfile | 2 +- distro/openshift/auth/Dockerfile | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/distro/docker-compose/docker-compose-as-postgre.yml b/distro/docker-compose/docker-compose-as-postgre.yml index f5e5c4c16..a21cecf0d 100644 --- a/distro/docker-compose/docker-compose-as-postgre.yml +++ b/distro/docker-compose/docker-compose-as-postgre.yml @@ -5,7 +5,7 @@ volumes: services: apicurio-studio-db: - image: 'postgres:9.6' + image: 'postgres:12.9' environment: POSTGRES_DB: ${AS_DATABASE} POSTGRES_USER: ${AS_DB_USER} diff --git a/distro/docker-compose/docker-compose.keycloak-postgresql.yml b/distro/docker-compose/docker-compose.keycloak-postgresql.yml index dc5b7c725..c107011ae 100644 --- a/distro/docker-compose/docker-compose.keycloak-postgresql.yml +++ b/distro/docker-compose/docker-compose.keycloak-postgresql.yml @@ -6,7 +6,7 @@ volumes: services: jboss-keycloak-postgresql: - image: postgres + image: 'postgres:12.9' volumes: - postgres_data:/var/lib/postgresql/data environment: diff --git a/distro/docker-compose/keycloak/Dockerfile b/distro/docker-compose/keycloak/Dockerfile index 60fae48e5..cdc65c1af 100644 --- a/distro/docker-compose/keycloak/Dockerfile +++ b/distro/docker-compose/keycloak/Dockerfile @@ -1,3 +1,3 @@ -FROM jboss/keycloak:14.0.0 +FROM jboss/keycloak:16.1.0 ADD apicurio /opt/jboss/keycloak/themes/apicurio diff --git a/distro/openshift/auth/Dockerfile b/distro/openshift/auth/Dockerfile index 7874c76bd..7a7a1b2d5 100644 --- a/distro/openshift/auth/Dockerfile +++ b/distro/openshift/auth/Dockerfile @@ -1,7 +1,9 @@ -FROM jboss/keycloak:14.0.0 +FROM jboss/keycloak:16.1.0 LABEL authors="Eric Wittmann " +ENV JDBC_POSTGRES_VERSION 42.2.6 + USER root RUN mkdir -p /opt/jboss/keycloak/standalone/tmp/vfs \ From 6acbddef50e712f9a4b244df8d382630fb05e756 Mon Sep 17 00:00:00 2001 From: Eric Wittmann Date: Wed, 22 Dec 2021 07:55:03 -0500 Subject: [PATCH 33/83] Created a docker compose for apicurio-studio-auth (for testing and local use). --- distro/openshift/auth/docker-compose.yml | 31 ++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 distro/openshift/auth/docker-compose.yml diff --git a/distro/openshift/auth/docker-compose.yml b/distro/openshift/auth/docker-compose.yml new file mode 100644 index 000000000..d1cae6443 --- /dev/null +++ b/distro/openshift/auth/docker-compose.yml @@ -0,0 +1,31 @@ +version: '3' + +volumes: + keycloak_pg_data: + driver: local + +services: + keycloak-db: + image: 'postgres:12.9' + volumes: + - keycloak_pg_data:/var/lib/postgresql/data + environment: + POSTGRES_DB: keycloak + POSTGRES_USER: pgadmin + POSTGRES_PASSWORD: pgpassword + + keycloak: + image: 'apicurio/apicurio-studio-auth:16.1.0' + depends_on: [keycloak-db] + ports: + - '8090:8080' + environment: + APICURIO_KEYCLOAK_USER: admin + APICURIO_KEYCLOAK_PASSWORD: admin123 + APICURIO_UI_URL: http://localhost:8888 + DB_VENDOR: postgresql + DB_ADDR: keycloak-db + DB_DATABASE: keycloak + DB_USER: pgadmin + DB_PASSWORD: pgpassword + From b6daa7204de9da73311d553fabfbd91dc59f80dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Dec 2021 19:02:50 +0000 Subject: [PATCH 34/83] chore(deps-dev): bump selenide from 6.1.1 to 6.1.2 Bumps [selenide](https://github.com/selenide/selenide) from 6.1.1 to 6.1.2. - [Release notes](https://github.com/selenide/selenide/releases) - [Changelog](https://github.com/selenide/selenide/blob/master/CHANGELOG.md) - [Commits](https://github.com/selenide/selenide/compare/v6.1.1...v6.1.2) --- updated-dependencies: - dependency-name: com.codeborne:selenide dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/integration/single-node-keycloak/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/single-node-keycloak/pom.xml b/test/integration/single-node-keycloak/pom.xml index 7ef2aee50..cd049e80d 100644 --- a/test/integration/single-node-keycloak/pom.xml +++ b/test/integration/single-node-keycloak/pom.xml @@ -115,7 +115,7 @@ com.codeborne selenide - 6.1.1 + 6.1.2 test From 3b6299f775e93beef07044bb8de1371fa5947e84 Mon Sep 17 00:00:00 2001 From: Eric Wittmann Date: Wed, 22 Dec 2021 14:18:20 -0500 Subject: [PATCH 35/83] Manual merge of PR 1744 based on actual changes to underlying data models library. --- front-end/studio/package.json | 4 ++-- .../common/activity-item.component.ts | 8 ++++---- .../channel/operation/enum-payload-tab.ts | 4 ---- .../operation/message-section.component.html | 12 ++++++------ .../operation/message-section.component.ts | 17 ++++++++++++++++- .../channel/operation/payload-tab.component.ts | 15 ++++----------- .../forms/definition/oneof-row.component.html | 2 +- .../forms/definition/oneof-row.component.ts | 4 ++-- .../forms/message-form.component.html | 4 ++-- front-end/studio/yarn.lock | 18 +++++++++--------- pom.xml | 2 +- 11 files changed, 47 insertions(+), 43 deletions(-) delete mode 100644 front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/enum-payload-tab.ts diff --git a/front-end/studio/package.json b/front-end/studio/package.json index a9135227e..4a041d967 100644 --- a/front-end/studio/package.json +++ b/front-end/studio/package.json @@ -18,7 +18,7 @@ "private": false, "peerDependencies": { "@patternfly/patternfly": "1.0.250", - "apicurio-data-models": "1.1.19", + "apicurio-data-models": "1.1.20", "apicurio-ts-core": "0.1.3", "brace": "0.11.1", "core-js": "2.6.5", @@ -48,7 +48,7 @@ "@types/js-base64": "2.3.1", "@types/marked": "0.6.1", "@types/node": "15.14.0", - "apicurio-data-models": "1.1.19", + "apicurio-data-models": "1.1.20", "apicurio-ts-core": "0.1.3", "brace": "0.11.1", "codelyzer": "^6.0.0", diff --git a/front-end/studio/src/app/components/common/activity-item.component.ts b/front-end/studio/src/app/components/common/activity-item.component.ts index 090146b5d..3eb9e0086 100644 --- a/front-end/studio/src/app/components/common/activity-item.component.ts +++ b/front-end/studio/src/app/components/common/activity-item.component.ts @@ -46,7 +46,7 @@ export class ActivityItemComponent { /** * Get the command for this change. - * + * */ protected command(): ICommand { if (this._command == null) { @@ -78,7 +78,7 @@ export class ActivityItemComponent { /** * Returns an appropriate icon for the activity item, based on its type. - * + * */ public icon(): string { if (this.item.type == "Command") { @@ -371,7 +371,7 @@ export class ActivityItemComponent { /** * Returns an appropriate description for the activity item, based on its type. - * + * */ public description(): string { if (this.item.type == "Command") { @@ -459,7 +459,7 @@ export class ActivityItemComponent { rval = "changed the type of an operation Response at location " + this.command()["_responsePath"] + "."; break; case "ChangePayloadRefCommand_Aai20": - rval = "change the payload of a message " + this.command()["_oldPayloadRef"] + "."; + rval = "changed the payload of a message " + this.command()["_oldPayloadRef"] + "."; break; case "ChangePropertyCommand": case "ChangePropertyCommand_20": diff --git a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/enum-payload-tab.ts b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/enum-payload-tab.ts deleted file mode 100644 index 192d020f4..000000000 --- a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/enum-payload-tab.ts +++ /dev/null @@ -1,4 +0,0 @@ -export enum PayloadType { - OPE = "OPERATION", - COMP = "COMPONENT", -} \ No newline at end of file diff --git a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/message-section.component.html b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/message-section.component.html index 233bcb7f9..0bc09bda5 100644 --- a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/message-section.component.html +++ b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/message-section.component.html @@ -15,11 +15,11 @@
-
- Inheritance Type OneOf -

- +
+ Inheritance Type OneOf +

+
@@ -134,7 +134,7 @@
- +
diff --git a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/message-section.component.ts b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/message-section.component.ts index 0ce48b235..b2f94a8dd 100644 --- a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/message-section.component.ts +++ b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/message-section.component.ts @@ -159,6 +159,21 @@ export class MessageSectionComponent extends AbstractBaseComponent { this.currentPart = part; } + public oneOfName(message: AaiMessage): string { + if (message && message.$ref) { + const r: any = this.deref(message); + if (r && r.getName && r.getName()) { + return r.getName(); + } else { + return message.$ref; + } + } else if (message.name) { + return message.name; + } else { + return "Unknown message"; + } + } + public deref(message: AaiMessage){ return ReferenceUtil.resolveFragmentFromJS(this.messageFromOperation().ownerDocument(), message.$ref); } @@ -210,4 +225,4 @@ export class MessageSectionComponent extends AbstractBaseComponent { } -} \ No newline at end of file +} diff --git a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/payload-tab.component.ts b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/payload-tab.component.ts index 32765c3ed..4f78fa701 100644 --- a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/payload-tab.component.ts +++ b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/channel/operation/payload-tab.component.ts @@ -32,7 +32,6 @@ import {DocumentService} from "../../../../_services/document.service"; import {AbstractBaseComponent} from "../../../common/base-component"; import {SelectionService} from "../../../../_services/selection.service"; import {EditExampleEvent} from "../../../dialogs/edit-aai-example.component"; -import {PayloadType} from "./enum-payload-tab" @Component({ selector: "payload-tab", @@ -44,7 +43,6 @@ import {PayloadType} from "./enum-payload-tab" export class PayloadTabComponent extends AbstractBaseComponent { @Input() message: AaiMessage; - @Input() from: string; protected _model: SimplifiedType = null; protected editing: boolean = false; @@ -118,19 +116,14 @@ export class PayloadTabComponent extends AbstractBaseComponent { nt.of = newType.of; nt.as = newType.as; - if(this.from == PayloadType.OPE.toString()){ - let command: ICommand = CommandFactory.createChangePayloadRefCommand_Aai20(nt.type, this.message.parent() as AaiOperation); - this.commandService.emit(command); - }else if(this.from == PayloadType.COMP.toString()){ - let command: ICommand = CommandFactory.createChangePayloadRefCommand_Aai20(nt.type, this.message.parent() as AaiComponents, this.message._name); //the name like key - this.commandService.emit(command); - } + let command: ICommand = CommandFactory.createChangePayloadRefCommand_Aai20$java_lang_String$io_apicurio_datamodels_asyncapi_models_AaiMessage(nt.type, this.message); + this.commandService.emit(command); this._model = nt; } public schemaForExamplePayload(): Aai20Schema { - if (this.message.payload.$ref) { + if (this.message.payload && this.message.payload.$ref) { return ReferenceUtil.resolveRef(this.message.payload.$ref, this.message) as Aai20Schema; } return null; @@ -196,4 +189,4 @@ export class PayloadTabComponent extends AbstractBaseComponent { let command: ICommand = CommandFactory.createDeleteAllMessageExamplesCommand_Aai20(this.message.parent() as AaiOperation); this.commandService.emit(command); } -} \ No newline at end of file +} diff --git a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/definition/oneof-row.component.html b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/definition/oneof-row.component.html index ac04bc94c..452baa34b 100644 --- a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/definition/oneof-row.component.html +++ b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/definition/oneof-row.component.html @@ -32,7 +32,7 @@
diff --git a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/definition/oneof-row.component.ts b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/definition/oneof-row.component.ts index b32b5537d..477a8b196 100644 --- a/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/definition/oneof-row.component.ts +++ b/front-end/studio/src/app/pages/apis/{apiId}/editor/_components/forms/definition/oneof-row.component.ts @@ -120,8 +120,8 @@ export class OneOfRowComponent extends AbstractRowComponent
- +
@@ -160,4 +160,4 @@
- \ No newline at end of file + diff --git a/front-end/studio/yarn.lock b/front-end/studio/yarn.lock index fdd1bda06..841fc9624 100644 --- a/front-end/studio/yarn.lock +++ b/front-end/studio/yarn.lock @@ -1952,12 +1952,12 @@ anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" -apicurio-data-models@1.1.19: - version "1.1.19" - resolved "https://registry.yarnpkg.com/apicurio-data-models/-/apicurio-data-models-1.1.19.tgz#41b0b10dfffec869e04ec5464c211926747fef3a" - integrity sha512-EZzXcYCU4eC2XNScovemMJ+xitZyPgApDHK53vbs1k3RJ2UFFzqcetEv6yGaHV6cGUcKo54+lr4oT7M2mrEZmw== +apicurio-data-models@1.1.20: + version "1.1.20" + resolved "https://registry.yarnpkg.com/apicurio-data-models/-/apicurio-data-models-1.1.20.tgz#d4fa723f94a29cff0a192443cc285bb709274901" + integrity sha512-cqq6ZqH3631pmHFUjuvTji5FmsThrPLpjmKwY7zp3IRPg5gSdXA32ZcAFa8aQgr9l9+OUp1mMMOdFaF4JIbwfA== dependencies: - core-js "3.19.0" + core-js "3.20.0" apicurio-ts-core@0.1.3: version "0.1.3" @@ -3072,10 +3072,10 @@ core-js@2.6.5: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895" integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A== -core-js@3.19.0: - version "3.19.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.19.0.tgz#9e40098a9bc326c7e81b486abbd5e12b9d275176" - integrity sha512-L1TpFRWXZ76vH1yLM+z6KssLZrP8Z6GxxW4auoCj+XiViOzNPJCAuTIkn03BGdFe6Z5clX5t64wRIRypsZQrUg== +core-js@3.20.0: + version "3.20.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.20.0.tgz#1c5ac07986b8d15473ab192e45a2e115a4a95b79" + integrity sha512-KjbKU7UEfg4YPpskMtMXPhUKn7m/1OdTHTVjy09ScR2LVaoUXe8Jh0UdvN2EKUR6iKTJph52SJP95mAB0MnVLQ== core-js@3.8.3: version "3.8.3" diff --git a/pom.xml b/pom.xml index dbfa674cc..7d9e45995 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ 1.13.7.Final - 1.1.19 + 1.1.20 1.3.2.Final 1.0.4.Final From 45e8f1ea2e1f73ddd07b4bfc8ccf79a8833651b2 Mon Sep 17 00:00:00 2001 From: Fadhlan Rizal Date: Thu, 23 Dec 2021 08:39:14 +0700 Subject: [PATCH 36/83] set to current regex --- distro/docker-compose/.env.template | 2 +- .../docker-compose-all-mysql.yml | 146 ------------------ 2 files changed, 1 insertion(+), 147 deletions(-) delete mode 100644 distro/docker-compose/docker-compose-all-mysql.yml diff --git a/distro/docker-compose/.env.template b/distro/docker-compose/.env.template index d0f81e1ad..fc29cd158 100644 --- a/distro/docker-compose/.env.template +++ b/distro/docker-compose/.env.template @@ -66,4 +66,4 @@ APICURIO_UI_FEATURE_MICROCKS=true APICURIO_SHARE_FOR_EVERYONE=false APICURIO_UI_FEATURE_SHARE_WITH_EVERYONE=false -APICURIO_UI_VALIDATION_CHANNELNAME_REGEXP='*' +APICURIO_UI_VALIDATION_CHANNELNAME_REGEXP='([^\x00-\x20\x7f"'\''%<>\\^`{|}]|%[0-9A-Fa-f]{2}|\{[+#./;?&=,!@|]?((\w|%[0-9A-Fa-f]{2})(\.?(\w|%[0-9A-Fa-f]{2}))*(:[1-9]\d{0,3}|\*)?)(,((\w|%[0-9A-Fa-f]{2})(\.?(\w|%[0-9A-Fa-f]{2}))*(:[1-9]\d{0,3}|\*)?))*\})*' diff --git a/distro/docker-compose/docker-compose-all-mysql.yml b/distro/docker-compose/docker-compose-all-mysql.yml deleted file mode 100644 index b36910313..000000000 --- a/distro/docker-compose/docker-compose-all-mysql.yml +++ /dev/null @@ -1,146 +0,0 @@ -version: '3' -services: - jboss-keycloak-mysql: - image: 'percona:5.7' - environment: - MYSQL_DATABASE: ${KC_SQL_DATABASE} - MYSQL_ROOT_PASSWORD: ${KC_SQL_ROOT_PASSWORD} - MYSQL_USER: ${KC_SQL_USER} - MYSQL_PASSWORD: ${KC_SQL_PASSWORD} - volumes: - - 'mysql2:/var/lib/mysql' - - jboss-keycloak: - image: 'as-keycloak' - build: ./keycloak - depends_on: [jboss-keycloak-mysql] - ports: - - '8090:8080' - volumes: - - ./config/keycloak:/microcks-keycloak-config - environment: - JDBC_PARAMS: "useSSL=false" - KEYCLOAK_USER: ${KEYCLOAK_USER} - KEYCLOAK_PASSWORD: ${KEYCLOAK_PASSWORD} - KEYCLOAK_IMPORT: /microcks-keycloak-config/apicurio-realm.json,/microcks-keycloak-config/microcks-realm.json - - DB_VENDOR: ${DB_VENDOR} - DB_ADDR: ${DB_ADDR} - DB_USER: ${DB_USER} - DB_PASSWORD: ${DB_PASSWORD} - - mongo: - image: mongo:3.4.23 - container_name: microcks-mongo - volumes: - - "mongo_data2:/data/db" - - postman: - image: microcks/microcks-postman-runtime:latest - container_name: microcks-postman-runtime - - microcks: - depends_on: - - mongo - - postman - - jboss-keycloak - image: microcks/microcks:latest - container_name: microcks - volumes: - - ./config:/deployments/config - ports: - - "8900:8080" - environment: - SPRING_PROFILES_ACTIVE: ${MR_SPRING_PROFILES_ACTIVE} - SPRING_DATA_MONGODB_URI: ${MR_SPRING_DATA_MONGODB_URI} - SPRING_DATA_MONGODB_DATABASE: ${MR_SPRING_DATA_MONGODB_DATABASE} - POSTMAN_RUNNER_URL: ${MR_POSTMAN_RUNNER_URL} - TEST_CALLBACK_URL: ${MR_TEST_CALLBACK_URL} - KEYCLOAK_URL: ${MR_KEYCLOAK_URL} - - apicurio-studio-ws: - image: 'apicurio/apicurio-studio-ws:${APICURIO_WS_VERSION}' - depends_on: [apicurio-studio-db] - ports: - - '8092:8080' - environment: - JAVA_TOOL_OPTIONS: '-Djava.net.preferIPv4Stack=true' - - APICURIO_HUB_STORAGE_JDBC_TYPE: ${APICURIO_DB_TYPE} - APICURIO_DB_DRIVER_NAME: ${APICURIO_DB_DRIVER_NAME} - APICURIO_DB_CONNECTION_URL: ${APICURIO_DB_CONNECTION_URL} - APICURIO_DB_USER_NAME: ${APICURIO_DB_USER_NAME} - APICURIO_DB_PASSWORD: ${APICURIO_DB_PASSWORD} - APICURIO_DB_INITIALIZE: ${WS_APICURIO_DB_INITIALIZE} - APICURIO_SHARE_FOR_EVERYONE: ${APICURIO_SHARE_FOR_EVERYONE} - - - apicurio-studio-api: - image: 'apicurio/apicurio-studio-api:${APICURIO_API_VERSION}' - depends_on: [apicurio-studio-db, apicurio-studio-ws] - ports: - - '8091:8080' - environment: - JAVA_TOOL_OPTIONS: '-Djava.net.preferIPv4Stack=true' - - APICURIO_KC_AUTH_URL: ${APICURIO_KC_AUTH_URL} - APICURIO_KC_CLIENT_ID: ${API_APICURIO_KC_CLIENT_ID} - APICURIO_KC_REALM: ${APICURIO_KC_REALM} - - APICURIO_HUB_STORAGE_JDBC_TYPE: ${APICURIO_DB_TYPE} - APICURIO_DB_DRIVER_NAME: ${APICURIO_DB_DRIVER_NAME} - APICURIO_DB_CONNECTION_URL: ${APICURIO_DB_CONNECTION_URL} - APICURIO_DB_USER_NAME: ${APICURIO_DB_USER_NAME} - APICURIO_DB_PASSWORD: ${APICURIO_DB_PASSWORD} - APICURIO_DB_INITIALIZE: ${API_APICURIO_DB_INITIALIZE} - - APICURIO_MICROCKS_API_URL: ${APICURIO_MICROCKS_API_URL} - APICURIO_MICROCKS_CLIENT_ID: ${APICURIO_MICROCKS_CLIENT_ID} - APICURIO_MICROCKS_CLIENT_SECRET: ${APICURIO_MICROCKS_CLIENT_SECRET} - - APICURIO_GITHUB_API_URL: ${APICURIO_GITHUB_API_URL} - APICURIO_GITLAB_API_URL: ${APICURIO_GITLAB_API_URL} - APICURIO_BITBUCKET_API_URL: ${APICURIO_BITBUCKET_API_URL} - APICURIO_SHARE_FOR_EVERYONE: ${APICURIO_SHARE_FOR_EVERYONE} - - - apicurio-studio-ui: - image: 'apicurio/apicurio-studio-ui:${APICURIO_UI_VERSION}' - depends_on: [apicurio-studio-db, apicurio-studio-api, apicurio-studio-ws] - ports: - - '8093:8080' - environment: - JAVA_TOOL_OPTIONS: '-Djava.net.preferIPv4Stack=true' - - APICURIO_KC_CLIENT_ID: ${APICURIO_UI_KC_CLIENT_ID} - APICURIO_KC_AUTH_URL: ${APICURIO_KC_AUTH_URL} - APICURIO_KC_REALM: ${APICURIO_KC_REALM} - - APICURIO_UI_HUB_API_URL: ${APICURIO_UI_HUB_API_URL} - APICURIO_UI_EDITING_URL: ${APICURIO_UI_EDITING_URL} - APICURIO_UI_FEATURE_MICROCKS: ${APICURIO_UI_FEATURE_MICROCKS} - APICURIO_UI_FEATURE_SHARE_WITH_EVERYONE: ${APICURIO_UI_FEATURE_SHARE_WITH_EVERYONE} - APICURIO_UI_LOGOUT_REDIRECT_URI: / - APICURIO_UI_VALIDATION_CHANNELNAME_REGEXP: ${APICURIO_UI_VALIDATION_CHANNELNAME_REGEXP} - - apicurio-studio-db: - image: 'percona:5.7' - command: [ - '--character-set-server=utf8mb4', - '--collation-server=utf8mb4_unicode_ci' - ] - environment: - MYSQL_DATABASE: ${AS_DATABASE} - MYSQL_ROOT_PASSWORD: ${AS_MYSQL_ROOT_PASSWORD} - MYSQL_USER: ${AS_DB_USER} - MYSQL_PASSWORD: ${AS_DB_PASSWORD} - volumes: - - 'mysql_apicurio:/var/lib/mysql' - -networks: - main: - -volumes: - mysql2: - mongo_data2: {} - mysql_apicurio: \ No newline at end of file From 4dc975f9a5b3abf81599c78b6338e852c86d5e50 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Dec 2021 19:02:08 +0000 Subject: [PATCH 37/83] chore(deps): bump frontend-maven-plugin from 1.12.0 to 1.12.1 Bumps [frontend-maven-plugin](https://github.com/eirslett/frontend-maven-plugin) from 1.12.0 to 1.12.1. - [Release notes](https://github.com/eirslett/frontend-maven-plugin/releases) - [Changelog](https://github.com/eirslett/frontend-maven-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/eirslett/frontend-maven-plugin/compare/frontend-plugins-1.12.0...frontend-plugins-1.12.1) --- updated-dependencies: - dependency-name: com.github.eirslett:frontend-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7d9e45995..bb5f85142 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 2.22.2 2.22.2 3.3.2 - 1.12.0 + 1.12.1 4.5.6 1.2.1 1.0.0 From bc36587d3c1374a2318e6f232d0d26d80aa66589 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 Jan 2022 17:46:59 +0000 Subject: [PATCH 38/83] chore(deps): bump jdbi3-bom from 3.26.0 to 3.26.1 Bumps [jdbi3-bom](https://github.com/jdbi/jdbi) from 3.26.0 to 3.26.1. - [Release notes](https://github.com/jdbi/jdbi/releases) - [Changelog](https://github.com/jdbi/jdbi/blob/master/RELEASE_NOTES.md) - [Commits](https://github.com/jdbi/jdbi/compare/v3.26.0...v3.26.1) --- updated-dependencies: - dependency-name: org.jdbi:jdbi3-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7d9e45995..c3db8a9d1 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 2.22.2 2.22.2 3.3.2 - 1.12.0 + 1.12.1 4.5.6 1.2.1 1.0.0 @@ -128,7 +128,7 @@ 2.0.0.Final 2.0.2.Final 1.1.1.Final - 3.26.0 + 3.26.1 20211205 1.1.1 14.0.0 From e507e2d748d172aa4d72de47344773a0396c8004 Mon Sep 17 00:00:00 2001 From: Jagveer Loky Date: Fri, 7 Jan 2022 14:40:19 +0000 Subject: [PATCH 39/83] Update H2 database --- test/integration/arquillian/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/arquillian/pom.xml b/test/integration/arquillian/pom.xml index dd7a34a25..46d2c85eb 100644 --- a/test/integration/arquillian/pom.xml +++ b/test/integration/arquillian/pom.xml @@ -30,7 +30,7 @@ ${basedir}/src/test/resources/artemis/broker.xml - 1.4.193 + 2.0.206 ${project.build.directory} From ab7cfe7ffff00c7f10a2ae0087f9cfac8eea7a2b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Jan 2022 19:01:32 +0000 Subject: [PATCH 40/83] chore(deps): bump jandex-maven-plugin from 1.2.1 to 1.2.2 Bumps [jandex-maven-plugin](https://github.com/wildfly/jandex-maven-plugin) from 1.2.1 to 1.2.2. - [Release notes](https://github.com/wildfly/jandex-maven-plugin/releases) - [Commits](https://github.com/wildfly/jandex-maven-plugin/compare/1.2.1...1.2.2) --- updated-dependencies: - dependency-name: org.jboss.jandex:jandex-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 227b760f1..5e0e840fe 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ 3.3.2 1.12.1 4.5.6 - 1.2.1 + 1.2.2 1.0.0 From 52bb805cbaaa9063518cd1690e4edb2d2d60daf5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Jan 2022 19:01:58 +0000 Subject: [PATCH 41/83] chore(deps): bump jdbi3-bom from 3.26.1 to 3.27.0 Bumps [jdbi3-bom](https://github.com/jdbi/jdbi) from 3.26.1 to 3.27.0. - [Release notes](https://github.com/jdbi/jdbi/releases) - [Changelog](https://github.com/jdbi/jdbi/blob/master/RELEASE_NOTES.md) - [Commits](https://github.com/jdbi/jdbi/compare/v3.26.1...v3.27.0) --- updated-dependencies: - dependency-name: org.jdbi:jdbi3-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 227b760f1..1eabeea9e 100644 --- a/pom.xml +++ b/pom.xml @@ -128,7 +128,7 @@ 2.0.0.Final 2.0.2.Final 1.1.1.Final - 3.26.1 + 3.27.0 20211205 1.1.1 16.1.0 From d8dd4cc3c921dd6496f1103ae96a3ada90c02126 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jan 2022 19:02:27 +0000 Subject: [PATCH 42/83] chore(deps-dev): bump selenide from 6.1.2 to 6.2.0 Bumps [selenide](https://github.com/selenide/selenide) from 6.1.2 to 6.2.0. - [Release notes](https://github.com/selenide/selenide/releases) - [Changelog](https://github.com/selenide/selenide/blob/master/CHANGELOG.md) - [Commits](https://github.com/selenide/selenide/compare/v6.1.2...v6.2.0) --- updated-dependencies: - dependency-name: com.codeborne:selenide dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test/integration/single-node-keycloak/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/single-node-keycloak/pom.xml b/test/integration/single-node-keycloak/pom.xml index cd049e80d..974621902 100644 --- a/test/integration/single-node-keycloak/pom.xml +++ b/test/integration/single-node-keycloak/pom.xml @@ -115,7 +115,7 @@ com.codeborne selenide - 6.1.2 + 6.2.0 test From 15b11afe4187bcdcfdf262cd3fa28ec421cb481c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jan 2022 19:02:34 +0000 Subject: [PATCH 43/83] chore(deps): bump scala-library from 2.13.7 to 2.13.8 Bumps [scala-library](https://github.com/scala/scala) from 2.13.7 to 2.13.8. - [Release notes](https://github.com/scala/scala/releases) - [Commits](https://github.com/scala/scala/compare/v2.13.7...v2.13.8) --- updated-dependencies: - dependency-name: org.scala-lang:scala-library dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 227b760f1..d0334fd31 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ 8.0.22 42.2.20 1.7.32 - 2.13.7 + 2.13.8 13.0.5.Final From 643784544169afe47a9dc012a3c539376127341e Mon Sep 17 00:00:00 2001 From: vvilerio Date: Tue, 11 Jan 2022 15:12:06 +0100 Subject: [PATCH 44/83] bugfix : the pseudo class ":hover" was missing for the messages section --- .../{apiId}/editor/aaieditor.component.css | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/front-end/studio/src/app/pages/apis/{apiId}/editor/aaieditor.component.css b/front-end/studio/src/app/pages/apis/{apiId}/editor/aaieditor.component.css index f3462f0eb..40732bc8e 100644 --- a/front-end/studio/src/app/pages/apis/{apiId}/editor/aaieditor.component.css +++ b/front-end/studio/src/app/pages/apis/{apiId}/editor/aaieditor.component.css @@ -153,6 +153,28 @@ margin-right: 4px; } +.aai-editor .editor-master .editor-outline .api-message:hover { + background-color: #d1eaf7; +} + +.aai-editor .editor-master .editor-outline .api-message.selected { + background-color: #a5d6ef; + border-left: 2px solid #39a5dc; +} + +.aai-editor .editor-master .editor-outline .api-response.contexted, +.aai-editor .editor-master .editor-outline .api-response.contexted:hover, +.aai-editor .editor-master .editor-outline .api-message.contexted, +.aai-editor .editor-master .editor-outline .api-message.contexted:hover { + background-color: #FFCC87; + border-left: 2px dotted #E89F3D; +} + +.aai-editor .editor-master .editor-outline .api-message>* { + margin-right: 4px; +} + + .aai-editor .editor-master .editor-outline .api-response { -webkit-transition: background-color 200ms; -moz-transition: background-color 200ms; From d1aaf5353fac3df2ae205c3b7f2122b70949eec0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Jan 2022 19:01:55 +0000 Subject: [PATCH 45/83] chore(deps): bump maven-jar-plugin from 3.2.0 to 3.2.2 Bumps [maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.2.0 to 3.2.2. - [Release notes](https://github.com/apache/maven-jar-plugin/releases) - [Commits](https://github.com/apache/maven-jar-plugin/compare/maven-jar-plugin-3.2.0...maven-jar-plugin-3.2.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-jar-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 227b760f1..ec31b92d6 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ 2.8.2 4.0.1 2.5.2 - 3.2.0 + 3.2.2 3.3.1 1.6 1.6.8 From d380bee44c3f59b5509b71e6e5076e009ddd0c1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Jan 2022 14:53:50 +0000 Subject: [PATCH 46/83] chore(deps): bump follow-redirects in /front-end/studio Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.13.0 to 1.14.7. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.13.0...v1.14.7) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] --- front-end/studio/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/front-end/studio/yarn.lock b/front-end/studio/yarn.lock index 841fc9624..357e6c950 100644 --- a/front-end/studio/yarn.lock +++ b/front-end/studio/yarn.lock @@ -4313,9 +4313,9 @@ flush-write-stream@^1.0.0: readable-stream "^2.3.6" follow-redirects@^1.0.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db" - integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA== + version "1.14.7" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685" + integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ== font-awesome-sass@^4.7.0: version "4.7.0" From 6a122e74c91b5772897b0cd2d7cb2605cd5baf0a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jan 2022 18:57:54 +0000 Subject: [PATCH 47/83] chore(deps): bump gatling-maven-plugin from 4.0.1 to 4.1.0 Bumps [gatling-maven-plugin](https://github.com/gatling/gatling-maven-plugin) from 4.0.1 to 4.1.0. - [Release notes](https://github.com/gatling/gatling-maven-plugin/releases) - [Commits](https://github.com/gatling/gatling-maven-plugin/compare/v4.0.1...v4.1.0) --- updated-dependencies: - dependency-name: io.gatling:gatling-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 227b760f1..2a780aa1e 100644 --- a/pom.xml +++ b/pom.xml @@ -81,9 +81,9 @@ 3.8.1 3.2.0 2.8.2 - 4.0.1 + 4.1.0 2.5.2 - 3.2.0 + 3.2.2 3.3.1 1.6 1.6.8 From 133da592777ee028ce6a2e51c45527454399d779 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jan 2022 18:59:26 +0000 Subject: [PATCH 48/83] chore(deps): bump maven-compiler-plugin from 3.8.1 to 3.9.0 Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.8.1 to 3.9.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.8.1...maven-compiler-plugin-3.9.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 227b760f1..1fbdc68d9 100644 --- a/pom.xml +++ b/pom.xml @@ -78,12 +78,12 @@ 3.3.0 3.0.0 3.1.0 - 3.8.1 + 3.9.0 3.2.0 2.8.2 4.0.1 2.5.2 - 3.2.0 + 3.2.2 3.3.1 1.6 1.6.8 From 2bcc0ed18f466403a45da72bad871c7de70829b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jan 2022 19:01:07 +0000 Subject: [PATCH 49/83] chore(deps): bump version.org.slf4j from 1.7.32 to 1.7.33 Bumps `version.org.slf4j` from 1.7.32 to 1.7.33. Updates `slf4j-api` from 1.7.32 to 1.7.33 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.32...v_1.7.33) Updates `slf4j-simple` from 1.7.32 to 1.7.33 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.32...v_1.7.33) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:slf4j-simple dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e6399b61f..a1968144f 100644 --- a/pom.xml +++ b/pom.xml @@ -134,7 +134,7 @@ 16.1.0 8.0.22 42.2.20 - 1.7.32 + 1.7.33 2.13.8 13.0.5.Final From 4b5cd4f342e5bafcf95dbe7f4703fade6d0f9424 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 15 Jan 2022 01:34:07 +0000 Subject: [PATCH 50/83] chore(deps-dev): bump marked from 0.7.0 to 4.0.10 in /front-end/studio Bumps [marked](https://github.com/markedjs/marked) from 0.7.0 to 4.0.10. - [Release notes](https://github.com/markedjs/marked/releases) - [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json) - [Commits](https://github.com/markedjs/marked/compare/v0.7.0...v4.0.10) --- updated-dependencies: - dependency-name: marked dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- front-end/studio/package.json | 4 ++-- front-end/studio/yarn.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/front-end/studio/package.json b/front-end/studio/package.json index 4a041d967..2f5a672df 100644 --- a/front-end/studio/package.json +++ b/front-end/studio/package.json @@ -24,7 +24,7 @@ "core-js": "2.6.5", "js-base64": "2.5.1", "js-yaml": "3.13.1", - "marked": "0.7.0", + "marked": "4.0.10", "moment": "2.23.0", "ngx-clipboard": "14.0.1", "patternfly": "3.59.1", @@ -56,7 +56,7 @@ "cp-cli": "2.0.0", "js-base64": "2.5.1", "js-yaml": "3.13.1", - "marked": "0.7.0", + "marked": "4.0.10", "moment": "2.23.0", "ng-packagr": "^11.2.4", "ngx-bootstrap": "^7.0.0-rc.1", diff --git a/front-end/studio/yarn.lock b/front-end/studio/yarn.lock index 357e6c950..3f772ef2e 100644 --- a/front-end/studio/yarn.lock +++ b/front-end/studio/yarn.lock @@ -5806,10 +5806,10 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" -marked@0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/marked/-/marked-0.7.0.tgz#b64201f051d271b1edc10a04d1ae9b74bb8e5c0e" - integrity sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg== +marked@4.0.10: + version "4.0.10" + resolved "https://registry.yarnpkg.com/marked/-/marked-4.0.10.tgz#423e295385cc0c3a70fa495e0df68b007b879423" + integrity sha512-+QvuFj0nGgO970fySghXGmuw+Fd0gD2x3+MqCWLIPf5oxdv1Ka6b2q+z9RP01P/IaKPMEramy+7cNy/Lw8c3hw== md5.js@^1.3.4: version "1.3.5" From 805dffba7323ff7050fc00c10a72137134629b1f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jan 2022 19:02:18 +0000 Subject: [PATCH 51/83] chore(deps): bump version.io.gatling from 3.7.3 to 3.7.4 Bumps `version.io.gatling` from 3.7.3 to 3.7.4. Updates `gatling-app` from 3.7.3 to 3.7.4 - [Release notes](https://github.com/gatling/gatling/releases) - [Commits](https://github.com/gatling/gatling/compare/v3.7.3...v3.7.4) Updates `gatling-charts-highcharts` from 3.7.3 to 3.7.4 - [Release notes](https://github.com/gatling/gatling-highcharts/releases) - [Commits](https://github.com/gatling/gatling-highcharts/compare/v3.7.3...v3.7.4) --- updated-dependencies: - dependency-name: io.gatling:gatling-app dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.gatling.highcharts:gatling-charts-highcharts dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a1968144f..693653143 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ 2.11.0 2.6 3.12.0 - 3.7.3 + 3.7.4 0.14.1 1.3.2 2.0 From 8f82af5e861b4de6d8935f9d81f9ed9e062937b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Jan 2022 19:02:12 +0000 Subject: [PATCH 52/83] chore(deps): bump gatling-maven-plugin from 4.1.0 to 4.1.1 Bumps [gatling-maven-plugin](https://github.com/gatling/gatling-maven-plugin) from 4.1.0 to 4.1.1. - [Release notes](https://github.com/gatling/gatling-maven-plugin/releases) - [Commits](https://github.com/gatling/gatling-maven-plugin/compare/v4.1.0...v4.1.1) --- updated-dependencies: - dependency-name: io.gatling:gatling-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 693653143..6cd5b57ed 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ 3.9.0 3.2.0 2.8.2 - 4.1.0 + 4.1.1 2.5.2 3.2.2 3.3.1 From 86e3b0c2eac13f382ac03c3234ad05ac1d9aa0c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Jan 2022 19:02:05 +0000 Subject: [PATCH 53/83] chore(deps-dev): bump selenide from 6.2.0 to 6.2.1 Bumps [selenide](https://github.com/selenide/selenide) from 6.2.0 to 6.2.1. - [Release notes](https://github.com/selenide/selenide/releases) - [Changelog](https://github.com/selenide/selenide/blob/master/CHANGELOG.md) - [Commits](https://github.com/selenide/selenide/compare/v6.2.0...v6.2.1) --- updated-dependencies: - dependency-name: com.codeborne:selenide dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/integration/single-node-keycloak/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/single-node-keycloak/pom.xml b/test/integration/single-node-keycloak/pom.xml index 974621902..d000b2c47 100644 --- a/test/integration/single-node-keycloak/pom.xml +++ b/test/integration/single-node-keycloak/pom.xml @@ -115,7 +115,7 @@ com.codeborne selenide - 6.2.0 + 6.2.1 test From 6b5155934227dd66926b6d94c913a84de601e8a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 22 Jan 2022 10:57:11 +0000 Subject: [PATCH 54/83] chore(deps): bump nanoid from 3.1.23 to 3.2.0 in /front-end/studio Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.23 to 3.2.0. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.1.23...3.2.0) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect ... Signed-off-by: dependabot[bot] --- front-end/studio/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/front-end/studio/yarn.lock b/front-end/studio/yarn.lock index 3f772ef2e..cbd7c12e6 100644 --- a/front-end/studio/yarn.lock +++ b/front-end/studio/yarn.lock @@ -6183,9 +6183,9 @@ nan@^2.9.2: integrity sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw== nanoid@^3.1.23: - version "3.1.23" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81" - integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw== + version "3.2.0" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c" + integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA== nanomatch@^1.2.9: version "1.2.13" From 284446728d9507160d5518466753227202d60c22 Mon Sep 17 00:00:00 2001 From: Laurent Broudoux Date: Tue, 25 Jan 2022 09:13:48 +0100 Subject: [PATCH 55/83] Some adjustments to allow deployment of Quarkus flavours using Operator: - Fix exposition port of ws component - Force OIDC redirect_uri to be https when deployed behing an ingress controller that handles TLS - Make Keycloak URL config the same that Wildfly falvor so that both can be deployed with Operator --- .../api/src/main/resources/application.properties | 4 ++-- platforms/quarkus/ui/README.md | 4 +++- .../quarkus/ui/src/main/resources/application.properties | 9 +++++++-- .../quarkus/ws/src/main/resources/application.properties | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/platforms/quarkus/api/src/main/resources/application.properties b/platforms/quarkus/api/src/main/resources/application.properties index 605a728bd..3d242e15c 100644 --- a/platforms/quarkus/api/src/main/resources/application.properties +++ b/platforms/quarkus/api/src/main/resources/application.properties @@ -22,11 +22,11 @@ quarkus.http.cors=true -studio.keycloak.url=${APICURIO_KC_AUTH_URL:http://localhost:8090} +studio.keycloak.url=${APICURIO_KC_AUTH_URL:http://localhost:8090/auth} studio.keycloak.realm=${APICURIO_KC_REALM:apicurio} quarkus.oidc.application-type=service -quarkus.oidc.auth-server-url=${studio.keycloak.url}/auth/realms/${studio.keycloak.realm} +quarkus.oidc.auth-server-url=${studio.keycloak.url}/realms/${studio.keycloak.realm} quarkus.oidc.client-id=${APICURIO_KC_CLIENT_ID:apicurio-api} quarkus.oidc.connection-delay=PT60S diff --git a/platforms/quarkus/ui/README.md b/platforms/quarkus/ui/README.md index dbbff848d..c8b16eac9 100644 --- a/platforms/quarkus/ui/README.md +++ b/platforms/quarkus/ui/README.md @@ -37,7 +37,9 @@ For both profiles you need to provide connection configuration for a oidc server |OIDC Realm|`-Dstudio.keycloak.realm`|`APICURIO_KC_REALM`| |OIDC Client ID|`-Dquarkus.oidc.client-id`|`APICURIO_KC_CLIENT_ID`| - +In `prod` profile, by default, the OIDC connector forces the `redirect_uri` to use `https://` URI - considering this component may be deployed behind a reverse proxy that handles the TLS termination. +To disable this behavior, you may set the `APICURIO_OIDC_REDIRECT_HTTPS` environment variable to `false`. + To see additional options, visit: - [OIDC Options](https://quarkus.io/guides/security-openid-connect) diff --git a/platforms/quarkus/ui/src/main/resources/application.properties b/platforms/quarkus/ui/src/main/resources/application.properties index e483d9778..e1bd8fa86 100644 --- a/platforms/quarkus/ui/src/main/resources/application.properties +++ b/platforms/quarkus/ui/src/main/resources/application.properties @@ -13,13 +13,18 @@ %prod.apicurio-ui.hub-api.url=${APICURIO_UI_HUB_API_URL:} %prod.apicurio-ui.validation.channelName.regexp=${APICURIO_UI_VALIDATION_CHANNELNAME_REGEXP:} +# When in container accessed with http, the OIDC does not detect https termination +# from the router/reverse proxy in front. We should force the redirection being https. +%prod.quarkus.oidc.authentication.force-redirect-https-scheme=${APICURIO_OIDC_REDIRECT_HTTPS:true} +%prod.quarkus.log.level=INFO + quarkus.http.cors=true -studio.keycloak.url=${APICURIO_KC_AUTH_URL:http://localhost:8090} +studio.keycloak.url=${APICURIO_KC_AUTH_URL:http://localhost:8090/auth} studio.keycloak.realm=${APICURIO_KC_REALM:apicurio} quarkus.oidc.application-type=web-app -quarkus.oidc.auth-server-url=${studio.keycloak.url}/auth/realms/${studio.keycloak.realm} +quarkus.oidc.auth-server-url=${studio.keycloak.url}/realms/${studio.keycloak.realm} quarkus.oidc.client-id=${APICURIO_KC_CLIENT_ID:apicurio-studio} quarkus.oidc.connection-delay=PT60S diff --git a/platforms/quarkus/ws/src/main/resources/application.properties b/platforms/quarkus/ws/src/main/resources/application.properties index 9c48a5e48..4a278cab7 100644 --- a/platforms/quarkus/ws/src/main/resources/application.properties +++ b/platforms/quarkus/ws/src/main/resources/application.properties @@ -20,6 +20,6 @@ %prod.quarkus.datasource.jdbc.max-size=8 %prod.quarkus.datasource.jdbc.min-size=2 %prod.quarkus.log.level=INFO - +%prod.quarkus.http.port=8080 quarkus.package.type=legacy-jar \ No newline at end of file From 1b17d9641e8ba99979161372c5be3015044ddeee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Jan 2022 19:02:39 +0000 Subject: [PATCH 56/83] chore(deps): bump version.org.keycloak from 16.1.0 to 16.1.1 Bumps `version.org.keycloak` from 16.1.0 to 16.1.1. Updates `keycloak-core` from 16.1.0 to 16.1.1 - [Release notes](https://github.com/keycloak/keycloak/releases) - [Commits](https://github.com/keycloak/keycloak/compare/16.1.0...16.1.1) Updates `keycloak-common` from 16.1.0 to 16.1.1 - [Release notes](https://github.com/keycloak/keycloak/releases) - [Commits](https://github.com/keycloak/keycloak/compare/16.1.0...16.1.1) Updates `keycloak-adapter-core` from 16.1.0 to 16.1.1 - [Release notes](https://github.com/keycloak/keycloak/releases) - [Commits](https://github.com/keycloak/keycloak/compare/16.1.0...16.1.1) Updates `keycloak-adapter-spi` from 16.1.0 to 16.1.1 --- updated-dependencies: - dependency-name: org.keycloak:keycloak-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.keycloak:keycloak-common dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.keycloak:keycloak-adapter-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.keycloak:keycloak-adapter-spi dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6cd5b57ed..8c49765a9 100644 --- a/pom.xml +++ b/pom.xml @@ -131,7 +131,7 @@ 3.27.0 20211205 1.1.1 - 16.1.0 + 16.1.1 8.0.22 42.2.20 1.7.33 From a5c3354b9ec1a4be6defc1cc895a910359d3da2f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Jan 2022 19:02:58 +0000 Subject: [PATCH 57/83] chore(deps): bump jdbi3-bom from 3.27.0 to 3.27.1 Bumps [jdbi3-bom](https://github.com/jdbi/jdbi) from 3.27.0 to 3.27.1. - [Release notes](https://github.com/jdbi/jdbi/releases) - [Changelog](https://github.com/jdbi/jdbi/blob/master/RELEASE_NOTES.md) - [Commits](https://github.com/jdbi/jdbi/compare/v3.27.0...v3.27.1) --- updated-dependencies: - dependency-name: org.jdbi:jdbi3-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6cd5b57ed..c56ce400e 100644 --- a/pom.xml +++ b/pom.xml @@ -128,7 +128,7 @@ 2.0.0.Final 2.0.2.Final 1.1.1.Final - 3.27.0 + 3.27.1 20211205 1.1.1 16.1.0 From 4e8d1d43706af8c5801138bfa4bddf537d7edd84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Jan 2022 19:03:08 +0000 Subject: [PATCH 58/83] chore(deps): bump version.org.slf4j from 1.7.33 to 1.7.35 Bumps `version.org.slf4j` from 1.7.33 to 1.7.35. Updates `slf4j-api` from 1.7.33 to 1.7.35 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.33...v_1.7.35) Updates `slf4j-simple` from 1.7.33 to 1.7.35 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.33...v_1.7.35) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:slf4j-simple dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6cd5b57ed..a8c03fda2 100644 --- a/pom.xml +++ b/pom.xml @@ -134,7 +134,7 @@ 16.1.0 8.0.22 42.2.20 - 1.7.33 + 1.7.35 2.13.8 13.0.5.Final From cc301e3f784eb7873d87943b7a4fd0f0c6ad097e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Jan 2022 19:01:47 +0000 Subject: [PATCH 59/83] chore(deps): bump version.infinispan from 13.0.5.Final to 13.0.6.Final Bumps `version.infinispan` from 13.0.5.Final to 13.0.6.Final. Updates `infinispan-commons` from 13.0.5.Final to 13.0.6.Final Updates `infinispan-core` from 13.0.5.Final to 13.0.6.Final - [Release notes](https://github.com/infinispan/infinispan/releases) - [Changelog](https://github.com/infinispan/infinispan/blob/main/Jenkinsfile-release) - [Commits](https://github.com/infinispan/infinispan/compare/13.0.5.Final...13.0.6.Final) --- updated-dependencies: - dependency-name: org.infinispan:infinispan-commons dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.infinispan:infinispan-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 373fc3870..bf16eaedb 100644 --- a/pom.xml +++ b/pom.xml @@ -136,7 +136,7 @@ 42.2.20 1.7.35 2.13.8 - 13.0.5.Final + 13.0.6.Final From 0e52a9d55af41ff4fb065e02e1340b7f048056b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Feb 2022 19:01:52 +0000 Subject: [PATCH 60/83] chore(deps): bump version.org.slf4j from 1.7.35 to 1.7.36 Bumps `version.org.slf4j` from 1.7.35 to 1.7.36. Updates `slf4j-api` from 1.7.35 to 1.7.36 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.35...v_1.7.36) Updates `slf4j-simple` from 1.7.35 to 1.7.36 - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.35...v_1.7.36) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.slf4j:slf4j-simple dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bf16eaedb..a73437262 100644 --- a/pom.xml +++ b/pom.xml @@ -134,7 +134,7 @@ 16.1.1 8.0.22 42.2.20 - 1.7.35 + 1.7.36 2.13.8 13.0.6.Final From 1c3466e5674ac5f8a4261521dda1cda727c6c1c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Feb 2022 19:02:13 +0000 Subject: [PATCH 61/83] chore(deps-dev): bump selenide from 6.2.1 to 6.3.1 Bumps [selenide](https://github.com/selenide/selenide) from 6.2.1 to 6.3.1. - [Release notes](https://github.com/selenide/selenide/releases) - [Changelog](https://github.com/selenide/selenide/blob/master/CHANGELOG.md) - [Commits](https://github.com/selenide/selenide/compare/v6.2.1...v6.3.1) --- updated-dependencies: - dependency-name: com.codeborne:selenide dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test/integration/single-node-keycloak/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/single-node-keycloak/pom.xml b/test/integration/single-node-keycloak/pom.xml index d000b2c47..ead7e51cb 100644 --- a/test/integration/single-node-keycloak/pom.xml +++ b/test/integration/single-node-keycloak/pom.xml @@ -115,7 +115,7 @@ com.codeborne selenide - 6.2.1 + 6.3.1 test From 9aa7499813d10684c720d0296b0672d20c3a0d74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Feb 2022 19:02:09 +0000 Subject: [PATCH 62/83] chore(deps): bump maven-javadoc-plugin from 3.3.1 to 3.3.2 Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.3.1 to 3.3.2. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.3.1...maven-javadoc-plugin-3.3.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bf16eaedb..27e55e646 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ 4.1.1 2.5.2 3.2.2 - 3.3.1 + 3.3.2 1.6 1.6.8 3.2.0 From 3fd75ee69fc66990cefa81b95766f322d00ff881 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Feb 2022 12:47:37 +0000 Subject: [PATCH 63/83] chore(deps): bump follow-redirects in /front-end/studio Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] --- front-end/studio/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/front-end/studio/yarn.lock b/front-end/studio/yarn.lock index cbd7c12e6..3b0ed550e 100644 --- a/front-end/studio/yarn.lock +++ b/front-end/studio/yarn.lock @@ -4313,9 +4313,9 @@ flush-write-stream@^1.0.0: readable-stream "^2.3.6" follow-redirects@^1.0.0: - version "1.14.7" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685" - integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ== + version "1.14.8" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc" + integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA== font-awesome-sass@^4.7.0: version "4.7.0" From be5de28e5ae1843e85adb6f310836e168e4d23c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Feb 2022 19:02:13 +0000 Subject: [PATCH 64/83] chore(deps): bump maven-compiler-plugin from 3.9.0 to 3.10.0 Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.9.0 to 3.10.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.9.0...maven-compiler-plugin-3.10.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bf16eaedb..e5b67eb86 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ 3.3.0 3.0.0 3.1.0 - 3.9.0 + 3.10.0 3.2.0 2.8.2 4.1.1 From 69e05786253bdab5c5857cfd6519791dae50c16f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Feb 2022 19:02:28 +0000 Subject: [PATCH 65/83] chore(deps): bump version.io.gatling from 3.7.4 to 3.7.5 Bumps `version.io.gatling` from 3.7.4 to 3.7.5. Updates `gatling-app` from 3.7.4 to 3.7.5 - [Release notes](https://github.com/gatling/gatling/releases) - [Commits](https://github.com/gatling/gatling/compare/v3.7.4...v3.7.5) Updates `gatling-charts-highcharts` from 3.7.4 to 3.7.5 - [Release notes](https://github.com/gatling/gatling-highcharts/releases) - [Commits](https://github.com/gatling/gatling-highcharts/compare/v3.7.4...v3.7.5) --- updated-dependencies: - dependency-name: io.gatling:gatling-app dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.gatling.highcharts:gatling-charts-highcharts dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bf16eaedb..b35eaf387 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ 2.11.0 2.6 3.12.0 - 3.7.4 + 3.7.5 0.14.1 1.3.2 2.0 From cb769281e5f23f24b5cc63176b02d70e4cae5b17 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Feb 2022 19:02:08 +0000 Subject: [PATCH 66/83] chore(deps): bump nexus-staging-maven-plugin from 1.6.8 to 1.6.11 Bumps nexus-staging-maven-plugin from 1.6.8 to 1.6.11. --- updated-dependencies: - dependency-name: org.sonatype.plugins:nexus-staging-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bf16eaedb..3ae53cc71 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ 3.2.2 3.3.1 1.6 - 1.6.8 + 1.6.11 3.2.0 3.2.1 2.22.2 From e1e509cc0c6510865feb7d380a313e68896c102e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Feb 2022 15:48:34 +0000 Subject: [PATCH 67/83] chore(deps): bump ajv from 6.9.2 to 6.12.6 in /front-end/studio Bumps [ajv](https://github.com/ajv-validator/ajv) from 6.9.2 to 6.12.6. - [Release notes](https://github.com/ajv-validator/ajv/releases) - [Commits](https://github.com/ajv-validator/ajv/compare/v6.9.2...v6.12.6) --- updated-dependencies: - dependency-name: ajv dependency-type: indirect ... Signed-off-by: dependabot[bot] --- front-end/studio/yarn.lock | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/front-end/studio/yarn.lock b/front-end/studio/yarn.lock index cbd7c12e6..90f846c73 100644 --- a/front-end/studio/yarn.lock +++ b/front-end/studio/yarn.lock @@ -1840,7 +1840,7 @@ ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== -ajv@6.12.6, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: +ajv@6.12.6, ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -1850,16 +1850,6 @@ ajv@6.12.6, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^6.1.0: - version "6.9.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.2.tgz#4927adb83e7f48e5a32b45729744c71ec39c9c7b" - integrity sha512-4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg== - dependencies: - fast-deep-equal "^2.0.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - ajv@^7.0.3: version "7.2.4" resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.2.4.tgz#8e239d4d56cf884bccca8cca362f508446dc160f" @@ -4166,11 +4156,6 @@ extsprintf@^1.2.0: resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= -fast-deep-equal@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" - integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk= - fast-deep-equal@^3.1.1: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" @@ -4187,16 +4172,11 @@ fast-glob@^3.1.1, fast-glob@^3.2.4: merge2 "^1.3.0" micromatch "^4.0.4" -fast-json-stable-stringify@2.1.0: +fast-json-stable-stringify@2.1.0, fast-json-stable-stringify@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== -fast-json-stable-stringify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" - integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= - fastparse@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9" @@ -9434,9 +9414,9 @@ upath@^1.1.1: integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== uri-js@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" - integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ== + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== dependencies: punycode "^2.1.0" From d6f5d04a5d218b5b7346677661c67925a808ca91 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Feb 2022 15:49:08 +0000 Subject: [PATCH 68/83] chore(deps): bump version.io.prometheus from 0.14.1 to 0.15.0 Bumps `version.io.prometheus` from 0.14.1 to 0.15.0. Updates `simpleclient` from 0.14.1 to 0.15.0 - [Release notes](https://github.com/prometheus/client_java/releases) - [Commits](https://github.com/prometheus/client_java/compare/parent-0.14.1...parent-0.15.0) Updates `simpleclient_hotspot` from 0.14.1 to 0.15.0 - [Release notes](https://github.com/prometheus/client_java/releases) - [Commits](https://github.com/prometheus/client_java/compare/parent-0.14.1...parent-0.15.0) Updates `simpleclient_common` from 0.14.1 to 0.15.0 - [Release notes](https://github.com/prometheus/client_java/releases) - [Commits](https://github.com/prometheus/client_java/compare/parent-0.14.1...parent-0.15.0) --- updated-dependencies: - dependency-name: io.prometheus:simpleclient dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.prometheus:simpleclient_hotspot dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.prometheus:simpleclient_common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 110faab0c..97e0925c7 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ 2.6 3.12.0 3.7.5 - 0.14.1 + 0.15.0 1.3.2 2.0 2.0.1 From 5cc4682f46b8e3bec81c9cf7dffe08895cd815c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Feb 2022 03:23:18 +0000 Subject: [PATCH 69/83] chore(deps): bump url-parse from 1.5.3 to 1.5.7 in /front-end/studio Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.3 to 1.5.7. - [Release notes](https://github.com/unshiftio/url-parse/releases) - [Commits](https://github.com/unshiftio/url-parse/compare/1.5.3...1.5.7) --- updated-dependencies: - dependency-name: url-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] --- front-end/studio/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/front-end/studio/yarn.lock b/front-end/studio/yarn.lock index 21cbe1826..a1071f7df 100644 --- a/front-end/studio/yarn.lock +++ b/front-end/studio/yarn.lock @@ -9426,9 +9426,9 @@ urix@^0.1.0: integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= url-parse@^1.4.3, url-parse@^1.5.1: - version "1.5.3" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862" - integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ== + version "1.5.7" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.7.tgz#00780f60dbdae90181f51ed85fb24109422c932a" + integrity sha512-HxWkieX+STA38EDk7CE9MEryFeHCKzgagxlGvsdS7WBImq9Mk+PGwiT56w82WI3aicwJA8REp42Cxo98c8FZMA== dependencies: querystringify "^2.1.1" requires-port "^1.0.0" From 010d8514c568e4b708035096e3baa783f0b1ae16 Mon Sep 17 00:00:00 2001 From: mahgo Date: Fri, 18 Feb 2022 16:15:16 +1100 Subject: [PATCH 70/83] Fixed typo in notes --- distro/helm/templates/NOTES.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distro/helm/templates/NOTES.txt b/distro/helm/templates/NOTES.txt index ba04d67dc..571f618f2 100644 --- a/distro/helm/templates/NOTES.txt +++ b/distro/helm/templates/NOTES.txt @@ -11,7 +11,7 @@ Apicurio is available at https://{{ .Values.ui.hostname }} Keycloak that is defined is available on {{ .Values.keycloak.url }} {{- if .Values.ui.feature.microcks }} -Microks is enabled and available on {{ .Values.microcks.api.url }} +Microcks is enabled and available on {{ .Values.microcks.api.url }} {{- else }} -Microks is disabled +Microcks is disabled {{- end }} From 9369bbe44051426e521d621e390950753a9c2939 Mon Sep 17 00:00:00 2001 From: mahgo Date: Fri, 18 Feb 2022 16:15:16 +1100 Subject: [PATCH 71/83] Added being able to disable database installation in cluster --- distro/helm/templates/apicurio-studio-db-deployment.yaml | 3 +++ distro/helm/values.yaml | 1 + 2 files changed, 4 insertions(+) diff --git a/distro/helm/templates/apicurio-studio-db-deployment.yaml b/distro/helm/templates/apicurio-studio-db-deployment.yaml index 5d2b3efc6..e39880b91 100644 --- a/distro/helm/templates/apicurio-studio-db-deployment.yaml +++ b/distro/helm/templates/apicurio-studio-db-deployment.yaml @@ -1,3 +1,5 @@ + +{{- if .Values.database.install }} apiVersion: apps/v1 kind: Deployment metadata: @@ -61,3 +63,4 @@ spec: {{- end }} securityContext: fsGroup: 999 +{{- end }} \ No newline at end of file diff --git a/distro/helm/values.yaml b/distro/helm/values.yaml index 8e3adf538..73fcd77a5 100644 --- a/distro/helm/values.yaml +++ b/distro/helm/values.yaml @@ -37,6 +37,7 @@ ws: extraVolumes: [] database: + install: true name: apicurio-studio-db image: percona:5.7 port: 3306 From 7e1da44b47c791f65d9d6af1456282d6b97f6432 Mon Sep 17 00:00:00 2001 From: mahgo Date: Fri, 18 Feb 2022 16:15:16 +1100 Subject: [PATCH 72/83] Added being able to configure ingress annotations, and turn on tls --- .../templates/apicurio-studio-ingresses.yaml | 27 +++++++++++++++++++ distro/helm/values.yaml | 6 +++++ 2 files changed, 33 insertions(+) diff --git a/distro/helm/templates/apicurio-studio-ingresses.yaml b/distro/helm/templates/apicurio-studio-ingresses.yaml index 40197ddef..3e06f9cba 100644 --- a/distro/helm/templates/apicurio-studio-ingresses.yaml +++ b/distro/helm/templates/apicurio-studio-ingresses.yaml @@ -5,6 +5,9 @@ metadata: annotations: #if subpath needed uncomment line and add to path beneath in specs nginx.ingress.kubernetes.io/rewrite-target: /$1 + {{- with .Values.ingress.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} labels: module: {{ .Values.api.name }} spec: @@ -19,6 +22,12 @@ spec: number: {{ .Values.api.port }} path: /studio-api/?(.*) pathType: Prefix + {{- if .Values.ingress.tls.enabled }} + tls: + - hosts: + - {{ .Values.ui.hostname }} + secretName: {{ .Values.ui.hostname }}-tls + {{- end }} --- kind: Ingress apiVersion: networking.k8s.io/v1 @@ -26,6 +35,9 @@ metadata: name: {{ .Values.ui.name }} annotations: # ingress.kubernetes.io/rewrite-target: / + {{- with .Values.ingress.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} labels: module: {{ .Values.ui.name }} spec: @@ -40,6 +52,12 @@ spec: number: {{ .Values.ui.port }} path: / pathType: Prefix + {{- if .Values.ingress.tls.enabled }} + tls: + - hosts: + - {{ .Values.ui.hostname }} + secretName: {{ .Values.ui.hostname }}-tls + {{- end }} --- kind: Ingress apiVersion: networking.k8s.io/v1 @@ -55,6 +73,9 @@ metadata: proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection $connection_upgrade; nginx.ingress.kubernetes.io/rewrite-target: /$1 + {{- with .Values.ingress.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} labels: module: {{ .Values.ws.name }} spec: @@ -69,3 +90,9 @@ spec: number: {{ .Values.ws.port }} path: /ws/?(.*) pathType: Prefix + {{- if .Values.ingress.tls.enabled }} + tls: + - hosts: + - {{ .Values.ui.hostname }} + secretName: {{ .Values.ui.hostname }}-tls + {{- end }} diff --git a/distro/helm/values.yaml b/distro/helm/values.yaml index 73fcd77a5..f2c3e3479 100644 --- a/distro/helm/values.yaml +++ b/distro/helm/values.yaml @@ -75,3 +75,9 @@ keycloak: id: apicurio-studio #default secret secret: apicuriokc + +ingress: + tls: + enabled: false; + #annotations: + #kubernetes.io/ingress.class: nginx \ No newline at end of file From c91ba58abde7006d4aeff26fff0d3945906a3bfa Mon Sep 17 00:00:00 2001 From: mahgo Date: Fri, 18 Feb 2022 16:15:16 +1100 Subject: [PATCH 73/83] Added deployment resource configuration --- distro/helm/templates/apicurio-studio-api-deployment.yaml | 6 ++++++ distro/helm/templates/apicurio-studio-ui-deployment.yaml | 5 +++++ distro/helm/templates/apicurio-studio-ws-deployment.yaml | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/distro/helm/templates/apicurio-studio-api-deployment.yaml b/distro/helm/templates/apicurio-studio-api-deployment.yaml index 62905b000..17773f246 100644 --- a/distro/helm/templates/apicurio-studio-api-deployment.yaml +++ b/distro/helm/templates/apicurio-studio-api-deployment.yaml @@ -67,6 +67,12 @@ spec: imagePullPolicy: {{ .Values.api.imagePullPolicy }} ports: - containerPort: 8080 + + {{- if .Values.api.resources }} + resources: + {{- toYaml .Values.api.resources | nindent 12 }} + {{- end }} + {{- if .Values.api.extraVolumes }} volumeMounts: {{- range $volume := .Values.api.extraVolumes }} diff --git a/distro/helm/templates/apicurio-studio-ui-deployment.yaml b/distro/helm/templates/apicurio-studio-ui-deployment.yaml index 07df3cd83..2e7230e14 100644 --- a/distro/helm/templates/apicurio-studio-ui-deployment.yaml +++ b/distro/helm/templates/apicurio-studio-ui-deployment.yaml @@ -59,6 +59,11 @@ spec: name: {{ .Values.ui.name }} ports: - containerPort: 8080 + {{- if .Values.ui.resources }} + resources: + {{- toYaml .Values.ui.resources | nindent 12 }} + {{- end }} + {{- if .Values.ui.extraVolumes }} volumeMounts: {{- range $volume := .Values.ui.extraVolumes }} diff --git a/distro/helm/templates/apicurio-studio-ws-deployment.yaml b/distro/helm/templates/apicurio-studio-ws-deployment.yaml index 9684abf72..58687cf1e 100644 --- a/distro/helm/templates/apicurio-studio-ws-deployment.yaml +++ b/distro/helm/templates/apicurio-studio-ws-deployment.yaml @@ -47,6 +47,11 @@ spec: name: {{ .Values.ws.name }} ports: - containerPort: 8080 + {{- if .Values.ws.resources }} + resources: + {{- toYaml .Values.ws.resources | nindent 12 }} + {{- end }} + {{- if .Values.ws.extraVolumes }} volumeMounts: {{- range $volume := .Values.ws.extraVolumes }} From cf191a578abfb0033da8753e471e2dcfaa4fe674 Mon Sep 17 00:00:00 2001 From: mahgo Date: Fri, 18 Feb 2022 16:15:17 +1100 Subject: [PATCH 74/83] Added being able to specify an existing secret instead of creating one with the chart. --- distro/helm/templates/_helpers.tpl | 7 +++++++ distro/helm/templates/apicurio-secrets.yaml | 4 +++- distro/helm/templates/apicurio-studio-api-deployment.yaml | 8 ++++---- distro/helm/templates/apicurio-studio-db-deployment.yaml | 6 +++--- distro/helm/templates/apicurio-studio-ui-deployment.yaml | 4 ++-- distro/helm/templates/apicurio-studio-ws-deployment.yaml | 4 ++-- 6 files changed, 21 insertions(+), 12 deletions(-) create mode 100644 distro/helm/templates/_helpers.tpl diff --git a/distro/helm/templates/_helpers.tpl b/distro/helm/templates/_helpers.tpl new file mode 100644 index 000000000..d4d4f9cd7 --- /dev/null +++ b/distro/helm/templates/_helpers.tpl @@ -0,0 +1,7 @@ +{{- define "apicurio-studio.secretName" -}} +{{- if .Values.existingSecret }} + {{- printf "%s" .Values.existingSecret -}} +{{- else -}} +apicurio-secret +{{- end -}} +{{- end -}} \ No newline at end of file diff --git a/distro/helm/templates/apicurio-secrets.yaml b/distro/helm/templates/apicurio-secrets.yaml index b29758021..fbc2a4b2b 100644 --- a/distro/helm/templates/apicurio-secrets.yaml +++ b/distro/helm/templates/apicurio-secrets.yaml @@ -1,7 +1,8 @@ +{{- if not .Values.existingSecret }} apiVersion: v1 kind: Secret metadata: - name: apicurio-secret + name: {{ include "apicurio-studio.secretName" . }} type: Opaque data: db-password: {{ .Values.database.password | b64enc }} @@ -9,3 +10,4 @@ data: db-user: {{ .Values.database.user | b64enc }} apicurio-kc-client-secret: {{ .Values.keycloak.client.secret | b64enc }} apicurio-microcks-client-secret: {{ .Values.microcks.client.secret | b64enc }} +{{- end }} \ No newline at end of file diff --git a/distro/helm/templates/apicurio-studio-api-deployment.yaml b/distro/helm/templates/apicurio-studio-api-deployment.yaml index 17773f246..a5fa6d4e4 100644 --- a/distro/helm/templates/apicurio-studio-api-deployment.yaml +++ b/distro/helm/templates/apicurio-studio-api-deployment.yaml @@ -29,14 +29,14 @@ spec: - name: APICURIO_DB_PASSWORD valueFrom: secretKeyRef: - name: apicurio-secret + name: {{ include "apicurio-studio.secretName" . }} key: db-password - name: APICURIO_DB_TYPE value: {{ .Values.database.type }} - name: APICURIO_DB_USER_NAME valueFrom: secretKeyRef: - name: apicurio-secret + name: {{ include "apicurio-studio.secretName" . }} key: db-user - name: APICURIO_MICROCKS_API_URL value: {{ .Values.microcks.api.url }} @@ -45,7 +45,7 @@ spec: - name: APICURIO_MICROCKS_CLIENT_SECRET valueFrom: secretKeyRef: - name: apicurio-secret + name: {{ include "apicurio-studio.secretName" . }} key: apicurio-microcks-client-secret - name: APICURIO_KC_AUTH_URL value: {{ .Values.keycloak.url }} @@ -56,7 +56,7 @@ spec: - name: APICURIO_KC_CLIENT_SECRET valueFrom: secretKeyRef: - name: apicurio-secret + name: {{ include "apicurio-studio.secretName" . }} key: apicurio-kc-client-secret - name: APICURIO_SHARE_FOR_EVERYONE value: {{ .Values.uiFeatureShareForEveryone | quote }} diff --git a/distro/helm/templates/apicurio-studio-db-deployment.yaml b/distro/helm/templates/apicurio-studio-db-deployment.yaml index e39880b91..84beea4a2 100644 --- a/distro/helm/templates/apicurio-studio-db-deployment.yaml +++ b/distro/helm/templates/apicurio-studio-db-deployment.yaml @@ -31,17 +31,17 @@ spec: - name: MYSQL_PASSWORD valueFrom: secretKeyRef: - name: apicurio-secret + name: {{ include "apicurio-studio.secretName" . }} key: db-password - name: MYSQL_ROOT_PASSWORD valueFrom: secretKeyRef: - name: apicurio-secret + name: {{ include "apicurio-studio.secretName" . }} key: db-root-password - name: MYSQL_USER valueFrom: secretKeyRef: - name: apicurio-secret + name: {{ include "apicurio-studio.secretName" . }} key: db-user image: {{ .Values.database.image }} imagePullPolicy: {{ .Values.database.imagePullPolicy }} diff --git a/distro/helm/templates/apicurio-studio-ui-deployment.yaml b/distro/helm/templates/apicurio-studio-ui-deployment.yaml index 2e7230e14..f0db3d4f7 100644 --- a/distro/helm/templates/apicurio-studio-ui-deployment.yaml +++ b/distro/helm/templates/apicurio-studio-ui-deployment.yaml @@ -29,7 +29,7 @@ spec: - name: APICURIO_KC_CLIENT_SECRET valueFrom: secretKeyRef: - name: apicurio-secret + name: {{ include "apicurio-studio.secretName" . }} key: apicurio-kc-client-secret - name: APICURIO_UI_FEATURE_MICROCKS value: {{ .Values.ui.feature.microcks | quote}} @@ -52,7 +52,7 @@ spec: - name: APICURIO_MICROCKS_CLIENT_SECRET valueFrom: secretKeyRef: - name: apicurio-secret + name: {{ include "apicurio-studio.secretName" . }} key: apicurio-microcks-client-secret image: {{ .Values.ui.image }} imagePullPolicy: {{ .Values.ui.imagePullPolicy }} diff --git a/distro/helm/templates/apicurio-studio-ws-deployment.yaml b/distro/helm/templates/apicurio-studio-ws-deployment.yaml index 58687cf1e..138b36d57 100644 --- a/distro/helm/templates/apicurio-studio-ws-deployment.yaml +++ b/distro/helm/templates/apicurio-studio-ws-deployment.yaml @@ -29,14 +29,14 @@ spec: - name: APICURIO_DB_PASSWORD valueFrom: secretKeyRef: - name: apicurio-secret + name: {{ include "apicurio-studio.secretName" . }} key: db-password - name: APICURIO_DB_TYPE value: {{ .Values.database.type }} - name: APICURIO_DB_USER_NAME valueFrom: secretKeyRef: - name: apicurio-secret + name: {{ include "apicurio-studio.secretName" . }} key: db-user - name: APICURIO_SHARE_FOR_EVERYONE value: {{ .Values.uiFeatureShareForEveryone | quote }} From 70a3a5519ed3f01cb8270af1c2b3817a0a19a12e Mon Sep 17 00:00:00 2001 From: mahgo Date: Fri, 18 Feb 2022 16:15:17 +1100 Subject: [PATCH 75/83] Stopped PVC being created if not installing a database --- distro/helm/templates/mysql-apicurio-persistentvolumeclaim.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/distro/helm/templates/mysql-apicurio-persistentvolumeclaim.yaml b/distro/helm/templates/mysql-apicurio-persistentvolumeclaim.yaml index 16c4dd517..3f11501d1 100644 --- a/distro/helm/templates/mysql-apicurio-persistentvolumeclaim.yaml +++ b/distro/helm/templates/mysql-apicurio-persistentvolumeclaim.yaml @@ -1,3 +1,4 @@ +{{- if .Values.database.install }} kind: PersistentVolumeClaim apiVersion: v1 metadata: @@ -8,3 +9,4 @@ spec: resources: requests: storage: 4Gi +{{- end }} \ No newline at end of file From 3e75abd8d812bda5bb3d4a6872828b90e9edc766 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Feb 2022 19:01:50 +0000 Subject: [PATCH 76/83] chore(deps-dev): bump selenide from 6.3.1 to 6.3.3 Bumps [selenide](https://github.com/selenide/selenide) from 6.3.1 to 6.3.3. - [Release notes](https://github.com/selenide/selenide/releases) - [Changelog](https://github.com/selenide/selenide/blob/master/CHANGELOG.md) - [Commits](https://github.com/selenide/selenide/compare/v6.3.1...v6.3.3) --- updated-dependencies: - dependency-name: com.codeborne:selenide dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/integration/single-node-keycloak/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/single-node-keycloak/pom.xml b/test/integration/single-node-keycloak/pom.xml index ead7e51cb..fa700a205 100644 --- a/test/integration/single-node-keycloak/pom.xml +++ b/test/integration/single-node-keycloak/pom.xml @@ -115,7 +115,7 @@ com.codeborne selenide - 6.3.1 + 6.3.3 test From c6b6d06cd96827836a515dfbf8b34edfaca0bbc4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Feb 2022 19:02:14 +0000 Subject: [PATCH 77/83] chore(deps): bump jdbi3-bom from 3.27.1 to 3.27.2 Bumps [jdbi3-bom](https://github.com/jdbi/jdbi) from 3.27.1 to 3.27.2. - [Release notes](https://github.com/jdbi/jdbi/releases) - [Changelog](https://github.com/jdbi/jdbi/blob/master/RELEASE_NOTES.md) - [Commits](https://github.com/jdbi/jdbi/compare/v3.27.1...v3.27.2) --- updated-dependencies: - dependency-name: org.jdbi:jdbi3-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ce6816470..fbf88ac00 100644 --- a/pom.xml +++ b/pom.xml @@ -128,7 +128,7 @@ 2.0.0.Final 2.0.2.Final 1.1.1.Final - 3.27.1 + 3.27.2 20211205 1.1.1 16.1.1 From 5bad7e4129d72ae30c8b344e07163bcdec4cc5ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Feb 2022 19:01:44 +0000 Subject: [PATCH 78/83] chore(deps): bump nexus-staging-maven-plugin from 1.6.11 to 1.6.12 Bumps nexus-staging-maven-plugin from 1.6.11 to 1.6.12. --- updated-dependencies: - dependency-name: org.sonatype.plugins:nexus-staging-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e18884418..f6e6add35 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ 3.2.2 3.3.2 1.6 - 1.6.11 + 1.6.12 3.2.0 3.2.1 2.22.2 From a9b461c8357d81c2277a5f2f43cd40c12e436796 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Feb 2022 04:46:19 +0000 Subject: [PATCH 79/83] chore(deps): bump url-parse from 1.5.7 to 1.5.10 in /front-end/studio Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.7 to 1.5.10. - [Release notes](https://github.com/unshiftio/url-parse/releases) - [Commits](https://github.com/unshiftio/url-parse/compare/1.5.7...1.5.10) --- updated-dependencies: - dependency-name: url-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] --- front-end/studio/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/front-end/studio/yarn.lock b/front-end/studio/yarn.lock index a1071f7df..30ff9a9f1 100644 --- a/front-end/studio/yarn.lock +++ b/front-end/studio/yarn.lock @@ -9426,9 +9426,9 @@ urix@^0.1.0: integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= url-parse@^1.4.3, url-parse@^1.5.1: - version "1.5.7" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.7.tgz#00780f60dbdae90181f51ed85fb24109422c932a" - integrity sha512-HxWkieX+STA38EDk7CE9MEryFeHCKzgagxlGvsdS7WBImq9Mk+PGwiT56w82WI3aicwJA8REp42Cxo98c8FZMA== + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== dependencies: querystringify "^2.1.1" requires-port "^1.0.0" From 6d124c6537375b1842130e9d316888c40a513c6c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Mar 2022 19:02:17 +0000 Subject: [PATCH 80/83] chore(deps): bump version.io.gatling from 3.7.5 to 3.7.6 Bumps `version.io.gatling` from 3.7.5 to 3.7.6. Updates `gatling-app` from 3.7.5 to 3.7.6 - [Release notes](https://github.com/gatling/gatling/releases) - [Commits](https://github.com/gatling/gatling/compare/v3.7.5...v3.7.6) Updates `gatling-charts-highcharts` from 3.7.5 to 3.7.6 - [Release notes](https://github.com/gatling/gatling-highcharts/releases) - [Commits](https://github.com/gatling/gatling-highcharts/compare/v3.7.5...v3.7.6) --- updated-dependencies: - dependency-name: io.gatling:gatling-app dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.gatling.highcharts:gatling-charts-highcharts dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e18884418..23e6f81d0 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ 2.11.0 2.6 3.12.0 - 3.7.5 + 3.7.6 0.15.0 1.3.2 2.0 From 281135d88f5ddf6ae6ab4ff540179d68624c93f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Mar 2022 19:02:09 +0000 Subject: [PATCH 81/83] chore(deps): bump gatling-maven-plugin from 4.1.1 to 4.1.2 Bumps [gatling-maven-plugin](https://github.com/gatling/gatling-maven-plugin) from 4.1.1 to 4.1.2. - [Release notes](https://github.com/gatling/gatling-maven-plugin/releases) - [Commits](https://github.com/gatling/gatling-maven-plugin/compare/v4.1.1...v4.1.2) --- updated-dependencies: - dependency-name: io.gatling:gatling-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9690ddd66..f64684d5f 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ 3.10.0 3.2.0 2.8.2 - 4.1.1 + 4.1.2 2.5.2 3.2.2 3.3.2 From 4d3d3c13bb08a855719671f6ecb7475cc70f5166 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Mar 2022 19:02:01 +0000 Subject: [PATCH 82/83] chore(deps): bump gatling-maven-plugin from 4.1.2 to 4.1.3 Bumps [gatling-maven-plugin](https://github.com/gatling/gatling-maven-plugin) from 4.1.2 to 4.1.3. - [Release notes](https://github.com/gatling/gatling-maven-plugin/releases) - [Commits](https://github.com/gatling/gatling-maven-plugin/compare/v4.1.2...v4.1.3) --- updated-dependencies: - dependency-name: io.gatling:gatling-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f64684d5f..1cf394a4c 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ 3.10.0 3.2.0 2.8.2 - 4.1.2 + 4.1.3 2.5.2 3.2.2 3.3.2 From 1b9e05ec7d1e986ffe8c9e08022a60684df9b71b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Mar 2022 19:02:28 +0000 Subject: [PATCH 83/83] chore(deps-dev): bump selenide from 6.3.3 to 6.3.4 Bumps [selenide](https://github.com/selenide/selenide) from 6.3.3 to 6.3.4. - [Release notes](https://github.com/selenide/selenide/releases) - [Changelog](https://github.com/selenide/selenide/blob/master/CHANGELOG.md) - [Commits](https://github.com/selenide/selenide/compare/v6.3.3...v6.3.4) --- updated-dependencies: - dependency-name: com.codeborne:selenide dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- test/integration/single-node-keycloak/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/single-node-keycloak/pom.xml b/test/integration/single-node-keycloak/pom.xml index fa700a205..02596ac99 100644 --- a/test/integration/single-node-keycloak/pom.xml +++ b/test/integration/single-node-keycloak/pom.xml @@ -115,7 +115,7 @@ com.codeborne selenide - 6.3.3 + 6.3.4 test