Skip to content

Commit 952edd5

Browse files
marcinczeczkomarcinczeczko
committed
Amazon service extensions
- Refactored DynamoDB extension - Added S3 client extension
1 parent 2799df6 commit 952edd5

File tree

118 files changed

+2943
-1026
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+2943
-1026
lines changed

‎azure-pipelines.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ stages:
4040
poolSettings:
4141
name: 'Expansion'
4242
displayPrefix: '(Expansion)'
43-
expectUseVMs: false
43+
expectUseVMs: false

‎bom/deployment/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,11 +436,21 @@
436436
<artifactId>quarkus-amazon-lambda-resteasy-deployment</artifactId>
437437
<version>${project.version}</version>
438438
</dependency>
439+
<dependency>
440+
<groupId>io.quarkus</groupId>
441+
<artifactId>quarkus-amazon-common-deployment</artifactId>
442+
<version>${project.version}</version>
443+
</dependency>
439444
<dependency>
440445
<groupId>io.quarkus</groupId>
441446
<artifactId>quarkus-amazon-dynamodb-deployment</artifactId>
442447
<version>${project.version}</version>
443448
</dependency>
449+
<dependency>
450+
<groupId>io.quarkus</groupId>
451+
<artifactId>quarkus-amazon-s3-deployment</artifactId>
452+
<version>${project.version}</version>
453+
</dependency>
444454
<dependency>
445455
<groupId>io.quarkus</groupId>
446456
<artifactId>quarkus-amazon-lambda-http-deployment</artifactId>

‎bom/runtime/pom.xml‎

Lines changed: 49 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
<aws-lambda-java.version>1.1.0</aws-lambda-java.version>
137137
<aws-lambda-java-events.version>2.2.5</aws-lambda-java-events.version>
138138
<aws-lambda-serverless-java-container.version>1.3.1</aws-lambda-serverless-java-container.version>
139-
<awssdk.version>2.10.3</awssdk.version>
139+
<awssdk.version>2.10.47</awssdk.version>
140140
<azure-functions-java-library.version>1.3.0</azure-functions-java-library.version>
141141
<kotlin.version>1.3.41</kotlin.version>
142142
<dekorate.version>0.9.9</dekorate.version>
@@ -666,11 +666,21 @@
666666
<artifactId>quarkus-amazon-lambda-http</artifactId>
667667
<version>${project.version}</version>
668668
</dependency>
669+
<dependency>
670+
<groupId>io.quarkus</groupId>
671+
<artifactId>quarkus-amazon-common</artifactId>
672+
<version>${project.version}</version>
673+
</dependency>
669674
<dependency>
670675
<groupId>io.quarkus</groupId>
671676
<artifactId>quarkus-amazon-dynamodb</artifactId>
672677
<version>${project.version}</version>
673678
</dependency>
679+
<dependency>
680+
<groupId>io.quarkus</groupId>
681+
<artifactId>quarkus-amazon-s3</artifactId>
682+
<version>${project.version}</version>
683+
</dependency>
674684
<dependency>
675685
<groupId>io.quarkus</groupId>
676686
<artifactId>quarkus-azure-functions-http</artifactId>
@@ -2367,26 +2377,62 @@
23672377
</exclusions>
23682378
</dependency>
23692379

2380+
<dependency>
2381+
<groupId>software.amazon.awssdk</groupId>
2382+
<artifactId>sdk-core</artifactId>
2383+
<version>${awssdk.version}</version>
2384+
</dependency>
2385+
<dependency>
2386+
<groupId>software.amazon.awssdk</groupId>
2387+
<artifactId>aws-core</artifactId>
2388+
<version>${awssdk.version}</version>
2389+
</dependency>
2390+
<dependency>
2391+
<groupId>software.amazon.awssdk</groupId>
2392+
<artifactId>regions</artifactId>
2393+
<version>${awssdk.version}</version>
2394+
</dependency>
2395+
<dependency>
2396+
<groupId>software.amazon.awssdk</groupId>
2397+
<artifactId>auth</artifactId>
2398+
<version>${awssdk.version}</version>
2399+
</dependency>
2400+
<dependency>
2401+
<groupId>software.amazon.awssdk</groupId>
2402+
<artifactId>http-client-spi</artifactId>
2403+
<version>${awssdk.version}</version>
2404+
</dependency>
23702405
<dependency>
23712406
<groupId>software.amazon.awssdk</groupId>
23722407
<artifactId>dynamodb</artifactId>
23732408
<version>${awssdk.version}</version>
23742409
</dependency>
23752410
<dependency>
23762411
<groupId>software.amazon.awssdk</groupId>
2377-
<artifactId>netty-nio-client</artifactId>
2412+
<artifactId>s3</artifactId>
23782413
<version>${awssdk.version}</version>
23792414
</dependency>
23802415
<dependency>
23812416
<groupId>software.amazon.awssdk</groupId>
2382-
<artifactId>apache-client</artifactId>
2417+
<artifactId>netty-nio-client</artifactId>
23832418
<version>${awssdk.version}</version>
23842419
</dependency>
23852420
<dependency>
23862421
<groupId>software.amazon.awssdk</groupId>
23872422
<artifactId>url-connection-client</artifactId>
23882423
<version>${awssdk.version}</version>
23892424
</dependency>
2425+
<dependency>
2426+
<groupId>software.amazon.awssdk</groupId>
2427+
<artifactId>apache-client</artifactId>
2428+
<version>${awssdk.version}</version>
2429+
<exclusions>
2430+
<exclusion>
2431+
<groupId>commons-logging</groupId>
2432+
<artifactId>commons-logging</artifactId>
2433+
</exclusion>
2434+
</exclusions>
2435+
</dependency>
23902436

