Skip to content

Commit 05e4262

Browse files
committed
Polish
1 parent 3a51197 commit 05e4262

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ void configWithAuthIsRead() throws Exception {
126126
assertThat(configuration.getAuths()).hasSize(3).hasEntrySatisfying("https://index.docker.io/v1/", (auth) -> {
127127
assertThat(auth.getUsername()).isEqualTo("username");
128128
assertThat(auth.getPassword()).isEqualTo("pass\u0000word");
129-
assertThat(auth.getEmail()).isEqualTo("test@gmail.com");
129+
assertThat(auth.getEmail()).isEqualTo("test@example.com");
130130
}).hasEntrySatisfying("custom-registry.example.com", (auth) -> {
131131
assertThat(auth.getUsername()).isEqualTo("customUser");
132132
assertThat(auth.getPassword()).isEqualTo("customPass");

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void cleanup() {
6868
"auths": {
6969
"https://index.docker.io/v1/": {
7070
"auth": "dXNlcm5hbWU6cGFzc3dvcmQ=",
71-
"email": "test@gmail.com"
71+
"email": "test@example.com"
7272
}
7373
}
7474
}
@@ -82,15 +82,15 @@ void getAuthHeaderWhenAuthForDockerDomain(@ResourcesRoot Path directory) throws
8282
.containsEntry("serveraddress", "https://index.docker.io/v1/")
8383
.containsEntry("username", "username")
8484
.containsEntry("password", "password")
85-
.containsEntry("email", "test@gmail.com");
85+
.containsEntry("email", "test@example.com");
8686
}
8787

8888
@WithResource(name = "config.json", content = """
8989
{
9090
"auths": {
9191
"https://index.docker.io/v1/": {
9292
"auth": "dXNlcm5hbWU6cGFzc3dvcmQ=",
93-
"email": "test@gmail.com"
93+
"email": "test@example.com"
9494
}
9595
}
9696
}
@@ -104,7 +104,7 @@ void getAuthHeaderWhenAuthForLegacyDockerDomain(@ResourcesRoot Path directory) t
104104
.containsEntry("serveraddress", "https://index.docker.io/v1/")
105105
.containsEntry("username", "username")
106106
.containsEntry("password", "password")
107-
.containsEntry("email", "test@gmail.com");
107+
.containsEntry("email", "test@example.com");
108108
}
109109

110110
@WithResource(name = "config.json", content = """
@@ -190,7 +190,7 @@ void getAuthHeaderWhenUsingHelperFromCredsStore(@ResourcesRoot Path directory) t
190190
{
191191
"auths": {
192192
"gcr.io": {
193-
"email": "test@gmail.com"
193+
"email": "test@example.com"
194194
}
195195
},
196196
"credsStore": "desktop",
@@ -216,7 +216,7 @@ void getAuthHeaderWhenUsingHelperFromCredsStoreAndUseEmailFromAuth(@ResourcesRoo
216216
.containsEntry("serveraddress", "https://my-gcr.io")
217217
.containsEntry("username", "username")
218218
.containsEntry("password", "secret")
219-
.containsEntry("email", "test@gmail.com");
219+
.containsEntry("email", "test@example.com");
220220
}
221221

222222
@WithResource(name = "config.json", content = """
@@ -252,7 +252,7 @@ void getAuthHeaderWhenUsingHelperFromCredHelpersUsesProvidedServerUrl(@Resources
252252
"auths": {
253253
"gcr.io": {
254254
"auth": "dXNlcm5hbWU6cGFzc3dvcmQ=",
255-
"email": "test@gmail.com"
255+
"email": "test@example.com"
256256
}
257257
},
258258
"credsStore": "desktop",
@@ -273,7 +273,7 @@ void getAuthHeaderWhenUsingHelperThatFailsLogsErrorAndReturnsFromAuths(@Resource
273273
.containsEntry("serveraddress", "gcr.io")
274274
.containsEntry("username", "username")
275275
.containsEntry("password", "password")
276-
.containsEntry("email", "test@gmail.com");
276+
.containsEntry("email", "test@example.com");
277277
assertThat(this.helperExceptions).hasSize(1);
278278
assertThat(this.helperExceptions.keySet().iterator().next())
279279
.contains("Error retrieving credentials for 'gcr.io' due to: Failed to obtain credentials for registry");
@@ -352,7 +352,7 @@ void getAuthHeaderReturnsFallbackWhenImageReferenceNull(@ResourcesRoot Path dire
352352
{
353353
"auths": {
354354
"https://my-registry.example.com": {
355-
"email": "test@gmail.com"
355+
"email": "test@example.com"
356356
}
357357
},
358358
"credsStore": "desktop"
@@ -375,7 +375,7 @@ void getAuthHeaderWhenUsingHelperFromCredHelpersUsesImageReferenceServerUrlAsFal
375375
.containsEntry("serveraddress", "my-registry.example.com")
376376
.containsEntry("username", "username")
377377
.containsEntry("password", "secret")
378-
.containsEntry("email", "test@gmail.com");
378+
.containsEntry("email", "test@example.com");
379379
}
380380

381381
private String getAuthHeader(ImageReference imageReference) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"auths": {
33
"https://index.docker.io/v1/": {
44
"auth": "dXNlcm5hbWU6AABwYXNzAHdvcmQAAA==",
5-
"email": "test@gmail.com"
5+
"email": "test@example.com"
66
},
77
"custom-registry.example.com": {
88
"auth": "Y3VzdG9tVXNlcjpjdXN0b21QYXNz"

0 commit comments

Comments
 (0)