From 05e4262a2535e8942cea24c6b63bd9b6928f5cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 2 May 2025 15:37:47 +0200 Subject: [PATCH] Polish --- .../DockerConfigurationMetadataTests.java | 2 +- ...ckerRegistryConfigAuthenticationTests.java | 20 +++++++++---------- .../configuration/with-auth/config.json | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/configuration/DockerConfigurationMetadataTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/configuration/DockerConfigurationMetadataTests.java index 27dd853f66..bf557ba584 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/configuration/DockerConfigurationMetadataTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/configuration/DockerConfigurationMetadataTests.java @@ -126,7 +126,7 @@ class DockerConfigurationMetadataTests extends AbstractJsonTests { assertThat(configuration.getAuths()).hasSize(3).hasEntrySatisfying("https://index.docker.io/v1/", (auth) -> { assertThat(auth.getUsername()).isEqualTo("username"); assertThat(auth.getPassword()).isEqualTo("pass\u0000word"); - assertThat(auth.getEmail()).isEqualTo("test@gmail.com"); + assertThat(auth.getEmail()).isEqualTo("test@example.com"); }).hasEntrySatisfying("custom-registry.example.com", (auth) -> { assertThat(auth.getUsername()).isEqualTo("customUser"); assertThat(auth.getPassword()).isEqualTo("customPass"); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/configuration/DockerRegistryConfigAuthenticationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/configuration/DockerRegistryConfigAuthenticationTests.java index d0ddf02c48..1b45eec5f9 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/configuration/DockerRegistryConfigAuthenticationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/configuration/DockerRegistryConfigAuthenticationTests.java @@ -68,7 +68,7 @@ class DockerRegistryConfigAuthenticationTests { "auths": { "https://index.docker.io/v1/": { "auth": "dXNlcm5hbWU6cGFzc3dvcmQ=", - "email": "test@gmail.com" + "email": "test@example.com" } } } @@ -82,7 +82,7 @@ class DockerRegistryConfigAuthenticationTests { .containsEntry("serveraddress", "https://index.docker.io/v1/") .containsEntry("username", "username") .containsEntry("password", "password") - .containsEntry("email", "test@gmail.com"); + .containsEntry("email", "test@example.com"); } @WithResource(name = "config.json", content = """ @@ -90,7 +90,7 @@ class DockerRegistryConfigAuthenticationTests { "auths": { "https://index.docker.io/v1/": { "auth": "dXNlcm5hbWU6cGFzc3dvcmQ=", - "email": "test@gmail.com" + "email": "test@example.com" } } } @@ -104,7 +104,7 @@ class DockerRegistryConfigAuthenticationTests { .containsEntry("serveraddress", "https://index.docker.io/v1/") .containsEntry("username", "username") .containsEntry("password", "password") - .containsEntry("email", "test@gmail.com"); + .containsEntry("email", "test@example.com"); } @WithResource(name = "config.json", content = """ @@ -190,7 +190,7 @@ class DockerRegistryConfigAuthenticationTests { { "auths": { "gcr.io": { - "email": "test@gmail.com" + "email": "test@example.com" } }, "credsStore": "desktop", @@ -216,7 +216,7 @@ class DockerRegistryConfigAuthenticationTests { .containsEntry("serveraddress", "https://my-gcr.io") .containsEntry("username", "username") .containsEntry("password", "secret") - .containsEntry("email", "test@gmail.com"); + .containsEntry("email", "test@example.com"); } @WithResource(name = "config.json", content = """ @@ -252,7 +252,7 @@ class DockerRegistryConfigAuthenticationTests { "auths": { "gcr.io": { "auth": "dXNlcm5hbWU6cGFzc3dvcmQ=", - "email": "test@gmail.com" + "email": "test@example.com" } }, "credsStore": "desktop", @@ -273,7 +273,7 @@ class DockerRegistryConfigAuthenticationTests { .containsEntry("serveraddress", "gcr.io") .containsEntry("username", "username") .containsEntry("password", "password") - .containsEntry("email", "test@gmail.com"); + .containsEntry("email", "test@example.com"); assertThat(this.helperExceptions).hasSize(1); assertThat(this.helperExceptions.keySet().iterator().next()) .contains("Error retrieving credentials for 'gcr.io' due to: Failed to obtain credentials for registry"); @@ -352,7 +352,7 @@ class DockerRegistryConfigAuthenticationTests { { "auths": { "https://my-registry.example.com": { - "email": "test@gmail.com" + "email": "test@example.com" } }, "credsStore": "desktop" @@ -375,7 +375,7 @@ class DockerRegistryConfigAuthenticationTests { .containsEntry("serveraddress", "my-registry.example.com") .containsEntry("username", "username") .containsEntry("password", "secret") - .containsEntry("email", "test@gmail.com"); + .containsEntry("email", "test@example.com"); } private String getAuthHeader(ImageReference imageReference) { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/configuration/with-auth/config.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/configuration/with-auth/config.json index 71980fd807..1758c2a022 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/configuration/with-auth/config.json +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/configuration/with-auth/config.json @@ -2,7 +2,7 @@ "auths": { "https://index.docker.io/v1/": { "auth": "dXNlcm5hbWU6AABwYXNzAHdvcmQAAA==", - "email": "test@gmail.com" + "email": "test@example.com" }, "custom-registry.example.com": { "auth": "Y3VzdG9tVXNlcjpjdXN0b21QYXNz"