From 7b19217e3c173be35d23ff4d8274f500fb28f794 Mon Sep 17 00:00:00 2001
From: Fabien Crespel <fabien@crespel.net>
Date: Tue, 19 Mar 2024 22:45:42 +0100
Subject: [PATCH] Update App Engine build

---
 pom.xml                     | 29 +++++++++++++++++++++++++++--
 src/main/appengine/app.yaml |  5 +++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7996ee4..da6ad7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,9 @@
 		<docker.image.repository>${docker.image.prefix}/${project.artifactId}</docker.image.repository>
 		<docker.image.tag>${project.version}</docker.image.tag>
 		<appengine.src.directory>${basedir}/src/main/appengine</appengine.src.directory>
-		<appengine.build.directory>${project.build.directory}/appengine-staging</appengine.build.directory>
+		<appengine.build.directory>${project.build.directory}/appengine-build</appengine.build.directory>
+		<appengine.staging.directory>${project.build.directory}/appengine-staging</appengine.staging.directory>
+		<appengine.secret.prefix>karaplan</appengine.secret.prefix>
 
 		<!-- Plugin properties -->
 		<appengine-maven-plugin.version>2.5.0</appengine-maven-plugin.version>
@@ -494,7 +496,7 @@
 								<configuration>
 									<artifactItems>
 										<artifactItem>
-											<outputDirectory>${appengine.build.directory}</outputDirectory>
+											<outputDirectory>${appengine.staging.directory}</outputDirectory>
 											<groupId>${project.groupId}</groupId>
 											<artifactId>${project.artifactId}</artifactId>
 											<version>${project.version}</version>
@@ -514,6 +516,28 @@
 							</execution>
 						</executions>
 					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-resources-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>appengine-resources</id>
+								<phase>package</phase>
+								<goals>
+									<goal>copy-resources</goal>
+								</goals>
+								<configuration>
+									<outputDirectory>${appengine.build.directory}</outputDirectory>
+									<resources>
+										<resource>
+											<directory>${appengine.src.directory}</directory>
+											<filtering>true</filtering>
+										</resource>
+									</resources>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
 					<plugin>
 						<groupId>com.google.cloud.tools</groupId>
 						<artifactId>appengine-maven-plugin</artifactId>
@@ -528,6 +552,7 @@
 							</execution>
 						</executions>
 						<configuration>
+							<appEngineDirectory>${appengine.build.directory}</appEngineDirectory>
 							<artifact>${project.build.directory}/${project.build.finalName}-thin.jar</artifact>
 							<version>GCLOUD_CONFIG</version>
 							<projectId>GCLOUD_CONFIG</projectId>
diff --git a/src/main/appengine/app.yaml b/src/main/appengine/app.yaml
index 4d9f062..0f2a9c4 100644
--- a/src/main/appengine/app.yaml
+++ b/src/main/appengine/app.yaml
@@ -22,14 +22,15 @@ handlers:
 env_variables:
   JAVA_TOOL_OPTIONS: "-XX:MaxRAM=1024m -Xms512m -Xmx512m -Xverify:none -XX:+TieredCompilation -XX:TieredStopAtLevel=1"
   SPRING_PROFILES_ACTIVE: "gcp"
+  SECRET_PREFIX: "@appengine.secret.prefix@"
 automatic_scaling:
   min_instances: 0
   max_instances: 3
-  min_idle_instances: 1
+  min_idle_instances: 0
   max_idle_instances: 1
   min_pending_latency: 1000ms
   max_pending_latency: 10000ms
-  max_concurrent_requests: 80
+  max_concurrent_requests: 200
   target_throughput_utilization: 0.9
   target_cpu_utilization: 0.9
 inbound_services: