Schedules support UseKubernetesSecretsForDbCredentials flag

resolves #3985

Author: cppwfs

spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/service/impl/DefaultSchedulerService.java

@@ -164,8 +164,9 @@ public void schedule(String scheduleName, String taskDefinitionName, Map<String,
 		}
 		Assert.notNull(appRegistration, "Unknown task app: " + taskDefinition.getRegisteredAppName());
 		Resource metadataResource = this.registry.getAppMetadataResource(appRegistration);
-
-		taskDefinition = TaskServiceUtils.updateTaskProperties(taskDefinition, this.dataSourceProperties);
+		Launcher launcher = getTaskLauncher(platformName);
+		taskDefinition = TaskServiceUtils.updateTaskProperties(taskDefinition, this.dataSourceProperties,
+				TaskServiceUtils.addDatabaseCredentials(this.taskConfigurationProperties.isUseKubernetesSecretsForDbCredentials(), launcher.getType()));
 
 		Map<String, String> appDeploymentProperties = new HashMap<>(commonApplicationProperties.getTask());
 		appDeploymentProperties.putAll(
@@ -181,7 +182,6 @@ public void schedule(String scheduleName, String taskDefinitionName, Map<String,
 		DeploymentPropertiesUtils.validateDeploymentProperties(taskDeploymentProperties);
 		taskDeploymentProperties = extractAndQualifySchedulerProperties(taskDeploymentProperties);
 
-		Launcher launcher = getTaskLauncher(platformName);
 		scheduleName = validateScheduleNameForPlatform(launcher.getType(), scheduleName);
 
 		ScheduleRequest scheduleRequest = new ScheduleRequest(revisedDefinition, taskDeploymentProperties,
@@ -406,4 +406,5 @@ protected Resource getTaskResource(String taskDefinitionName) {
 		Assert.notNull(appRegistration, "Unknown task app: " + taskDefinition.getRegisteredAppName());
 		return this.registry.getAppResource(appRegistration);
 	}
+
 }

spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskExecutionService.java

@@ -331,15 +331,17 @@ private TaskExecutionInformation findOrCreateTaskExecutionInformation(String tas
 		TaskExecutionInformation taskExecutionInformation;
 		try {
 			 taskExecutionInformation = taskExecutionInfoService
-					.findTaskExecutionInformation(taskName, taskDeploymentProperties, addDatabaseCredentials(platform));
+					.findTaskExecutionInformation(taskName, taskDeploymentProperties,
+							TaskServiceUtils.addDatabaseCredentials(this.taskConfigurationProperties.isUseKubernetesSecretsForDbCredentials(), platform));
 
 		} catch (NoSuchTaskDefinitionException e) {
 			if (autoCreateTaskDefinitions) {
 				logger.info("Creating a Task Definition {} for registered app name {}", taskName, taskName);
 				TaskDefinition taskDefinition = new TaskDefinition(taskName, taskName);
 				taskSaveService.saveTaskDefinition(taskDefinition);
 				taskExecutionInformation = taskExecutionInfoService
-						.findTaskExecutionInformation(taskName, taskDeploymentProperties, addDatabaseCredentials(platform));
+						.findTaskExecutionInformation(taskName, taskDeploymentProperties,
+								TaskServiceUtils.addDatabaseCredentials(this.taskConfigurationProperties.isUseKubernetesSecretsForDbCredentials(), platform));
 			}
 			else {
 				throw e;
@@ -348,14 +350,6 @@ private TaskExecutionInformation findOrCreateTaskExecutionInformation(String tas
 		return taskExecutionInformation;
 	}
 
-	private boolean addDatabaseCredentials(String platform) {
-		boolean addDatabaseCredentials = false;
-		if(!this.taskConfigurationProperties.isUseKubernetesSecretsForDbCredentials() ||
-				!StringUtils.hasText(platform) || !platform.equals(TaskPlatformFactory.KUBERNETES_PLATFORM_TYPE)) {
-			addDatabaseCredentials = true;
-		}
-		return addDatabaseCredentials;
-	}
 	/**
 	 * Determines if an OAuth token is available and if so, sets it as a deployment property.
 	 *

spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/service/impl/TaskServiceUtils.java

@@ -24,6 +24,7 @@
 
 import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
 import org.springframework.cloud.dataflow.core.TaskDefinition;
+import org.springframework.cloud.dataflow.core.TaskPlatformFactory;
 import org.springframework.cloud.dataflow.core.dsl.TaskApp;
 import org.springframework.cloud.dataflow.core.dsl.TaskNode;
 import org.springframework.cloud.dataflow.core.dsl.TaskParser;
@@ -98,16 +99,6 @@ public static Map<String, String> establishComposedTaskProperties(
 		return taskDeploymentProperties;
 	}
 
-	/**
-	 * Updates the task definition with the datasource properties.
-	 * @param taskDefinition the {@link TaskDefinition} to be updated.
-	 * @param dataSourceProperties the dataSource properties used by SCDF.
-	 * @return the updated {@link TaskDefinition}
-	 */
-	public static TaskDefinition updateTaskProperties(TaskDefinition taskDefinition,
-			DataSourceProperties dataSourceProperties) {
-		return updateTaskProperties(taskDefinition, dataSourceProperties, true);
-	}
 	/**
 	 * Updates the task definition with the datasource properties.
 	 * @param taskDefinition the {@link TaskDefinition} to be updated.
@@ -245,4 +236,19 @@ private static boolean isPropertyPresent(String property, TaskDefinition taskDef
 		}
 		return result;
 	}
+
+	/**
+	 * Determines if a database credentials should be added to task properties.
+	 * @param platformType The type of platform.
+	 * @param useKubernetesSecrets User wants to use kubernetes secrets for user name and password.
+	 * @return true if database credentials should be added to task properties.
+	 */
+	public static boolean addDatabaseCredentials(boolean useKubernetesSecrets, String platformType) {
+		boolean addDatabaseCredentials = false;
+		if(!useKubernetesSecrets ||
+				!StringUtils.hasText(platformType) || !platformType.equals(TaskPlatformFactory.KUBERNETES_PLATFORM_TYPE)) {
+			addDatabaseCredentials = true;
+		}
+		return addDatabaseCredentials;
+	}
 }

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

@@ -95,12 +95,19 @@ public void testDatabasePropUpdate() {
 		DataSourceProperties dataSourceProperties = getDataSourceProperties();
 		TaskDefinition definition = TaskServiceUtils.updateTaskProperties(
 				taskDefinition,
-				dataSourceProperties);
-
+				dataSourceProperties, true);
+		assertThat(definition.getProperties().size()).isEqualTo(5);
 		assertThat(definition.getProperties().get("spring.datasource.url")).isEqualTo("myUrl");
 		assertThat(definition.getProperties().get("spring.datasource.driverClassName")).isEqualTo("myDriver");
 		assertThat(definition.getProperties().get("spring.datasource.username")).isEqualTo("myUser");
 		assertThat(definition.getProperties().get("spring.datasource.password")).isEqualTo("myPassword");
+
+		definition = TaskServiceUtils.updateTaskProperties(
+				taskDefinition,
+				dataSourceProperties, false);
+		assertThat(definition.getProperties().size()).isEqualTo(3);
+		assertThat(definition.getProperties().get("spring.datasource.url")).isEqualTo("myUrl");
+		assertThat(definition.getProperties().get("spring.datasource.driverClassName")).isEqualTo("myDriver");
 	}
 
 	@Test
@@ -235,7 +242,6 @@ public void testDataFlowUriProperty() throws Exception {
 		assertTrue(!appDeploymentProperties.containsKey("DATAFLOW-SERVER-URI"));
 	}
 
-
 	private TaskNode parse(String dsltext) {
 		TaskNode ctn = new TaskParser("test", dsltext, true, true).parse();
 		return ctn;