Skip to content

Commit

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

* fix(expressions/test): keep up with SpinnakerRequestInterceptor constructor change

The default value of propagateSpinnakerHeaders in OkHttpClientConfigurationProperties is
true, so pass true directly.

---------

Co-authored-by: root <root@91023be377be>
Co-authored-by: David Byron <[email protected]>
  • Loading branch information
3 people authored Feb 22, 2024
1 parent f5fa468 commit 3cc1b25
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
fiatVersion=1.43.0
korkVersion=7.214.0
korkVersion=7.215.0
kotlinVersion=1.5.32
org.gradle.parallel=true
org.gradle.jvmargs=-Xmx6g
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public OkHttpClient.Builder get(@NotNull ServiceEndpoint service) {

ObjectMapper objectMapper = new ObjectMapper();
RestAdapter.LogLevel logLevel = RestAdapter.LogLevel.FULL;
RequestInterceptor requestInterceptor = new SpinnakerRequestInterceptor(null);
RequestInterceptor requestInterceptor = new SpinnakerRequestInterceptor(true);

this.clouddriverRetrofitBuilder =
new CloudDriverConfiguration.ClouddriverRetrofitBuilder(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import com.netflix.spectator.api.NoopRegistry;
import com.netflix.spinnaker.config.DeploymentMonitorDefinition;
import com.netflix.spinnaker.kork.test.log.MemoryAppender;
import com.netflix.spinnaker.okhttp.OkHttpClientConfigurationProperties;
import com.netflix.spinnaker.okhttp.SpinnakerRequestInterceptor;
import com.netflix.spinnaker.orca.api.pipeline.TaskResult;
import com.netflix.spinnaker.orca.api.pipeline.models.ExecutionStatus;
Expand Down Expand Up @@ -119,7 +118,7 @@ void setup(TestInfo testInfo) {
new DeploymentMonitorServiceProvider(
okClient,
retrofitLogLevel,
new SpinnakerRequestInterceptor(new OkHttpClientConfigurationProperties()),
new SpinnakerRequestInterceptor(true),
deploymentMonitorDefinitions);
evaluateDeploymentHealthTask =
new EvaluateDeploymentHealthTask(deploymentMonitorServiceProvider, new NoopRegistry());
Expand Down

0 comments on commit 3cc1b25

Please sign in to comment.