From a49a9d13d764b1bdb515cd2d60d4e145d1ae980a Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 9 May 2022 12:58:51 -0400 Subject: [PATCH] Fixes config data log constructor. Also, compatibility with framework 6/boot 3 --- .../ConfigServerConfigDataLocationResolver.java | 5 +++-- .../ConfigServerConfigDataLoaderTests.java | 12 ++++++------ ...igServerConfigDataLocationResolverTests.java | 2 +- .../test/resources/encrypt-repo/application.yml | 3 +-- .../resources/encrypt-repo/git/COMMIT_EDITMSG | 2 +- .../src/test/resources/encrypt-repo/git/index | Bin 313 -> 313 bytes .../test/resources/encrypt-repo/git/logs/HEAD | 1 + .../encrypt-repo/git/logs/refs/heads/main | 1 + .../23/b743fe05412cf11975f0817ac8e12a13992dbe | Bin 0 -> 140 bytes .../3c/e2c946ed7061ec24f69061795b557c065d6688 | Bin 0 -> 430 bytes .../fb/1a59a90f034288d14dc4b607f9f76697aa972d | Bin 0 -> 880 bytes .../resources/encrypt-repo/git/refs/heads/main | 2 +- 12 files changed, 15 insertions(+), 13 deletions(-) create mode 100644 spring-cloud-config-server/src/test/resources/encrypt-repo/git/objects/23/b743fe05412cf11975f0817ac8e12a13992dbe create mode 100644 spring-cloud-config-server/src/test/resources/encrypt-repo/git/objects/3c/e2c946ed7061ec24f69061795b557c065d6688 create mode 100644 spring-cloud-config-server/src/test/resources/encrypt-repo/git/objects/fb/1a59a90f034288d14dc4b607f9f76697aa972d diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolver.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolver.java index 434b514f..3bbe16f0 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolver.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolver.java @@ -36,6 +36,7 @@ import org.springframework.boot.context.properties.PropertyMapper; import org.springframework.boot.context.properties.bind.BindHandler; import org.springframework.boot.context.properties.bind.Bindable; import org.springframework.boot.context.properties.bind.Binder; +import org.springframework.boot.logging.DeferredLogFactory; import org.springframework.cloud.client.ServiceInstance; import org.springframework.core.Ordered; import org.springframework.core.log.LogMessage; @@ -55,8 +56,8 @@ public class ConfigServerConfigDataLocationResolver private final Log log; - public ConfigServerConfigDataLocationResolver(Log log) { - this.log = log; + public ConfigServerConfigDataLocationResolver(DeferredLogFactory factory) { + this.log = factory.getLog(ConfigServerConfigDataLocationResolver.class); } @Override diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoaderTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoaderTests.java index 22a2f8b4..050bcfcd 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoaderTests.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoaderTests.java @@ -110,7 +110,7 @@ public class ConfigServerConfigDataLoaderTests { MockitoAnnotations.openMocks(this); environment = new StandardEnvironment(); - loader = new ConfigServerConfigDataLoader(logger); + loader = new ConfigServerConfigDataLoader(destination -> logger); restTemplate = mock(RestTemplate.class); context = mock(ConfigDataLoaderContext.class); bootstrapContext = mock(ConfigurableBootstrapContext.class); @@ -347,7 +347,7 @@ public class ConfigServerConfigDataLoaderTests { properties.setUri(uris); properties.setFailFast(true); properties.setMultipleUriStrategy(ConfigClientProperties.MultipleUriStrategy.ALWAYS); - this.loader = new ConfigServerConfigDataLoader(logger); + this.loader = new ConfigServerConfigDataLoader(destination -> logger); ClientHttpRequestFactory requestFactory = mock(ClientHttpRequestFactory.class); RestTemplate restTemplate = new RestTemplate(requestFactory); when(bootstrapContext.get(RestTemplate.class)).thenReturn(restTemplate); @@ -373,7 +373,7 @@ public class ConfigServerConfigDataLoaderTests { properties.setUri(uris); properties.setFailFast(true); properties.setMultipleUriStrategy(ConfigClientProperties.MultipleUriStrategy.ALWAYS); - this.loader = new ConfigServerConfigDataLoader(logger); + this.loader = new ConfigServerConfigDataLoader(destination -> logger); ClientHttpRequestFactory requestFactory = mock(ClientHttpRequestFactory.class); RestTemplate restTemplate = new RestTemplate(requestFactory); when(bootstrapContext.get(RestTemplate.class)).thenReturn(restTemplate); @@ -404,7 +404,7 @@ public class ConfigServerConfigDataLoaderTests { // Strategy is CONNECTION_TIMEOUT_ONLY, so it should not try the next URI for // INTERNAL_SERVER_ERROR properties.setMultipleUriStrategy(multipleUriStrategy); - this.loader = new ConfigServerConfigDataLoader(logger); + this.loader = new ConfigServerConfigDataLoader(destination -> logger); ClientHttpRequestFactory requestFactory = mock(ClientHttpRequestFactory.class); RestTemplate restTemplate = new RestTemplate(requestFactory); mockRequestResponse(requestFactory, badURI, firstUriResponse); @@ -453,7 +453,7 @@ public class ConfigServerConfigDataLoaderTests { properties.setFailFast(true); // Strategy is ALWAYS, so it should try all URIs until successful properties.setMultipleUriStrategy(multipleUriStrategy); - this.loader = new ConfigServerConfigDataLoader(logger); + this.loader = new ConfigServerConfigDataLoader(destination -> logger); ClientHttpRequestFactory requestFactory = mock(ClientHttpRequestFactory.class); RestTemplate restTemplate = new RestTemplate(requestFactory); mockRequestResponse(requestFactory, badURI, firstUriResponse); @@ -473,7 +473,7 @@ public class ConfigServerConfigDataLoaderTests { properties.setFailFast(true); // Strategy should not matter when the error is connection timed out properties.setMultipleUriStrategy(multipleUriStrategy); - this.loader = new ConfigServerConfigDataLoader(logger); + this.loader = new ConfigServerConfigDataLoader(destination -> logger); ClientHttpRequestFactory requestFactory = mock(ClientHttpRequestFactory.class); RestTemplate restTemplate = new RestTemplate(requestFactory); when(bootstrapContext.get(RestTemplate.class)).thenReturn(restTemplate); diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolverTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolverTests.java index 12d569ea..560034cd 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolverTests.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolverTests.java @@ -51,7 +51,7 @@ public class ConfigServerConfigDataLocationResolverTests { void setup() { this.environment = new MockEnvironment(); this.environmentBinder = Binder.get(this.environment); - this.resolver = new ConfigServerConfigDataLocationResolver(new DeferredLog()); + this.resolver = new ConfigServerConfigDataLocationResolver(destination -> new DeferredLog()); when(context.getBinder()).thenReturn(environmentBinder); } diff --git a/spring-cloud-config-server/src/test/resources/encrypt-repo/application.yml b/spring-cloud-config-server/src/test/resources/encrypt-repo/application.yml index 1d3ce3ac..3ce2c946 100644 --- a/spring-cloud-config-server/src/test/resources/encrypt-repo/application.yml +++ b/spring-cloud-config-server/src/test/resources/encrypt-repo/application.yml @@ -2,8 +2,7 @@ info: foo: bar --- -spring: - profiles: encrypt +spring.config.activate.on-profile: encrypt config: foo: '{cipher}{key:mytestkey}AQCohs2V6P8/UiG6a4TF/CZTCBdt5Q7wvNvcyf6vs2ByK2ZYSM77Nu0sOAduxUpMbVwJ/syecmkIXR+hU3EfT2uqPieA7/v5n33ppqIQ9JAt5JggdYIGe+wX25zU3DTXOOJdAAMzNX+zjOVyCh0QtmJf/kFslg6NqQq0E+kSg3zBi3AnkKj5BLnLIxkjxzKA4mnDXpSm7ekLZZP2iQSYSW/82AC7UOLLzTqwInMI3tJLW1e9Ne+LDsjmSxA+nkK9zhidtXPwb/SPaNF74cJCEf9mgzzKYwJlwqChLzJt8UQ1jHwRc8B6FufmizUHSp27nxdtVB4HMqh3nNsMCy137Ces58T09ZS/y/cYNRxcFbp78MHFHUqAgbC0B/p5t6h4XbQ=' diff --git a/spring-cloud-config-server/src/test/resources/encrypt-repo/git/COMMIT_EDITMSG b/spring-cloud-config-server/src/test/resources/encrypt-repo/git/COMMIT_EDITMSG index 8f9fc884..d2dd8eb6 100644 --- a/spring-cloud-config-server/src/test/resources/encrypt-repo/git/COMMIT_EDITMSG +++ b/spring-cloud-config-server/src/test/resources/encrypt-repo/git/COMMIT_EDITMSG @@ -1 +1 @@ -Added server overrides +changed spring.profiles to spring.config.activate.on-profile diff --git a/spring-cloud-config-server/src/test/resources/encrypt-repo/git/index b/spring-cloud-config-server/src/test/resources/encrypt-repo/git/index index 9f0c4dd3b14525cd65b7a498fc0715fdf503530e..7433c67fd1dae07e05a30877f28b0977d8b6ca83 100644 GIT binary patch delta 218 zcmdnVw3Dgc#WTp6fq{Vuh?$crT|XJM_HBUCK(XVDTs%OkaS2fR1q3s`w|R8Z?QKEg z8Y;*xq5+5TLJhtW{;7?I3ld@->> zM+K$;Mne?>9fh!X;sr+yfOL(U4zRLb6v0e+Mggo;NSB0N0 K{^Pc4+ByJ*gq#wxI zJYF-;t2F#&+)N%dmjdP5+fzCi_!A2Xax#+>OEUBG^eS_6fQrH9gs7#!XsCI8Nait$ zOl;6m0V@bUu?a>)74{=36q$IzQDfKi4ayfU{9593*xY??R@cGTXE*S=F!wHS?%QLl QbZPq(o##0b8A|Ds0dGf5-~a#s diff --git a/spring-cloud-config-server/src/test/resources/encrypt-repo/git/logs/HEAD b/spring-cloud-config-server/src/test/resources/encrypt-repo/git/logs/HEAD index 586c7c7c..3e9272f4 100644 --- a/spring-cloud-config-server/src/test/resources/encrypt-repo/git/logs/HEAD +++ b/spring-cloud-config-server/src/test/resources/encrypt-repo/git/logs/HEAD @@ -8,3 +8,4 @@ ad5e0cb7036ed11ddd4b7be6ed86ad3565c8a3fc bd414a6cc8653d7e282df0a257babc6283b83596 Marcin Grzejszczak 1549357702 +0100 commit: Updated bd414a6cc8653d7e282df0a257babc6283b83596 fd07d827993aaf6ed7ef1b979767ee9277d1d409 Tim Ysewyn 1564492480 +0200 commit: Added server overrides fd07d827993aaf6ed7ef1b979767ee9277d1d409 fd07d827993aaf6ed7ef1b979767ee9277d1d409 Ryan Baxter 1636990355 -0500 checkout: moving from master to main +fd07d827993aaf6ed7ef1b979767ee9277d1d409 fb1a59a90f034288d14dc4b607f9f76697aa972d spencergibb 1652114959 -0400 commit: changed spring.profiles to spring.config.activate.on-profile diff --git a/spring-cloud-config-server/src/test/resources/encrypt-repo/git/logs/refs/heads/main b/spring-cloud-config-server/src/test/resources/encrypt-repo/git/logs/refs/heads/main index 2e83747e..6f970514 100644 --- a/spring-cloud-config-server/src/test/resources/encrypt-repo/git/logs/refs/heads/main +++ b/spring-cloud-config-server/src/test/resources/encrypt-repo/git/logs/refs/heads/main @@ -1 +1,2 @@ 0000000000000000000000000000000000000000 fd07d827993aaf6ed7ef1b979767ee9277d1d409 Ryan Baxter 1636990355 -0500 branch: Created from HEAD +fd07d827993aaf6ed7ef1b979767ee9277d1d409 fb1a59a90f034288d14dc4b607f9f76697aa972d spencergibb 1652114959 -0400 commit: changed spring.profiles to spring.config.activate.on-profile diff --git a/spring-cloud-config-server/src/test/resources/encrypt-repo/git/objects/23/b743fe05412cf11975f0817ac8e12a13992dbe b/spring-cloud-config-server/src/test/resources/encrypt-repo/git/objects/23/b743fe05412cf11975f0817ac8e12a13992dbe new file mode 100644 index 0000000000000000000000000000000000000000..ec25935372b38f71353b83f42c37b552d7d0447c GIT binary patch literal 140 zcmV;70CWF%0V^p=O;s>7HfAt1FfcPQQAjK($jMAjEXmBz)2qzQVX%30((P?Q;v1E3 z6A~+kC^lM;*c3X1XzQj1D5Q;Qka+1!ur_^%;d&r#^CF{fxLYZX%kRAp*j uVp2}3Zc=`JNpVS0VgcCXEj{(P3)P?%(xyX956Tls6-pQa^G4 literal 0 HcmV?d00001 diff --git a/spring-cloud-config-server/src/test/resources/encrypt-repo/git/objects/3c/e2c946ed7061ec24f69061795b557c065d6688 b/spring-cloud-config-server/src/test/resources/encrypt-repo/git/objects/3c/e2c946ed7061ec24f69061795b557c065d6688 new file mode 100644 index 0000000000000000000000000000000000000000..aa83f38c0e7d08d24798f7e363cbf8a933fb44a3 GIT binary patch literal 430 zcmV;f0a5;V0X@viZmK{4fZ?;|Dcp5IEXo~|vlvh+2q*#;-3bgZBEuk~T$;Xno1EnA z{>7g!xi`s7)TBQM=go?l&GM#M&64YbVdnEW(~$?l#e3S|92M`^l%m&_!uJNx$)m~9 z9j;~&r;m|P=HK(5c>78bDdFS$tAgXI9x3eTZ+!#bXv&U1$p@8-(1&~#Lz6Qup`m9~ z@|FJOz0xt4UmdTHJN|MGTt)Goi*66H=MWJ$IrTQzjWDe%D?YMiBy94Kf3^n%fx^8c zEC__Omao}>N_J6XXX^v9eauT!B&@@Dzqd00+{ugC>9#+OM!E25ZRcENcK1T|TEAUv z*eWQ5Nk;;})$S(g4tA`ex((9~h&5ivB&ZcwIhV_UM}BY)J~@>Kh7#=^XA0Zi!mcGy z+xc8V&4aA7?rwE30QMKtrV?c|KJ*C}9Il?Jh^cLCa;+|=X?O1Jd*2$RGuc#){N-)i zA5&GA&1YVtDcS~vSMZS0lP+%EwiK|}xyHB@6a#jW8ZNX;z>Qpb_KrhpCPY!)t+|a_ YP$b4e=ZHk*Qj8P-?;FGX0D~i^F@v7jO8@`> literal 0 HcmV?d00001 diff --git a/spring-cloud-config-server/src/test/resources/encrypt-repo/git/objects/fb/1a59a90f034288d14dc4b607f9f76697aa972d b/spring-cloud-config-server/src/test/resources/encrypt-repo/git/objects/fb/1a59a90f034288d14dc4b607f9f76697aa972d new file mode 100644 index 0000000000000000000000000000000000000000..8c1a36bd3a634352852de026501f4a1cb577a368 GIT binary patch literal 880 zcmV-$1CRW80hLq7vZGcM^qQ}@d)0dcfq*HG%YX<%fha)Q5iW>$2^YlE*IP55*?Hr$ z>#h^}R9B~{ZA%PjddL2OM+gD4O?Y;jLyBW*Ce3MD@dhPiq8aw7sYKH=R273FsBod7x^6zp~&!jMrSM~67h^5XarLayA+N^nIz!PU*PW_ z=yRU_0`!h!Xqpu{5qwZAMG@&weHi}l!J;pwvH%}HN>=s51=zX`yn}v`{Hv?} z*T28`26S8Z5o#vz0Uj9l(>IcQZ@@pOPc#+;AVBFHUa};~N+D%hsj6t%+9%p!l#PA3 zRyoetvQAmKS9DdAT9b1NK~jp^`OUwt>8fwKk~CxVMIP&nU9F8=6})204RV;II3`9p z>YDS_hH)KTf9AX3@r03Xrzz+P^BQSTf{yupsXjNVw0>9#zEp03;0 z?n2p(Q7xWzUw7KTz)sZJtu+w98|2IkA8zi6Oce;%d!Ba3QK{in1%W$vR_VdyQtn$m zb3~TrBz*wrq8_k^p@RxmsopAJzV8OVV*9 zuN`Ka@UW}T=}ds@$|Kqpqdr_#W6Yl-31#JGudX$$(a5%GFGS}{}n@xE% z-Fd0iuXUQkx0~rQ$)~${-61K*q%UYlsl=r@HR^F1W#p7XpyBA^F;O0Rx0NS!XFwfBbo;@;yAX++^%R*WJv6H0(`gI zgG2nAF7>kiuWS+NBkl^Ay%Rr{UGdqEC@&j00gQfADeCgF_>5CrE-{9msQdWUMf?NJ G=X!lw%)W&H literal 0 HcmV?d00001 diff --git a/spring-cloud-config-server/src/test/resources/encrypt-repo/git/refs/heads/main b/spring-cloud-config-server/src/test/resources/encrypt-repo/git/refs/heads/main index 65ee9fbb..e5f44ed1 100644 --- a/spring-cloud-config-server/src/test/resources/encrypt-repo/git/refs/heads/main +++ b/spring-cloud-config-server/src/test/resources/encrypt-repo/git/refs/heads/main @@ -1 +1 @@ -fd07d827993aaf6ed7ef1b979767ee9277d1d409 +fb1a59a90f034288d14dc4b607f9f76697aa972d