23912437
<dependency>
23922438
<groupId>com.microsoft.azure.functions</groupId>

‎ci-templates/jvm-build-steps.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ steps:
1515
- script: docker run --rm --publish 5432:5432 --name build-postgres -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -d postgres:10.5
1616
displayName: 'start postgres'
1717

18-
- script: docker run --rm --publish 8000:8000 --name build-dynamodb -d amazon/dynamodb-local:1.11.477
19-
displayName: 'start dynamodb'
18+
- script: docker run --rm --publish 8000:4569 --publish 8008:4572 --name build-amazon-service-clients -e SERVICES=s3,dynamodb -e START_WEB=0 -d localstack/localstack
19+
displayName: 'start aws services'
2020

2121
- script: docker run --rm --publish 7687:7687 --name build-neo4j -e NEO4J_AUTH=neo4j/secret -e NEO4J_dbms_memory_pagecache_size=10M -e NEO4J_dbms_memory_heap_initial__size=10M -d neo4j/neo4j-experimental:4.0.0-rc01
2222
displayName: 'start neo4j'
2323

2424
- bash: |
2525
sudo service mysql stop || true
26-
docker run --rm --publish 3306:3306 --name build-mysql -e MYSQL_USER=hibernate_orm_test -e MYSQL_PASSWORD=hibernate_orm_test -e MYSQL_DATABASE=hibernate_orm_test -e MYSQL_RANDOM_ROOT_PASSWORD=true -e MYSQL_DATABASE=hibernate_orm_test -d mysql:5 --skip-ssl
26+
docker run --rm --publish 3306:3306 --name build-mysql -e MYSQL_USER=hibernate_orm_test -e MYSQL_PASSWORD=hibernate_orm_test -e MYSQL_DATABASE=hibernate_orm_test -e MYSQL_RANDOM_ROOT_PASSWORD=true -e MYSQL_DATABASE=hibernate_orm_test -d mysql:5 --skip-ssl
2727
displayName: 'start mysql'
2828

2929
- task: Maven@3
@@ -32,5 +32,5 @@ steps:
3232
goals: 'install'
3333
mavenOptions: $(MAVEN_OPTS)
3434
jdkVersionOption: ${{ parameters.jdk }}
35-
options: '-B --settings azure-mvn-settings.xml -Dnative-image.docker-build -Dtest-postgresql -Dtest-elasticsearch -Dtest-mysql -Dtest-dynamodb -Dtest-vault -Dtest-neo4j -Dno-format ${{ parameters.extra }}'
35+
options: '-B --settings azure-mvn-settings.xml -Dnative-image.docker-build -Dtest-postgresql -Dtest-elasticsearch -Dtest-mysql -Dtest-amazon-services -Dtest-vault -Dtest-neo4j -Dno-format ${{ parameters.extra }}'
3636

‎ci-templates/native-build-steps.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ jobs:
3434
- ${{ if eq(parameters.postgres, 'true') }}:
3535
- script: docker run --rm --publish 5432:5432 --name build-postgres -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -d postgres:10.5
3636
displayName: 'start postgres'
37-
- ${{ if eq(parameters.dynamodb, 'true') }}:
38-
- script: docker run --rm --publish 8000:8000 --name build-dynamodb -d amazon/dynamodb-local:1.11.477
39-
displayName: 'start dynamodb'
37+
- ${{ if eq(parameters.amazonServices, 'true') }}:
38+
- script: docker run --rm --publish 8000:4569 --publish 8008:4572 --name build-amazon-service-clients -e SERVICES=s3,dynamodb -e START_WEB=0 -d localstack/localstack
39+
displayName: 'start aws local stack'
4040
- ${{ if eq(parameters.keycloak, 'true') }}:
4141
- script: docker run --rm --publish 8180:8080 --name build-keycloak -e KEYCLOAK_USER=admin -e KEYCLOAK_PASSWORD=admin -e JAVA_OPTS="-server -Xms64m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dkeycloak.profile.feature.upload_scripts=enabled" -d quay.io/keycloak/keycloak:8.0.1
4242
displayName: 'start keycloak'
@@ -54,4 +54,4 @@ jobs:
5454
inputs:
5555
goals: 'install'
5656
mavenOptions: $(MAVEN_OPTS)
57-
options: '-pl integration-tests/${{ join('',integration-tests/'', parameters.modules) }} -B --settings azure-mvn-settings.xml -Dquarkus.native.container-build=true -Dtest-postgresql -Dtest-elasticsearch -Dtest-keycloak -Ddocker-keycloak -Dtest-dynamodb -Dtest-mysql -Dtest-vault -Dtest-neo4j -Dnative-image.xmx=6g -Dnative -Dno-format'
57+
options: '-pl integration-tests/${{ join('',integration-tests/'', parameters.modules) }} -B --settings azure-mvn-settings.xml -Dquarkus.native.container-build=true -Dtest-postgresql -Dtest-elasticsearch -Dtest-keycloak -Ddocker-keycloak -Dtest-amazon-services -Dtest-mysql -Dtest-vault -Dtest-neo4j -Dnative-image.xmx=6g -Dnative -Dno-format'

‎ci-templates/stages.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,11 +232,11 @@ stages:
232232
expectUseVMs: ${{parameters.expectUseVMs}}
233233
timeoutInMinutes: 15
234234
modules:
235-
- amazon-dynamodb
235+
- amazon-services
236236
- amazon-lambda
237237
- amazon-lambda-http
238238
name: amazon
239-
dynamodb: true
239+
amazonServices: true
240240

241241
- template: native-build-steps.yaml
242242
parameters:

0 commit comments

Comments
 (0)