From a851e1cdcaa757a46ff893c3f5f7f58361bb8635 Mon Sep 17 00:00:00 2001 From: Roberto Lopez Lopez Date: Tue, 5 Jul 2022 06:54:13 +0000 Subject: [PATCH 1/5] DXE-618 upgrade nexus-staging-maven-plugin --- CHANGELOG.md | 6 ++++++ pom.xml | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93dee82..73aa598 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Change log +## 4.1.2 (XXX YY, ZZZZ) + +### Fixes + +* Avoid major bug OSSRH-66257 by upgrading org.sonatype.plugins:nexus-staging-maven-plugin. + ## 4.1.1 (February 17, 2022) ### Enhancements diff --git a/pom.xml b/pom.xml index 10685f8..db2cf0a 100644 --- a/pom.xml +++ b/pom.xml @@ -257,7 +257,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 + 1.6.13 ossrh https://oss.sonatype.org/ @@ -336,7 +336,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 + 1.6.13 default-deploy From c78eb3becafeeccd34cd7c62996d3e8fd5ed81aa Mon Sep 17 00:00:00 2001 From: Roberto Lopez Lopez Date: Wed, 6 Jul 2022 09:23:14 +0000 Subject: [PATCH 2/5] DXE-1250 remove edgegrid-signer-gatling, upgrade dependencies --- CHANGELOG.md | 6 +- README.md | 2 - edgegrid-signer-apache-http-client/README.md | 2 +- edgegrid-signer-apache-http-client/pom.xml | 2 +- edgegrid-signer-async-http-client/README.md | 2 +- edgegrid-signer-async-http-client/pom.xml | 2 +- edgegrid-signer-core/pom.xml | 2 +- edgegrid-signer-gatling/README.md | 54 ------------- edgegrid-signer-gatling/pom.xml | 79 ------------------- .../src/test/resources/logback-test.xml | 19 ----- .../signer/gatling/DebugEntrypoint.scala | 18 ----- .../edgegrid/signer/gatling/Engine.scala | 17 ---- .../signer/gatling/IDEPathHelper.scala | 16 ---- .../edgegrid/signer/gatling/Recorder.scala | 17 ---- .../edgegrid/signer/gatling/TestData.scala | 34 -------- .../openapi/OpenApiHttpConfiguration.scala | 28 ------- .../EdgeGridSignerSimulation1.scala | 63 --------------- .../EdgeGridSignerSimulation2.scala | 62 --------------- .../simulations/OpenApiSimulation.scala | 27 ------- edgegrid-signer-google-http-client/README.md | 2 +- edgegrid-signer-google-http-client/pom.xml | 2 +- edgegrid-signer-rest-assured/README.md | 2 +- edgegrid-signer-rest-assured/pom.xml | 2 +- edgerc-reader/pom.xml | 2 +- pom.xml | 40 ++++------ 25 files changed, 29 insertions(+), 473 deletions(-) delete mode 100644 edgegrid-signer-gatling/README.md delete mode 100644 edgegrid-signer-gatling/pom.xml delete mode 100644 edgegrid-signer-gatling/src/test/resources/logback-test.xml delete mode 100644 edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/DebugEntrypoint.scala delete mode 100644 edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/Engine.scala delete mode 100644 edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/IDEPathHelper.scala delete mode 100644 edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/Recorder.scala delete mode 100644 edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/TestData.scala delete mode 100644 edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/openapi/OpenApiHttpConfiguration.scala delete mode 100644 edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/simulations/EdgeGridSignerSimulation1.scala delete mode 100644 edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/simulations/EdgeGridSignerSimulation2.scala delete mode 100644 edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/simulations/OpenApiSimulation.scala diff --git a/CHANGELOG.md b/CHANGELOG.md index 73aa598..708f5bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,13 @@ ## 4.1.2 (XXX YY, ZZZZ) +### Improvements + +* Extract edgegrid-signer-gatling module to a separate project. + ### Fixes -* Avoid major bug OSSRH-66257 by upgrading org.sonatype.plugins:nexus-staging-maven-plugin. +* Fixes for various vulnerabilities: OSSRH-66257, CVE-2020-36518, sonatype-2021-4682, CVE-2022-24823, sonatype-2019-0673, sonatype-2012-0050, sonatype-2021-4916 ## 4.1.1 (February 17, 2022) diff --git a/README.md b/README.md index 77cc283..bce0d1e 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,6 @@ This project contains a core implementation module and five bindings to specific * [edgegrid-signer-google-http-client](edgegrid-signer-google-http-client) is a binding for [Google HTTP Client Library for Java][3]. * [edgegrid-signer-rest-assured](edgegrid-signer-rest-assured) is a binding for [REST-assured][4]. * [edgegrid-signer-async-http-client](edgegrid-signer-async-http-client) is a binding for [Async HTTP Client][13]. -* [edgegrid-signer-gatling](edgegrid-signer-gatling) is a binding for [Gatling][14]. > Note: A number of similar libraries for signing requests exist for popular @@ -66,7 +65,6 @@ programming languages, and you can find them at [https://github.com/akamai?q=edg [11]: https://github.com/akamai-open/AkamaiOPEN-edgegrid-C-Sharp [12]: https://github.com/akamai-open/AkamaiOPEN-edgegrid-golang [13]: https://github.com/AsyncHttpClient/async-http-client -[14]: https://gatling.io/ ## Authors diff --git a/edgegrid-signer-apache-http-client/README.md b/edgegrid-signer-apache-http-client/README.md index 741c274..01788f3 100644 --- a/edgegrid-signer-apache-http-client/README.md +++ b/edgegrid-signer-apache-http-client/README.md @@ -15,7 +15,7 @@ Include the following Maven dependency in your project POM: com.akamai.edgegrid edgegrid-signer-apache-http-client - 4.1.1 + 4.1.2 ``` diff --git a/edgegrid-signer-apache-http-client/pom.xml b/edgegrid-signer-apache-http-client/pom.xml index 0bb33d3..e5cb372 100644 --- a/edgegrid-signer-apache-http-client/pom.xml +++ b/edgegrid-signer-apache-http-client/pom.xml @@ -6,7 +6,7 @@ edgegrid-signer-parent com.akamai.edgegrid - 4.1.1 + 4.1.2 4.0.0 diff --git a/edgegrid-signer-async-http-client/README.md b/edgegrid-signer-async-http-client/README.md index 83ca60c..02146a0 100644 --- a/edgegrid-signer-async-http-client/README.md +++ b/edgegrid-signer-async-http-client/README.md @@ -15,7 +15,7 @@ Include the following Maven dependency in your project POM: com.akamai.edgegrid edgegrid-signer-async-http-client - 4.1.1 + 4.1.2 ``` diff --git a/edgegrid-signer-async-http-client/pom.xml b/edgegrid-signer-async-http-client/pom.xml index 04cfc3c..8305535 100644 --- a/edgegrid-signer-async-http-client/pom.xml +++ b/edgegrid-signer-async-http-client/pom.xml @@ -5,7 +5,7 @@ edgegrid-signer-parent com.akamai.edgegrid - 4.1.1 + 4.1.2 4.0.0 diff --git a/edgegrid-signer-core/pom.xml b/edgegrid-signer-core/pom.xml index a4e1165..3d58018 100644 --- a/edgegrid-signer-core/pom.xml +++ b/edgegrid-signer-core/pom.xml @@ -6,7 +6,7 @@ edgegrid-signer-parent com.akamai.edgegrid - 4.1.1 + 4.1.2 edgegrid-signer-core diff --git a/edgegrid-signer-gatling/README.md b/edgegrid-signer-gatling/README.md deleted file mode 100644 index b3d6867..0000000 --- a/edgegrid-signer-gatling/README.md +++ /dev/null @@ -1,54 +0,0 @@ -# Gatling - EdgeGrid Client for Java - -[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.akamai.edgegrid/edgegrid-signer-gatling/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.akamai.edgegrid/edgegrid-signer-gatling) -[![Javadoc](http://www.javadoc.io/badge/com.akamai.edgegrid/edgegrid-signer-gatling.svg)](http://www.javadoc.io/doc/com.akamai.edgegrid/edgegrid-signer-gatling) - -This library implements [Akamai EdgeGrid Authentication](https://techdocs.akamai.com/developer/docs/authenticate-with-edgegrid) for Java. -This particular module is a binding for [Gatling](https://gatling.io/). -This project contains installation and usage instructions in the [README.md](../README.md). - -## Use Gatling - -> Note: The binding works only with Gatling 2, not Gatling 3. - -Include the following Maven dependency in your project POM: - -```xml - - com.akamai.edgegrid - edgegrid-signer-gatling - 4.1.1 - -``` - -Create a Gatling simulation that inherits from `OpenApiSimulation` and is constructed with a defined -client credential: - -```scala -class YourSimulation extends OpenApiSimulation(clientCredential) { - - ... - - val testScenario = scenario("Test scenario") - .exec( - http("createPropertyRequest") - .post("/papi/v0/properties/") - .queryParam("contractId", "ctr_1-3CV382") - .queryParam("groupId", "grp_18385") - .body(StringBody( - """{ - "productId": "Site_Accel", - "propertyName": "8LuWyUjwea" - }""")) - .asJSON - .check(status.is(201)) - ) - - setUp( - testScenario.inject(atOnceUsers(1)) - ).protocols(httpConf) - -} -``` - -> Note: `httpConf` is a protocol configured to use the defined `clientCredential`. diff --git a/edgegrid-signer-gatling/pom.xml b/edgegrid-signer-gatling/pom.xml deleted file mode 100644 index 4e5d822..0000000 --- a/edgegrid-signer-gatling/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - edgegrid-signer-parent - com.akamai.edgegrid - 4.1.1 - - - edgegrid-signer-gatling - jar - Gatling binding for EdgeGrid Client - - - - com.akamai.edgegrid - edgegrid-signer-async-http-client - ${project.version} - - - io.gatling - gatling-app - - - io.gatling.highcharts - gatling-charts-highcharts - - - org.scala-lang - scala-library - - - com.github.tomakehurst - wiremock - - - - - - - net.alchim31.maven - scala-maven-plugin - 4.5.3 - - - - add-source - compile - doc-jar - testCompile - - - - - - io.gatling - gatling-maven-plugin - 3.1.2 - - true - true - ${project.basedir}/src/test/resources - - - - gatling-integration-tests - - test - - - - - - - - diff --git a/edgegrid-signer-gatling/src/test/resources/logback-test.xml b/edgegrid-signer-gatling/src/test/resources/logback-test.xml deleted file mode 100644 index 91c5247..0000000 --- a/edgegrid-signer-gatling/src/test/resources/logback-test.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - %-4relative [%thread] %-5level %logger{35} - %msg %n - - - - - - - - - - - - - \ No newline at end of file diff --git a/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/DebugEntrypoint.scala b/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/DebugEntrypoint.scala deleted file mode 100644 index fb12788..0000000 --- a/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/DebugEntrypoint.scala +++ /dev/null @@ -1,18 +0,0 @@ -package com.akamai.edgegrid.signer.gatling - -import com.akamai.edgegrid.signer.gatling.simulations.EdgeGridSignerSimulation1 -import io.gatling.app.Gatling -import io.gatling.core.config.GatlingPropertiesBuilder - -object DebugEntrypoint { - - def main(args: Array[String]): Unit = { - - // This sets the class for the Simulation we want to run. - val simClass = classOf[EdgeGridSignerSimulation1].getName - - val props = new GatlingPropertiesBuilder - props.simulationClass(simClass) - Gatling.fromMap(props.build) - } -} diff --git a/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/Engine.scala b/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/Engine.scala deleted file mode 100644 index 33a4f9b..0000000 --- a/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/Engine.scala +++ /dev/null @@ -1,17 +0,0 @@ -package com.akamai.edgegrid.signer.gatling - -import io.gatling.app.Gatling -import io.gatling.core.config.GatlingPropertiesBuilder - -/** - * General configuration for the Gatling simulations engine. - */ -object Engine extends App { - - val props = new GatlingPropertiesBuilder() - .resourcesDirectory(IDEPathHelper.mavenResourcesDirectory.toString) - .resultsDirectory(IDEPathHelper.resultsDirectory.toString) - .binariesDirectory(IDEPathHelper.mavenBinariesDirectory.toString) - - Gatling.fromMap(props.build) -} diff --git a/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/IDEPathHelper.scala b/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/IDEPathHelper.scala deleted file mode 100644 index 4812e19..0000000 --- a/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/IDEPathHelper.scala +++ /dev/null @@ -1,16 +0,0 @@ -package com.akamai.edgegrid.signer.gatling - -import java.nio.file.Paths - -object IDEPathHelper { - - private val projectRootDir = Paths.get(getClass.getClassLoader.getResource("gatling.conf").toURI).getParent.getParent.getParent - private val mavenTargetDirectory = projectRootDir.resolve("target") - private val mavenSrcTestDirectory = projectRootDir.resolve("src").resolve("test") - - val mavenSourcesDirectory = mavenSrcTestDirectory.resolve("scala") - val mavenResourcesDirectory = mavenSrcTestDirectory.resolve("resources") - val mavenBinariesDirectory = mavenTargetDirectory.resolve("test-classes") - val resultsDirectory = mavenTargetDirectory.resolve("gatling") - val recorderConfigFile = mavenResourcesDirectory.resolve("recorder.conf") -} diff --git a/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/Recorder.scala b/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/Recorder.scala deleted file mode 100644 index 3fb3da5..0000000 --- a/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/Recorder.scala +++ /dev/null @@ -1,17 +0,0 @@ -package com.akamai.edgegrid.signer.gatling - -import io.gatling.recorder.GatlingRecorder -import io.gatling.recorder.config.RecorderPropertiesBuilder - -/** - * General configuration for the Gatling simulations recorder. - */ -object Recorder extends App { - - val props = new RecorderPropertiesBuilder() - .simulationsFolder(IDEPathHelper.mavenSourcesDirectory.toString) - .resourcesFolder(IDEPathHelper.mavenResourcesDirectory.toString) - .simulationPackage("simulations") - - GatlingRecorder.fromMap(props.build, Some(IDEPathHelper.recorderConfigFile)) -} diff --git a/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/TestData.scala b/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/TestData.scala deleted file mode 100644 index 289b2c3..0000000 --- a/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/TestData.scala +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2016 Copyright 2016 Akamai Technologies, Inc. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.akamai.edgegrid.signer.gatling - -import com.akamai.edgegrid.signer.ClientCredential - -package object testdata { - - val testCredential = ClientCredential.builder - .accessToken("akaa-dm5g2bfwoodqnc6k-ju7vlao2wz6oz2rp") - .clientToken("akaa-k7glklzuxkkh2ycw-oadjphopvpn6yjoj") - .clientSecret("SOMESECRET") - .host("localhost:9089").build - - val SERVICE_MOCK_HOST = "localhost" - val SERVICE_MOCK_PORT = 9089 - val SERVICE_MOCK = testdata.SERVICE_MOCK_HOST + ":" + testdata.SERVICE_MOCK_PORT - - -} diff --git a/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/openapi/OpenApiHttpConfiguration.scala b/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/openapi/OpenApiHttpConfiguration.scala deleted file mode 100644 index d393512..0000000 --- a/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/openapi/OpenApiHttpConfiguration.scala +++ /dev/null @@ -1,28 +0,0 @@ -package com.akamai.edgegrid.signer.gatling.openapi - -import com.akamai.edgegrid.signer.{ClientCredential, EdgeGridV1Signer} -import io.gatling.core.Predef._ -import io.gatling.http.Predef.{Request, SignatureCalculator, http} -import io.gatling.http.protocol.HttpProtocolBuilder -import io.netty.handler.codec.http.HttpHeaderNames.AUTHORIZATION - -object OpenApiHttpConfiguration { - def openApiHttpConf(credential: ClientCredential): HttpProtocolBuilder = http - .baseUrl("https://" + credential.getHost) - .sign(new SignatureCalculator { - override def sign(request: Request): Unit = { - val requestBuilder = com.akamai.edgegrid.signer.Request.builder.uri(request.getUri.toJavaNetURI) - .method(request.getMethod.toString) - if (request.getBody != null) { - requestBuilder.body(request.getBody.getBytes) - } - - request.getHeaders.forEach(h => { - requestBuilder.header(h.getKey, h.getValue) - }) - - val authorization = new EdgeGridV1Signer().getSignature(requestBuilder.build, credential) - request.getHeaders.set(AUTHORIZATION, authorization) - } - }) -} diff --git a/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/simulations/EdgeGridSignerSimulation1.scala b/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/simulations/EdgeGridSignerSimulation1.scala deleted file mode 100644 index 38469b4..0000000 --- a/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/simulations/EdgeGridSignerSimulation1.scala +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright 2018 Akamai Technologies, Inc. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.akamai.edgegrid.signer.gatling.simulations - -import com.akamai.edgegrid.signer.gatling.openapi.OpenApiHttpConfiguration -import com.akamai.edgegrid.signer.gatling.testdata -import com.github.tomakehurst.wiremock.WireMockServer -import com.github.tomakehurst.wiremock.client.WireMock._ -import com.github.tomakehurst.wiremock.core.WireMockConfiguration -import io.gatling.core.Predef._ -import io.gatling.core.structure.ScenarioBuilder -import io.gatling.http.Predef.{http, status, _} -import io.gatling.http.protocol.HttpProtocolBuilder - -class EdgeGridSignerSimulation1 extends Simulation { - - val httpConf: HttpProtocolBuilder = OpenApiHttpConfiguration.openApiHttpConf(testdata.testCredential) - .baseUrl("http://" + testdata.SERVICE_MOCK) - - val wireMockServer = new WireMockServer(WireMockConfiguration.wireMockConfig().port(testdata.SERVICE_MOCK_PORT)) - - val testScenario: ScenarioBuilder = scenario("Test scenario") - .exec( - http("fakeRequest") - .get("/test") - .check(status.is(201)) - ) - - before { - wireMockServer.start() - wireMockServer.stubFor(get(urlPathEqualTo("/test")) - .withHeader("Authorization", matching(".*")) - .withHeader("Host", equalTo(testdata.SERVICE_MOCK)) - .willReturn(aResponse.withStatus(201) - .withHeader("Content-Type", "text/xml") - .withBody("Some content"))) - } - - setUp(testScenario.inject(atOnceUsers(1))) - .protocols(httpConf) - .assertions( - global.successfulRequests.percent.is(100) - ) - - after { - wireMockServer.stop() - } - -} diff --git a/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/simulations/EdgeGridSignerSimulation2.scala b/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/simulations/EdgeGridSignerSimulation2.scala deleted file mode 100644 index acce97c..0000000 --- a/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/simulations/EdgeGridSignerSimulation2.scala +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 2018 Akamai Technologies, Inc. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.akamai.edgegrid.signer.gatling.simulations - -import com.akamai.edgegrid.signer.gatling.openapi.OpenApiHttpConfiguration -import com.akamai.edgegrid.signer.gatling.testdata -import com.github.tomakehurst.wiremock.WireMockServer -import com.github.tomakehurst.wiremock.client.WireMock._ -import com.github.tomakehurst.wiremock.core.WireMockConfiguration -import io.gatling.core.Predef._ -import io.gatling.core.structure.ScenarioBuilder -import io.gatling.http.Predef.http -import io.gatling.http.protocol.HttpProtocolBuilder - -class EdgeGridSignerSimulation2 extends Simulation { - - val httpConf: HttpProtocolBuilder = OpenApiHttpConfiguration.openApiHttpConf(testdata.testCredential) - - val wireMockServer = new WireMockServer(WireMockConfiguration.wireMockConfig().port(testdata.SERVICE_MOCK_PORT)) - - val testScenario: ScenarioBuilder = scenario("Test scenario") - .exec( - http("fakeRequest") - .get("http://" + testdata.testCredential.getHost + "/test") - ) - - before { - wireMockServer.start() - wireMockServer.stubFor(get(urlPathEqualTo("/test")) - .withHeader("Authorization", matching(".*")) - .withHeader("Host", equalTo(testdata.SERVICE_MOCK)) - .willReturn(aResponse.withStatus(201) - .withHeader("Content-Type", "text/xml") - .withBody("Some content"))) - } - - setUp(testScenario.inject(atOnceUsers(1))) - .protocols(httpConf) - .assertions( - global.successfulRequests.percent.is(100) - ) - - after { - wireMockServer.stop() - } - - -} diff --git a/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/simulations/OpenApiSimulation.scala b/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/simulations/OpenApiSimulation.scala deleted file mode 100644 index ac0ac3e..0000000 --- a/edgegrid-signer-gatling/src/test/scala/com/akamai/edgegrid/signer/gatling/simulations/OpenApiSimulation.scala +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2018 Akamai Technologies, Inc. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.akamai.edgegrid.signer.gatling.simulations - -import com.akamai.edgegrid.signer.ClientCredential -import com.akamai.edgegrid.signer.gatling.openapi.OpenApiHttpConfiguration -import io.gatling.core.Predef.Simulation - -abstract class OpenApiSimulation(credential: ClientCredential) extends Simulation { - - val httpConf = OpenApiHttpConfiguration.openApiHttpConf(credential) - -} diff --git a/edgegrid-signer-google-http-client/README.md b/edgegrid-signer-google-http-client/README.md index 911a36a..1b85d0e 100644 --- a/edgegrid-signer-google-http-client/README.md +++ b/edgegrid-signer-google-http-client/README.md @@ -15,7 +15,7 @@ Include the following Maven dependency in your project POM: com.akamai.edgegrid edgegrid-signer-google-http-client - 4.1.1 + 4.1.2 ``` diff --git a/edgegrid-signer-google-http-client/pom.xml b/edgegrid-signer-google-http-client/pom.xml index 262a416..c3e214b 100644 --- a/edgegrid-signer-google-http-client/pom.xml +++ b/edgegrid-signer-google-http-client/pom.xml @@ -6,7 +6,7 @@ edgegrid-signer-parent com.akamai.edgegrid - 4.1.1 + 4.1.2 edgegrid-signer-google-http-client diff --git a/edgegrid-signer-rest-assured/README.md b/edgegrid-signer-rest-assured/README.md index 7759766..8cc0064 100644 --- a/edgegrid-signer-rest-assured/README.md +++ b/edgegrid-signer-rest-assured/README.md @@ -15,7 +15,7 @@ Include the following Maven dependency in your project POM: com.akamai.edgegrid edgegrid-signer-rest-assured - 4.1.1 + 4.1.2 ``` diff --git a/edgegrid-signer-rest-assured/pom.xml b/edgegrid-signer-rest-assured/pom.xml index e5e2f7b..64739a5 100644 --- a/edgegrid-signer-rest-assured/pom.xml +++ b/edgegrid-signer-rest-assured/pom.xml @@ -6,7 +6,7 @@ edgegrid-signer-parent com.akamai.edgegrid - 4.1.1 + 4.1.2 edgegrid-signer-rest-assured diff --git a/edgerc-reader/pom.xml b/edgerc-reader/pom.xml index 349ce55..01db8cb 100644 --- a/edgerc-reader/pom.xml +++ b/edgerc-reader/pom.xml @@ -5,7 +5,7 @@ edgegrid-signer-parent com.akamai.edgegrid - 4.1.1 + 4.1.2 4.0.0 diff --git a/pom.xml b/pom.xml index db2cf0a..832459c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,12 @@ com.akamai.edgegrid edgegrid-signer-parent - 4.1.1 + 4.1.2 edgegrid-signer-apache-http-client edgegrid-signer-async-http-client edgegrid-signer-core - edgegrid-signer-gatling edgegrid-signer-google-http-client edgegrid-signer-rest-assured edgerc-reader @@ -82,12 +81,10 @@ UTF-8 1.8 1.8 - 3.5.1 - 1.7.30 - 2.13.6 - 4.1.73.Final - 1.2.10 - 6.5.3 + 1.7.36 + 4.1.78.Final + 1.2.11 + 7.1.1 @@ -108,28 +105,18 @@ com.github.tomakehurst wiremock - 2.27.2 + 2.33.2 test com.google.guava guava - 30.1.1-jre + 31.1-jre com.google.http-client google-http-client - 1.39.2 - - - io.gatling - gatling-app - ${gatling.version} - - - io.gatling.highcharts - gatling-charts-highcharts - ${gatling.version} + 1.42.1 io.rest-assured @@ -146,6 +133,12 @@ httpclient 4.5.13 + + commons-codec + commons-codec + 1.15 + + org.apache.httpcomponents httpcore @@ -162,11 +155,6 @@ 1.3 test - - org.scala-lang - scala-library - ${scala-library.version} - org.slf4j slf4j-api From 339e6b9f2b4e8859c2c3c46ce25cea23ae379f8d Mon Sep 17 00:00:00 2001 From: Roberto Lopez Lopez Date: Wed, 6 Jul 2022 12:04:12 +0000 Subject: [PATCH 3/5] DXE-1250 downgrade wiremock --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 832459c..e860d48 100644 --- a/pom.xml +++ b/pom.xml @@ -105,7 +105,7 @@ com.github.tomakehurst wiremock - 2.33.2 + 2.27.2 test From 7583623445760348b5e787db2768afe7fc339b95 Mon Sep 17 00:00:00 2001 From: Piyush Kaushik Date: Mon, 18 Jul 2022 08:03:16 +0000 Subject: [PATCH 4/5] DXE-1299 Bump commons-configuration2 from 2.7 to 2.8.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e860d48..9c4a2cf 100644 --- a/pom.xml +++ b/pom.xml @@ -126,7 +126,7 @@ org.apache.commons commons-configuration2 - 2.7 + 2.8.0 org.apache.httpcomponents From 9f6ad8d61b2f16c00f38a3cf9dd59b74eda33304 Mon Sep 17 00:00:00 2001 From: Michal Wojcik Date: Wed, 20 Jul 2022 12:05:17 +0000 Subject: [PATCH 5/5] DXE-1284 Release AkamaiOpen Edgegrid Java 4.1.2 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 708f5bf..d467b19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change log -## 4.1.2 (XXX YY, ZZZZ) +## 4.1.2 (July 21, 2022) ### Improvements