Skip to content

Commit

Permalink
chore(dependencies): Autobump orcaVersion (#994)
Browse files Browse the repository at this point in the history 
* chore(dependencies): Autobump orcaVersion

* fix(prometheus/test): keep up with SpinnakerHttpException message change

from spinnaker/kork#1098 to fix
```
java.lang.AssertionError:
Expecting throwable message:
  "Status: 500, URL: http://localhost:41703/-/healthy, Message: Internal Server Error"
to contain:
  "500 Internal Server Error"
but did not.

Throwable that failed the check:

com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerHttpException: Status: 500, URL: http://localhost:41703/-/healthy, Message: Internal Server Error
	at com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerRetrofitErrorHandler.handleError(SpinnakerRetrofitErrorHandler.java:55)
	at retrofit.RestAdapter$RestHandler.invoke(RestAdapter.java:242)
	at com.sun.proxy.$Proxy71.isHealthy(Unknown Source)
	at com.netflix.kayenta.prometheus.service.PrometheusRemoteServiceTest.lambda$isHealthyReturnsInternalServerError$0(PrometheusRemoteServiceTest.java:88)
	at org.assertj.core.api.ThrowableAssert.catchThrowable(ThrowableAssert.java:62)
	at org.assertj.core.api.AssertionsForClassTypes.catchThrowable(AssertionsForClassTypes.java:877)
	at org.assertj.core.api.Assertions.catchThrowable(Assertions.java:1306)
	at org.assertj.core.api.Assertions.assertThatThrownBy(Assertions.java:1178)
	at com.netflix.kayenta.prometheus.service.PrometheusRemoteServiceTest.isHealthyReturnsInternalServerError(PrometheusRemoteServiceTest.java:88)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
	at org.junit.platform.commons.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:688)
        ...
Caused by: retrofit.RetrofitError: 500 Internal Server Error
	at retrofit.RetrofitError.httpError(RetrofitError.java:40)
	at retrofit.RestAdapter$RestHandler.invokeRequest(RestAdapter.java:388)
	at retrofit.RestAdapter$RestHandler.invoke(RestAdapter.java:240)
	... 90 more

	at com.netflix.kayenta.prometheus.service.PrometheusRemoteServiceTest.isHealthyReturnsInternalServerError(PrometheusRemoteServiceTest.java:91)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
	at org.junit.platform.commons.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:688)
	...
```

---------

Co-authored-by: root <root@ab6a2af8b026>
Co-authored-by: j-sandy <30489233+j-sandy@users.noreply.github.com>
  • Loading branch information
@spinnakerbot @j-sandy
3 people committed Oct 4, 2023
1 parent 0a1502c commit f24744e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
orcaVersion=8.36.0
orcaVersion=8.37.0
org.gradle.parallel=true
spinnakerGradleVersion=8.31.0
targetJava11=true
2 changes: 1 addition & 1 deletion ...eus/src/test/java/com/netflix/kayenta/prometheus/service/PrometheusRemoteServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public void isHealthyReturnsInternalServerError() {

assertThatThrownBy(() -> prometheusRemoteService.isHealthy())
.isInstanceOf(SpinnakerServerException.class)
.hasMessageContaining("500 Internal Server Error");
.hasMessageContaining("Internal Server Error");
}

@Test
Expand Down

0 comments on commit f24744e

Please sign in to comment.