Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Stéphane Nicoll
2025-05-02 15:37:47 +02:00
parent 3a51197082
commit 05e4262a25
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/configuration/DockerConfigurationMetadataTests.java
View File

@@ -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");

20
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/configuration/DockerRegistryConfigAuthenticationTests.java
View File

@@ -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) {

2
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/configuration/with-auth/config.json
View File

@@ -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"