Skip to content

Commit 9283806

Browse files
author
github-actions
committed
Google Java Format
1 parent ccc0d21 commit 9283806

File tree

8 files changed

+20
-12
lines changed

8 files changed

+20
-12
lines changed

projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/secrets/service/vault/VaultJobSecretsService.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ public class VaultJobSecretsService implements com.vmware.taurus.secrets.service
3737
// make the kv store configurable as some users might want to use something different than secrets
3838
@Value("${vdk.vault.kvstore:secret}")
3939
String kvStore;
40+
4041
@Value("${vdk.vault.kvstoremeta:secret/metadata/}")
4142
String kvStoreMeta;
43+
4244
public static final String TEAM_OAUTH_CREDENTIALS = "team-oauth-credentials";
4345

4446
@Value("${datajobs.vault.size.limit.bytes}")

projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/JobsService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@ public JobOperationResult createJob(DataJob jobInfo) {
121121
if (isInvocationSuccessful(resultHolder)) {
122122
// Save the data job and update the job info metrics
123123
if (jobInfo.getJobConfig().isGenerateKeytab()) {
124-
credentialsService.createJobCredentials(jobInfo.getName(), jobInfo.getJobConfig().getTeam());
124+
credentialsService.createJobCredentials(
125+
jobInfo.getName(), jobInfo.getJobConfig().getTeam());
125126
}
126127
var dataJob = jobsRepository.save(jobInfo);
127128
dataJobMetrics.updateInfoGauges(dataJob);

projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/KubernetesService.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1437,7 +1437,10 @@ public static V1Container container(
14371437
new V1EnvFromSource()
14381438
.secretRef(new V1SecretEnvSource().name("builder-secrets").optional(true)),
14391439
new V1EnvFromSource()
1440-
.secretRef(new V1SecretEnvSource().name(getTeamOAuthSecretName(teamName)).optional(true)))
1440+
.secretRef(
1441+
new V1SecretEnvSource()
1442+
.name(getTeamOAuthSecretName(teamName))
1443+
.optional(true)))
14411444
.withEnv(
14421445
envs.entrySet().stream()
14431446
.map(KubernetesService::envVar)

projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/credentials/JobCredentialsService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ public void createJobCredentials(String jobName, String teamName) {
102102
teamCredentials.setClientSecret(createOAuthAppWebHookResult.getClientSecret());
103103
} else {
104104
log.warn(
105-
"Unable to process the result from the CreateOAuth webhook and cannot create team credentials for team: "
105+
"Unable to process the result from the CreateOAuth webhook and cannot create team"
106+
+ " credentials for team: "
106107
+ teamName);
107108
}
108109
}

projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/webhook/WebHookResult.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ public class WebHookResult {
2121
private final boolean success;
2222

2323
public WebHookResult(HttpStatus status, String message, boolean success) {
24-
this.status = status;
25-
this.message = message;
26-
this.success = success;
24+
this.status = status;
25+
this.message = message;
26+
this.success = success;
2727
}
2828
}

projects/control-service/projects/pipelines_control_service/src/test/java/com/vmware/taurus/authorization/AuthorizationInterceptorTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.mockito.InjectMocks;
2222
import org.mockito.Mock;
2323
import org.mockito.Mockito;
24-
import org.mockito.MockitoAnnotations;
2524
import org.mockito.junit.jupiter.MockitoExtension;
2625
import org.mockito.junit.jupiter.MockitoSettings;
2726
import org.mockito.quality.Strictness;
@@ -245,7 +244,8 @@ void testPreHandle_OAuthApplicationToken_Success() throws IOException {
245244

246245
Mockito.when(authorizationProvider.getJobTeam(request)).thenReturn("testTeam");
247246

248-
VaultTeamCredentials mockCredentials = new VaultTeamCredentials("testTeam","testClientId","testSecret");
247+
VaultTeamCredentials mockCredentials =
248+
new VaultTeamCredentials("testTeam", "testClientId", "testSecret");
249249
Mockito.when(secretsService.readTeamOauthCredentials("testTeam")).thenReturn(mockCredentials);
250250
SecurityContextHolder.setContext(securityContext);
251251

@@ -268,7 +268,8 @@ void testPreHandle_OAuthApplicationToken_Failure() throws IOException {
268268

269269
Mockito.when(authorizationProvider.getJobTeam(request)).thenReturn("testTeam");
270270

271-
VaultTeamCredentials mockCredentials = new VaultTeamCredentials("differentTeam","testClientId","testSecret");
271+
VaultTeamCredentials mockCredentials =
272+
new VaultTeamCredentials("differentTeam", "testClientId", "testSecret");
272273
Mockito.when(secretsService.readTeamOauthCredentials("testTeam")).thenReturn(mockCredentials);
273274
SecurityContextHolder.setContext(securityContext);
274275

projects/control-service/projects/pipelines_control_service/src/test/java/com/vmware/taurus/secrets/vault/VaultJobSecretsServiceTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import com.fasterxml.jackson.core.JsonProcessingException;
99
import com.vmware.taurus.ControlplaneApplication;
10-
import com.vmware.taurus.authorization.webhook.AuthorizationBody;
1110
import com.vmware.taurus.exception.DataJobSecretsException;
1211
import com.vmware.taurus.exception.DataJobSecretsSizeLimitException;
1312
import com.vmware.taurus.exception.DataJobTeamSecretsException;
@@ -68,7 +67,6 @@ public void setUp() {
6867
ReflectionTestUtils.setField(secretsService, "kvStoreMeta", "secret/metadata/");
6968
}
7069

71-
7270
@Test
7371
void testUpdateJobSecrets() throws JsonProcessingException {
7472
String jobName = "testJob";

projects/control-service/projects/pipelines_control_service/src/test/java/com/vmware/taurus/service/graphql/GraphQLDataFetchersTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,9 @@ private Set<FieldStrategy<V2DataJob>> collectSupportedFieldStrategies() {
547547
strategies.add(new JobFieldStrategyByName());
548548
strategies.add(new JobFieldStrategyByNextRun());
549549
strategies.add(new JobFieldStrategyByScheduleCron());
550-
strategies.add(new JobFieldStrategyBySourceUrl("gitlab.com/demo-data-jobs.git", "main", "/tree/%s/%s",true));
550+
strategies.add(
551+
new JobFieldStrategyBySourceUrl(
552+
"gitlab.com/demo-data-jobs.git", "main", "/tree/%s/%s", true));
551553
strategies.add(new JobFieldStrategyByTeam());
552554
strategies.add(new JobFieldStrategyByLastExecutionStatus());
553555
strategies.add(new JobFieldStrategyByLastExecutionTime());

0 commit comments

Comments
 (0)