From 2e2ffe3d9ec53a979b5cfff5267af277e6529b8e Mon Sep 17 00:00:00 2001 From: arjun-keyvalue Date: Fri, 19 Apr 2024 12:19:24 +0530 Subject: [PATCH 1/4] chore: Adds javax jaxb api dependency to support json file size limit --- server/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/server/build.gradle b/server/build.gradle index 55d1ec2111..a387b10d9b 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -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}" From 3deef35fc06756a8251ae491d596374eedc88673 Mon Sep 17 00:00:00 2001 From: arjun-keyvalue Date: Mon, 22 Apr 2024 17:47:28 +0530 Subject: [PATCH 2/4] chore: Adds conductor config for external payload storage --- .../netflix/conductor/s3/config/S3Configuration.java | 8 +++++++- .../com/netflix/conductor/s3/config/S3Properties.java | 11 +++++++++++ server/src/main/resources/application.properties | 5 +++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/awss3-storage/src/main/java/com/netflix/conductor/s3/config/S3Configuration.java b/awss3-storage/src/main/java/com/netflix/conductor/s3/config/S3Configuration.java index b14d79395a..7dce773d12 100644 --- a/awss3-storage/src/main/java/com/netflix/conductor/s3/config/S3Configuration.java +++ b/awss3-storage/src/main/java/com/netflix/conductor/s3/config/S3Configuration.java @@ -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(); } } diff --git a/awss3-storage/src/main/java/com/netflix/conductor/s3/config/S3Properties.java b/awss3-storage/src/main/java/com/netflix/conductor/s3/config/S3Properties.java index 9c41b4a107..b853446fdd 100644 --- a/awss3-storage/src/main/java/com/netflix/conductor/s3/config/S3Properties.java +++ b/awss3-storage/src/main/java/com/netflix/conductor/s3/config/S3Properties.java @@ -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; +// } } diff --git a/server/src/main/resources/application.properties b/server/src/main/resources/application.properties index 5c7903190a..1ed3be6738 100644 --- a/server/src/main/resources/application.properties +++ b/server/src/main/resources/application.properties @@ -132,3 +132,8 @@ management.datadog.metrics.export.enabled=false management.endpoints.web.exposure.include=prometheus + +conductor.external-payload-storage.type=S3 +conductor.external-payload-storage.s3.bucketName=sirn-locl-cond-ext-stg +conductor.external-payload-storage.s3.region=ap-south-1 +conductor.external-payload-storage.s3.signedUrlExpirationDuration=10 \ No newline at end of file From 4e7a86ebec391eca5826cd65dc47049886b42746 Mon Sep 17 00:00:00 2001 From: arjun-keyvalue Date: Mon, 22 Apr 2024 18:18:34 +0530 Subject: [PATCH 3/4] chore: Adds conductor config for external payload storage --- server/src/main/resources/application.properties | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/src/main/resources/application.properties b/server/src/main/resources/application.properties index 1ed3be6738..6fa8013330 100644 --- a/server/src/main/resources/application.properties +++ b/server/src/main/resources/application.properties @@ -136,4 +136,9 @@ management.endpoints.web.exposure.include=prometheus conductor.external-payload-storage.type=S3 conductor.external-payload-storage.s3.bucketName=sirn-locl-cond-ext-stg conductor.external-payload-storage.s3.region=ap-south-1 -conductor.external-payload-storage.s3.signedUrlExpirationDuration=10 \ No newline at end of file +conductor.external-payload-storage.s3.signedUrlExpirationDuration=10 + +conductor.app.maxWorkflowInputPayloadSizeThreshold=20480 +conductor.app.maxWorkflowOutputPayloadSizeThreshold=20480 +conductor.app.maxTaskInputPayloadSizeThreshold=20480 +conductor.app.maxTaskOutputPayloadSizeThreshold=20480 From 14c63da5fd7149e14a24d19d553e4cd2e459ecc8 Mon Sep 17 00:00:00 2001 From: Sherif-kv <150251195+Sherif-kv@users.noreply.github.com> Date: Wed, 8 May 2024 12:20:06 +0530 Subject: [PATCH 4/4] Remove application.properties changes --- server/src/main/resources/application.properties | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/server/src/main/resources/application.properties b/server/src/main/resources/application.properties index 6fa8013330..5c7903190a 100644 --- a/server/src/main/resources/application.properties +++ b/server/src/main/resources/application.properties @@ -132,13 +132,3 @@ management.datadog.metrics.export.enabled=false management.endpoints.web.exposure.include=prometheus - -conductor.external-payload-storage.type=S3 -conductor.external-payload-storage.s3.bucketName=sirn-locl-cond-ext-stg -conductor.external-payload-storage.s3.region=ap-south-1 -conductor.external-payload-storage.s3.signedUrlExpirationDuration=10 - -conductor.app.maxWorkflowInputPayloadSizeThreshold=20480 -conductor.app.maxWorkflowOutputPayloadSizeThreshold=20480 -conductor.app.maxTaskInputPayloadSizeThreshold=20480 -conductor.app.maxTaskOutputPayloadSizeThreshold=20480