Last active
June 27, 2024 03:00
-
-
Save renuka-fernando/fc8f44d8b689a84216599eb260e11d52 to your computer and use it in GitHub Desktop.
Choreo Connect Build Git Patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/adapter/internal/messaging/azure_listener.go b/adapter/internal/messaging/azure_listener.go | |
index 3f774287e..4f20968ce 100644 | |
--- a/adapter/internal/messaging/azure_listener.go | |
+++ b/adapter/internal/messaging/azure_listener.go | |
@@ -29,7 +29,7 @@ import ( | |
const ( | |
componentName = "adapter" | |
- subscriptionIdleTimeDuration = "P0Y0M3DT0H0M0S" | |
+ subscriptionIdleTimeDuration = "P0Y0M0DT0H30M0S" | |
) | |
// InitiateAndProcessEvents to pass event consumption | |
diff --git a/router/pom.xml b/router/pom.xml | |
index f24fc0015..f8b12ccbc 100644 | |
--- a/router/pom.xml | |
+++ b/router/pom.xml | |
@@ -30,22 +30,22 @@ | |
<build> | |
<plugins> | |
- <plugin> | |
- <artifactId>exec-maven-plugin</artifactId> | |
- <groupId>org.codehaus.mojo</groupId> | |
- <executions> | |
- <execution> | |
- <id>build-project</id> | |
- <phase>package</phase> | |
- <goals> | |
- <goal>exec</goal> | |
- </goals> | |
- <configuration> | |
- <executable>${project.parent.basedir}/envoy-filters/mgw-source/filters/http/mgw-wasm-websocket/build.sh</executable> | |
- </configuration> | |
- </execution> | |
- </executions> | |
- </plugin> | |
+<!-- <plugin>--> | |
+<!-- <artifactId>exec-maven-plugin</artifactId>--> | |
+<!-- <groupId>org.codehaus.mojo</groupId>--> | |
+<!-- <executions>--> | |
+<!-- <execution>--> | |
+<!-- <id>build-project</id>--> | |
+<!-- <phase>package</phase>--> | |
+<!-- <goals>--> | |
+<!-- <goal>exec</goal>--> | |
+<!-- </goals>--> | |
+<!-- <configuration>--> | |
+<!-- <executable>${project.parent.basedir}/envoy-filters/mgw-source/filters/http/mgw-wasm-websocket/build.sh</executable>--> | |
+<!-- </configuration>--> | |
+<!-- </execution>--> | |
+<!-- </executions>--> | |
+<!-- </plugin>--> | |
<plugin> | |
<groupId>io.fabric8</groupId> | |
<artifactId>docker-maven-plugin</artifactId> | |
diff --git a/router/src/main/assembly/assembly.xml b/router/src/main/assembly/assembly.xml | |
index 4d4198c1f..fdde34709 100644 | |
--- a/router/src/main/assembly/assembly.xml | |
+++ b/router/src/main/assembly/assembly.xml | |
@@ -38,10 +38,10 @@ | |
<source>../resources/security/mg.pem</source> | |
<outputDirectory>security/truststore</outputDirectory> | |
</file> | |
- <file> | |
- <source>target/mgw-wasm/mgw-websocket.wasm</source> | |
- <outputDirectory>wasm/websocket</outputDirectory> | |
- </file> | |
+<!-- <file>--> | |
+<!-- <source>target/mgw-wasm/mgw-websocket.wasm</source>--> | |
+<!-- <outputDirectory>wasm/websocket</outputDirectory>--> | |
+<!-- </file>--> | |
<file> | |
<source>../resources/security/ca-certificates.crt</source> | |
<outputDirectory>security/truststore</outputDirectory> | |
diff --git a/router/src/main/resources/Dockerfile b/router/src/main/resources/Dockerfile | |
index 7160f34db..a0a036d8d 100644 | |
--- a/router/src/main/resources/Dockerfile | |
+++ b/router/src/main/resources/Dockerfile | |
@@ -67,7 +67,7 @@ ENV ENVOY_UID=0 | |
ENV ENVOY_GID=0 | |
COPY maven/LICENSE.txt . | |
-COPY maven/wasm /home/wso2/wasm | |
+COPY --from=wso2/choreo-connect-router:1.2.0 ${MG_USER_HOME}/wasm ${MG_USER_HOME}/wasm | |
COPY maven/security/truststore/ca-certificates.crt /etc/ssl/certs | |
COPY maven/interceptor /home/wso2/interceptor | |
COPY maven/envoy.yaml /etc/envoy/envoy.yaml |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment