Skip to content

Commit 48c27a4

Browse files
authored
fix: [DEL-4399]: Increase request timeout (#34810)
1 parent 2e0213d commit 48c27a4

4 files changed

Lines changed: 9 additions & 6 deletions

File tree

260-delegate/src/test/java/software/wings/delegatetasks/jira/JiraTaskTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,8 @@ public void shouldReturnSuccessfulExecutionDataForCreateTicketNG() {
289289
.build();
290290
DelegateResponseData delegateResponseData = spyJiraTask.run(new Object[] {taskParameters});
291291
verify(jiraNGClient).getUsers(taskParameters.getUserQuery(), null, null);
292-
verify(jiraNGClient).createIssue(eq(taskParameters.getProject()), eq(taskParameters.getIssueType()), anyMap(), anyBoolean());
292+
verify(jiraNGClient)
293+
.createIssue(eq(taskParameters.getProject()), eq(taskParameters.getIssueType()), anyMap(), anyBoolean());
293294
assertThat(delegateResponseData).isEqualToComparingFieldByField(jiraExecutionData);
294295
}
295296
@Test

420-delegate-agent/src/main/java/io/harness/managerclient/DelegateAgentManagerClientFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ private OkHttpClient getHttpClient(X509TrustManager trustManager)
128128
.addInterceptor(chain -> FibonacciBackOff.executeForEver(() -> chain.proceed(chain.request())))
129129
// During this call we not just query the task but we also obtain the secret on the manager side
130130
// we need to give enough time for the call to finish.
131-
.readTimeout(2, TimeUnit.MINUTES)
131+
.readTimeout(5, TimeUnit.MINUTES)
132132
.build();
133133
}
134134
}

960-api-services/src/main/java/io/harness/jira/JiraClient.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,8 @@ private List<JiraIssueTypeNG> getProjectStatuses(@NotBlank String projectKey) {
270270
* element has comma itself, it should be wrapped in quotes
271271
* @return the created issue
272272
*/
273-
public JiraIssueNG createIssue(
274-
@NotBlank String projectKey, @NotBlank String issueTypeName, Map<String, String> fields, boolean checkRequiredFields) {
273+
public JiraIssueNG createIssue(@NotBlank String projectKey, @NotBlank String issueTypeName,
274+
Map<String, String> fields, boolean checkRequiredFields) {
275275
JiraIssueCreateMetadataNG createMetadata = getIssueCreateMetadata(projectKey, issueTypeName, null, false, false);
276276
JiraProjectNG project = createMetadata.getProjects().get(projectKey);
277277
if (project == null) {
@@ -289,7 +289,8 @@ public JiraIssueNG createIssue(
289289
String comment = pair.getRight();
290290

291291
// Create issue with all non-comment fields.
292-
JiraCreateIssueRequestNG createIssueRequest = new JiraCreateIssueRequestNG(project, issueType, fields, checkRequiredFields);
292+
JiraCreateIssueRequestNG createIssueRequest =
293+
new JiraCreateIssueRequestNG(project, issueType, fields, checkRequiredFields);
293294
JiraIssueNG issue = executeCall(restClient.createIssue(createIssueRequest), "creating issue");
294295

295296
// Add comment.

970-api-services-beans/src/main/java/io/harness/jira/JiraCreateIssueRequestNG.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
public class JiraCreateIssueRequestNG {
3232
@NotNull Map<String, Object> fields = new HashMap<>();
3333

34-
public JiraCreateIssueRequestNG(JiraProjectNG project, JiraIssueTypeNG issueType, Map<String, String> fields, boolean checkRequiredFields) {
34+
public JiraCreateIssueRequestNG(
35+
JiraProjectNG project, JiraIssueTypeNG issueType, Map<String, String> fields, boolean checkRequiredFields) {
3536
// Add project and issue type fields which are required and are not part of fields. We don't need special handling
3637
// for status field as we manually remove status field from issueType.fields before calling this method.
3738
this.fields.put(JiraConstantsNG.PROJECT_KEY, singletonMap("key", project.getKey()));

0 commit comments

Comments
 (0)