Skip to content

fix: Increase email attachment size to support minimum 10mb #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 8, 2024
Merged

fix: Increase email attachment size to support minimum 10mb #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e2ffe3
chore: Adds javax jaxb api dependency to support json file size limit
arjun-keyvalue Apr 19, 2024
3deef35
chore: Adds conductor config for external payload storage
arjun-keyvalue Apr 22, 2024
4e7a86e
chore: Adds conductor config for external payload storage
arjun-keyvalue Apr 22, 2024
14c63da
Remove application.properties changes
Sherif-kv May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion awss3-storage/src/main/java/com/netflix/conductor/s3/config/S3Configuration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ public ExternalPayloadStorage s3ExternalPayloadStorage(
matchIfMissing = true)
@Bean
public AmazonS3 amazonS3(S3Properties properties) {
return AmazonS3ClientBuilder.standard().withRegion(properties.getRegion()).build();
return AmazonS3ClientBuilder.standard().withRegion(properties.getRegion()).build();
// TODO: Add localstack support to test locally
// return AmazonS3ClientBuilder.standard()
// .withEndpointConfiguration(
// new AwsClientBuilder.EndpointConfiguration(
// properties.getEndpoint(), properties.getRegion()))
// .build();
}
}
11 changes: 11 additions & 0 deletions awss3-storage/src/main/java/com/netflix/conductor/s3/config/S3Properties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,15 @@ public String getRegion() {
public void setRegion(String region) {
this.region = region;
}

// TODO: Add localstack support to test locally
// private String endpoint = "http://s3.localhost.localstack.cloud:4566";
//
// public String getEndpoint() {
// return endpoint;
// }
//
// public void setEndpoint(String endpoint) {
// this.endpoint = endpoint;
// }
}
1 change: 1 addition & 0 deletions server/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ dependencies {
runtimeOnly group: 'com.netflix.conductor', name: 'conductor-postgres-persistence', version: '3.9.1'

implementation "com.netflix.spectator:spectator-reg-metrics3:${version_spectator}"
implementation 'javax.xml.bind:jaxb-api:2.3.1'

runtimeOnly "org.glassfish.jaxb:jaxb-runtime:${revJAXB}"

Expand Down