Add actuator props to stream on deployment (#5141)

* Add actuator props to stream on deployment

Fixes #4753

Author: onobc

spring-cloud-dataflow-server-core/src/main/resources/META-INF/application-stream-common-properties-defaults.yml

@@ -11,6 +11,10 @@ common:
 
         # Tags required to use the Wavefront Spring Boot tile.
         application: ${spring.cloud.dataflow.stream.name:unknown}-${spring.cloud.dataflow.stream.app.label:unknown}-${spring.cloud.dataflow.stream.app.type:unknown}
+    endpoints:
+      web:
+        exposure:
+          include: health,info,bindings
 
   # Properties required for Wavefront Tracing.
   wavefront.application.name: ${spring.cloud.dataflow.stream.name:unknown}
@@ -30,4 +34,3 @@ cloudfoundry:
         space.name: ${vcap.application.space_name:unknown}
         application.id: ${vcap.application.application_id:unknown}
         application.version: ${vcap.application.application_version:unknown}
-

spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/service/impl/DefaultStreamServiceIntegrationTests.java

@@ -24,6 +24,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.assertj.core.api.InstanceOfAssertFactories;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -295,6 +296,43 @@ public void testUpdateStreamDslOnRollback() throws IOException {
 				.isEqualTo("time --trigger.fixed-delay=100 | log --log.level=DEBUG");
 	}
 
+	@Test
+	public void testDeployHasActuatorProps() throws IOException {
+
+		when(skipperClient.status(eq("ticktock"))).thenThrow(new ReleaseNotFoundException(""));
+
+		Map<String, String> deploymentProperties = createSkipperDeploymentProperties();
+		streamService.deployStream("ticktock", deploymentProperties);
+
+		ArgumentCaptor<UploadRequest> uploadRequestCaptor = ArgumentCaptor.forClass(UploadRequest.class);
+		verify(skipperClient).upload(uploadRequestCaptor.capture());
+
+		Package pkg = SkipperPackageUtils.loadPackageFromBytes(uploadRequestCaptor);
+
+		// ExpectedYaml will have version: 1.2.0.RELEASE and not 1.1.1.RELEASE
+		Package logPackage = null;
+		for (Package subpkg : pkg.getDependencies()) {
+			if (subpkg.getMetadata().getName().equals("log")) {
+				logPackage = subpkg;
+			}
+		}
+		assertThat(logPackage).isNotNull();
+		String actualYaml = logPackage.getConfigValues().getRaw();
+
+		DumperOptions dumperOptions = new DumperOptions();
+		dumperOptions.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
+		dumperOptions.setPrettyFlow(true);
+		Yaml yaml = new Yaml(new SafeConstructor(), new Representer(dumperOptions), dumperOptions);
+
+		Object actualYamlLoaded = yaml.load(actualYaml);
+
+		assertThat(actualYamlLoaded).isInstanceOf(Map.class)
+				.asInstanceOf(InstanceOfAssertFactories.MAP)
+				.extractingByKey("spec", InstanceOfAssertFactories.MAP)
+				.extractingByKey("applicationProperties", InstanceOfAssertFactories.MAP)
+				.containsEntry("management.endpoints.web.exposure.include", "health,info,bindings");
+	}
+
 	@Test
 	public void testStreamInfo() throws IOException {
 

spring-cloud-dataflow-server-core/src/test/resources/org/springframework/cloud/dataflow/server/service/impl/DefaultStreamServiceIntegrationTests-install.yml

@@ -3,6 +3,7 @@
 "spec":
   "resource": "maven://org.springframework.cloud.stream.app:log-sink-rabbit:jar"
   "applicationProperties":
+    "management.endpoints.web.exposure.include": "health,info,bindings"
     "spring.cloud.dataflow.stream.app.label": "log"
     "spring.cloud.dataflow.stream.name": "ticktock"
     "spring.cloud.dataflow.stream.app.type": "sink"