From eee21ab18efbb9adad42bcb796a962fe2a74a10b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 12 Sep 2022 19:54:52 +0100 Subject: [PATCH] Polish "Add LoadBalancer Web smoke test" See gh-115 --- cloud-loadbalancing-web/build.gradle | 37 +++++++++++-------- .../native-image/native-image.properties | 1 - .../src/main/resources/application.yml | 5 +-- 3 files changed, 22 insertions(+), 21 deletions(-) delete mode 100644 cloud-loadbalancing-web/src/main/resources/META-INF/native-image/native-image.properties diff --git a/cloud-loadbalancing-web/build.gradle b/cloud-loadbalancing-web/build.gradle index 247b65af..9dd03462 100644 --- a/cloud-loadbalancing-web/build.gradle +++ b/cloud-loadbalancing-web/build.gradle @@ -1,29 +1,34 @@ plugins { - id 'java' - id 'org.springframework.boot' - id 'org.springframework.aot.smoke-test' - id 'org.graalvm.buildtools.native' + id 'java' + id 'org.springframework.boot' + id 'org.springframework.aot.smoke-test' + id 'org.graalvm.buildtools.native' } ext { - set('springCloudVersion', "2022.0.0-SNAPSHOT") + set('springCloudVersion', "2022.0.0-SNAPSHOT") } dependencies { - implementation(platform( - org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) - implementation( - platform("org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}")) - implementation("org.springframework.boot:spring-boot-starter") - implementation("org.springframework.boot:spring-boot-starter-web") - implementation("org.springframework.cloud:spring-cloud-starter-loadbalancer") + implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) + implementation(platform("org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}")) + implementation("org.springframework.boot:spring-boot-starter-web") + implementation("org.springframework.cloud:spring-cloud-starter-loadbalancer") - testImplementation("org.springframework.boot:spring-boot-starter-test") + testImplementation("org.springframework.boot:spring-boot-starter-test") - aotSmokeTestImplementation(project(":aot-smoke-test-support")) - aotSmokeTestImplementation("org.awaitility:awaitility:4.2.0") + aotSmokeTestImplementation(project(":aot-smoke-test-support")) + aotSmokeTestImplementation("org.awaitility:awaitility:4.2.0") } aotSmokeTest { - webApplication = true + webApplication = true +} + +graalvmNative { + binaries { + main { + buildArgs("--enable-http") + } + } } diff --git a/cloud-loadbalancing-web/src/main/resources/META-INF/native-image/native-image.properties b/cloud-loadbalancing-web/src/main/resources/META-INF/native-image/native-image.properties deleted file mode 100644 index db5ebaa5..00000000 --- a/cloud-loadbalancing-web/src/main/resources/META-INF/native-image/native-image.properties +++ /dev/null @@ -1 +0,0 @@ -Args = --enable-url-protocols=http,https \ No newline at end of file diff --git a/cloud-loadbalancing-web/src/main/resources/application.yml b/cloud-loadbalancing-web/src/main/resources/application.yml index 33a0103c..ec6819ea 100644 --- a/cloud-loadbalancing-web/src/main/resources/application.yml +++ b/cloud-loadbalancing-web/src/main/resources/application.yml @@ -13,7 +13,4 @@ spring: test-service: - uri: http://${TEST-SERVICE_HOST:localhost}:${TEST-SERVICE_PORT_8081:8081} demo-service: - - uri: http://${DEMO-SERVICE_HOST:localhost}:${DEMO-SERVICE_PORT_8082:8082} -logging: - level: - io.netty.resolver.dns.DnsServerAddressStreamProviders: OFF \ No newline at end of file + - uri: http://${DEMO-SERVICE_HOST:localhost}:${DEMO-SERVICE_PORT_8082:8082} \ No newline at end of file