Skip to content

Commit

Permalink
fix: bump dependencies versions
Browse files Browse the repository at this point in the history 
   - fix integrations tests according to latest sdk

BREAKING CHANGE: use apim version 4
  • Loading branch information
@guillaumelamirand
guillaumelamirand committed Jul 4, 2023
1 parent f15fdb0 commit 486e5a1
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 144 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: 2.1
setup: true

orbs:
gravitee: gravitee-io/gravitee@2.1
gravitee: gravitee-io/gravitee@4.1.0

# our single workflow, that triggers the setup job defined above, filters on tag and branches are needed otherwise
# some workflow and job will not be triggered for tags (default CircleCI behavior)
Expand Down
106 changes: 37 additions & 69 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,34 +22,29 @@

<groupId>io.gravitee.policy</groupId>
<artifactId>gravitee-policy-apikey</artifactId>
<version>3.2.1</version>
<version>4.0.0-bump-apim-versions-SNAPSHOT</version>

<name>Gravitee.io APIM - Policy - ApiKey</name>
<description>Description of the ApiKey Gravitee Policy</description>

<parent>
<groupId>io.gravitee</groupId>
<artifactId>gravitee-parent</artifactId>
<version>21.0.0</version>
<version>21.0.1</version>
</parent>

<properties>
<gravitee-apim-gateway-tests-sdk.version>3.21.0-SNAPSHOT</gravitee-apim-gateway-tests-sdk.version>
<gravitee-bom.version>4.0.0</gravitee-bom.version>
<gravitee-connector-api.version>1.1.0</gravitee-connector-api.version>
<gravitee-expression-language.version>2.1.0</gravitee-expression-language.version>
<gravitee-gateway-api.version>2.1.0</gravitee-gateway-api.version>
<gravitee-reporter-api.version>1.25.0</gravitee-reporter-api.version>
<gravitee-bom.version>5.0.0</gravitee-bom.version>
<gravitee-gateway-api.version>3.0.0-alpha.7</gravitee-gateway-api.version>
<gravitee-policy-api.version>1.11.0</gravitee-policy-api.version>
<gravitee-node.version>2.0.1</gravitee-node.version>
<gravitee-common.version>2.0.0</gravitee-common.version>
<gravitee-plugin.version>1.24.1</gravitee-plugin.version>
<junit-jupiter.version>5.8.2</junit-jupiter.version>
<mockito-junit-jupiter.version>4.0.0</mockito-junit-jupiter.version>

<json-schema-generator-maven-plugin.version>1.1.0</json-schema-generator-maven-plugin.version>
<json-schema-generator-maven-plugin.outputDirectory>${project.build.directory}/schemas</json-schema-generator-maven-plugin.outputDirectory>
<maven-assembly-plugin.version>2.6</maven-assembly-plugin.version>
<gravitee-node.version>3.1.0-alpha.10</gravitee-node.version>
<gravitee-common.version>2.1.1</gravitee-common.version>
<gravitee-apim.version>4.0.0-SNAPSHOT</gravitee-apim.version>

<maven-plugin-assembly.version>3.6.0</maven-plugin-assembly.version>
<maven-plugin-prettier.version>0.19</maven-plugin-prettier.version>
<maven-plugin-prettier.prettierjava.version>1.6.2</maven-plugin-prettier.prettierjava.version>
<maven-plugin-properties.version>1.1.0</maven-plugin-properties.version>
<!-- Property used by the publication job in CI-->
<publish-folder-path>graviteeio-apim/plugins/policies</publish-folder-path>
</properties>
Expand All @@ -65,43 +60,19 @@
<type>pom</type>
</dependency>
<dependency>
<groupId>io.gravitee.plugin</groupId>
<artifactId>gravitee-plugin</artifactId>
<version>${gravitee-plugin.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.gravitee.common</groupId>
<artifactId>gravitee-common</artifactId>
<version>${gravitee-common.version}</version>
</dependency>
<dependency>
<groupId>io.gravitee.node</groupId>
<artifactId>gravitee-node</artifactId>
<version>${gravitee-node.version}</version>
<scope>import</scope>
<type>pom</type>
<groupId>io.gravitee.policy</groupId>
<artifactId>gravitee-policy-api</artifactId>
<version>${gravitee-policy-api.version}</version>
</dependency>
<dependency>
<groupId>io.gravitee.gateway</groupId>
<artifactId>gravitee-gateway-api</artifactId>
<version>${gravitee-gateway-api.version}</version>
</dependency>
<dependency>
<groupId>io.gravitee.reporter</groupId>
<artifactId>gravitee-reporter-api</artifactId>
<version>${gravitee-reporter-api.version}</version>
</dependency>
<dependency>
<groupId>io.gravitee.connector</groupId>
<artifactId>gravitee-connector-api</artifactId>
<version>${gravitee-connector-api.version}</version>
</dependency>
<dependency>
<groupId>io.gravitee.el</groupId>
<artifactId>gravitee-expression-language</artifactId>
<version>${gravitee-expression-language.version}</version>
<groupId>io.gravitee.common</groupId>
<artifactId>gravitee-common</artifactId>
<version>${gravitee-common.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand All @@ -113,22 +84,14 @@
<artifactId>gravitee-gateway-api</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>io.gravitee.reporter</groupId>
<artifactId>gravitee-reporter-api</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>io.gravitee.policy</groupId>
<artifactId>gravitee-policy-api</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>io.gravitee.node</groupId>
<artifactId>gravitee-node-api</artifactId>
<groupId>io.gravitee.common</groupId>
<artifactId>gravitee-common</artifactId>
<scope>provided</scope>
</dependency>

Expand All @@ -147,11 +110,22 @@
</dependency>

<!-- Test scope -->
<dependency>
<groupId>io.gravitee.apim.gateway</groupId>
<artifactId>gravitee-apim-gateway-tests-sdk</artifactId>
<version>${gravitee-apim.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
Expand All @@ -162,13 +136,6 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.gravitee.apim.gateway</groupId>
<artifactId>gravitee-apim-gateway-tests-sdk</artifactId>
<version>${gravitee-apim-gateway-tests-sdk.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand All @@ -182,7 +149,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0.0</version>
<version>${maven-plugin-properties.version}</version>
<executions>
<execution>
<phase>initialize</phase>
Expand All @@ -200,8 +167,9 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven-assembly-plugin.version}</version>
<version>${maven-plugin-assembly.version}</version>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
Expand All @@ -221,10 +189,10 @@
<plugin>
<groupId>com.hubspot.maven.plugins</groupId>
<artifactId>prettier-maven-plugin</artifactId>
<version>0.18</version>
<version>${maven-plugin-prettier.version}</version>
<configuration>
<nodeVersion>16.16.0</nodeVersion>
<prettierJavaVersion>1.6.1</prettierJavaVersion>
<prettierJavaVersion>${maven-plugin-prettier.prettierjava.version}</prettierJavaVersion>
<skip>${skip.validation}</skip>
</configuration>
<executions>
<execution>
Expand Down
40 changes: 0 additions & 40 deletions src/test/java/io/gravitee/policy/apikey/ApiKeyPolicyV3CompatibilityIntegrationTest.java
View file

This file was deleted.

15 changes: 1 addition & 14 deletions ...y/apikey/ApiKeyPolicyIntegrationTest.java → ...licyV4EmulationEngineIntegrationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,13 @@
import io.gravitee.gateway.api.service.SubscriptionService;
import io.gravitee.gateway.reactive.api.policy.SecurityToken;
import io.gravitee.policy.apikey.configuration.ApiKeyPolicyConfiguration;
import io.reactivex.rxjava3.observers.TestObserver;
import io.vertx.core.http.HttpMethod;
import io.vertx.core.http.RequestOptions;
import io.vertx.rxjava3.core.buffer.Buffer;
import io.vertx.rxjava3.core.http.HttpClient;
import io.vertx.rxjava3.core.http.HttpClientRequest;
import io.vertx.rxjava3.ext.web.client.HttpResponse;
import io.vertx.rxjava3.ext.web.client.WebClient;
import java.time.Instant;
import java.util.Collections;
import java.util.Date;
import java.util.Optional;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.mockito.stubbing.OngoingStubbing;
Expand All @@ -59,13 +53,7 @@
*/
@GatewayTest
@DeployApi("/apis/api-key.json")
public class ApiKeyPolicyIntegrationTest extends AbstractPolicyTest<ApiKeyPolicy, ApiKeyPolicyConfiguration> {

@Override
protected void configureGateway(GatewayConfigurationBuilder gatewayConfigurationBuilder) {
super.configureGateway(gatewayConfigurationBuilder);
gatewayConfigurationBuilder.set("api.jupiterMode.enabled", "true");
}
public class ApiKeyPolicyV4EmulationEngineIntegrationTest extends AbstractPolicyTest<ApiKeyPolicy, ApiKeyPolicyConfiguration> {

/**
* Override api plans to have a published API_KEY one.
Expand All @@ -80,7 +68,6 @@ public void configureApi(Api api) {
apiKeyPlan.setStatus("PUBLISHED");
apiKeyPlan.setSecurityDefinition("{\"propagateApiKey\":true}");
api.setPlans(Collections.singletonList(apiKeyPlan));
api.setExecutionMode(ExecutionMode.JUPITER);
}

@Test
Expand Down
25 changes: 5 additions & 20 deletions src/test/java/io/gravitee/policy/v3/apikey/ApiKeyPolicyV3IntegrationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,32 +15,17 @@
*/
package io.gravitee.policy.v3.apikey;

import static org.mockito.Mockito.when;
import static io.gravitee.definition.model.ExecutionMode.V3;

import io.gravitee.apim.gateway.tests.sdk.annotations.GatewayTest;
import io.gravitee.apim.gateway.tests.sdk.configuration.GatewayConfigurationBuilder;
import io.gravitee.definition.model.Api;
import io.gravitee.definition.model.ExecutionMode;
import io.gravitee.gateway.api.service.ApiKey;
import io.gravitee.gateway.api.service.Subscription;
import io.gravitee.gateway.api.service.SubscriptionService;
import io.gravitee.policy.apikey.ApiKeyPolicyIntegrationTest;
import java.util.Optional;
import io.gravitee.policy.apikey.ApiKeyPolicyV4EmulationEngineIntegrationTest;

/**
* @author Jeoffrey HAEYAERT (jeoffrey.haeyaert at graviteesource.com)
* @author GraviteeSource Team
*/
public class ApiKeyPolicyV3IntegrationTest extends ApiKeyPolicyIntegrationTest {

@Override
protected void configureGateway(GatewayConfigurationBuilder gatewayConfigurationBuilder) {
super.configureGateway(gatewayConfigurationBuilder);
gatewayConfigurationBuilder.set("api.jupiterMode.enabled", "false");
}

@Override
public void configureApi(Api api) {
super.configureApi(api);
api.setExecutionMode(ExecutionMode.V3);
}
}
@GatewayTest(v2ExecutionMode = V3)
public class ApiKeyPolicyV3IntegrationTest extends ApiKeyPolicyV4EmulationEngineIntegrationTest {}

0 comments on commit 486e5a1

Please sign in to comment.