Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jira source #14

Closed
wants to merge 2 commits into from
Closed

Jira source #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
206aa4a
Merge pull request #5 from san81/jira-source
Galactus22625 Nov 1, 2024
7076025
fix merge issues
Galactus22625 Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ira-source/src/main/java/org/opensearch/dataprepper/plugins/source/jira/JiraItemInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import java.util.UUID;
import java.util.regex.Pattern;

import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.CONTENT_TYPE;
import static org.opensearch.dataprepper.plugins.source.jira.JiraService.CONTENT_TYPE;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.CREATED;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.ISSUE_KEY;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.KEY;
Expand Down
27 changes: 0 additions & 27 deletions ...jira-source/src/main/java/org/opensearch/dataprepper/plugins/source/jira/JiraService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,38 +25,11 @@
import java.util.regex.Pattern;
import java.util.stream.Collectors;

import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.CREATED;
import static org.opensearch.dataprepper.logging.DataPrepperMarkers.NOISY;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.AUTHORIZATION_ERROR_CODE;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.BAD_REQUEST_EXCEPTION;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.CLOSING_ROUND_BRACKET;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.CONTENT_TYPE;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.DELIMITER;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.EXPAND_FIELD;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.EXPAND_VALUE;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.FIFTY;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.GREATER_THAN_EQUALS;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.ISSUE_KEY;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.KEY;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.LIVE;

import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.NAME;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.MAX_RESULT;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.OAUTH2;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.PREFIX;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.PROJECT;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.PROJECT_KEY;

import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.PROJECT_NAME;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.RATE_LIMIT;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.REST_API_FETCH_ISSUE;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.REST_API_SEARCH;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.RETRY_ATTEMPT;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.RETRY_ATTEMPT_SLEEP_TIME;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.START_AT;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.STATUS_IN;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.SUFFIX;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.TOKEN_EXPIRED;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.UPDATED;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants._PROJECT;
import static org.opensearch.dataprepper.plugins.source.jira.utils.JqlConstants.CLOSING_ROUND_BRACKET;
Expand Down
88 changes: 3 additions & 85 deletions ...-source/src/test/java/org/opensearch/dataprepper/plugins/source/jira/JiraServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
Expand Down Expand Up @@ -112,6 +113,8 @@ void testJiraServiceInitialization() throws JsonProcessingException {
JiraSourceConfig jiraSourceConfig = createJiraConfiguration(BASIC, issueType, issueStatus, projectKey);
JiraService jiraService = new JiraService(jiraSourceConfig, jiraRestClient);
assertNotNull(jiraService);
when(jiraRestClient.getIssue(anyString())).thenReturn("test String");
assertNotNull(jiraService.getIssue("test Key"));
}

@Test
Expand Down Expand Up @@ -208,91 +211,6 @@ public void testGetJiraEntitiesException() throws JsonProcessingException {
}


@Test
public void testGetAllIssuesBasic() throws JsonProcessingException {
List<String> issueType = new ArrayList<>();
List<String> issueStatus = new ArrayList<>();
List<String> projectKey = new ArrayList<>();
issueType.add("Task");
JiraSourceConfig jiraSourceConfig = createJiraConfiguration(BASIC, issueType, issueStatus, projectKey);
JiraService jiraService = new JiraService(restTemplate, jiraSourceConfig, authConfig);
SearchResults mockSearchResults = mock(SearchResults.class);
doReturn(new ResponseEntity<>(mockSearchResults, HttpStatus.OK)).when(restTemplate).getForEntity(any(URI.class), any(Class.class));
SearchResults results = jiraService.getAllIssues(jql, 0, jiraSourceConfig);
assertNotNull(results);
}

@Test
public void testGetAllIssuesOauth2() throws JsonProcessingException {
List<String> issueType = new ArrayList<>();
List<String> issueStatus = new ArrayList<>();
List<String> projectKey = new ArrayList<>();
issueType.add("Task");
JiraSourceConfig jiraSourceConfig = createJiraConfiguration(OAUTH2, issueType, issueStatus, projectKey);
JiraService jiraService = new JiraService(restTemplate, jiraSourceConfig, authConfig);
SearchResults mockSearchResults = mock(SearchResults.class);
doReturn("http://mock-service.jira.com").when(authConfig).getUrl();
doReturn(new ResponseEntity<>(mockSearchResults, HttpStatus.OK)).when(restTemplate).getForEntity(any(URI.class), any(Class.class));
SearchResults results = jiraService.getAllIssues(jql, 0, jiraSourceConfig);
assertNotNull(results);
}

private JiraSourceConfig createJiraConfiguration(String auth_type, List<String> issueType, List<String> issueStatus, List<String> projectKey) throws JsonProcessingException {
ObjectMapper objectMapper = new ObjectMapper();
Map<String, String> connectorCredentialsMap = new HashMap<>();
connectorCredentialsMap.put("auth_type", auth_type);

Map<String, Object> jiraSourceConfigMap = new HashMap<>();
jiraSourceConfigMap.put("account_url", ACCESSIBLE_RESOURCES);
jiraSourceConfigMap.put("connector_credentials", connectorCredentialsMap);
jiraSourceConfigMap.put("issue_types", issueType);
jiraSourceConfigMap.put("statuses", issueStatus);
jiraSourceConfigMap.put("projects", projectKey);


String jiraSourceConfigJsonString = objectMapper.writeValueAsString(jiraSourceConfigMap);
return objectMapper.readValue(jiraSourceConfigJsonString, JiraSourceConfig.class);
}

@Test
void testInvokeRestApiTokenExpiredInterruptException() throws JsonProcessingException, InterruptedException {
List<String> issueType = new ArrayList<>();
List<String> issueStatus = new ArrayList<>();
List<String> projectKey = new ArrayList<>();
JiraSourceConfig jiraSourceConfig = createJiraConfiguration(BASIC, issueType, issueStatus, projectKey);
JiraService jiraService = new JiraService(restTemplate, jiraSourceConfig, authConfig);
when(authConfig.getUrl()).thenReturn("https://example.com/rest/api/2/issue/key");
when(restTemplate.getForEntity(any(URI.class), any(Class.class))).thenThrow(new HttpClientErrorException(HttpStatus.TOO_MANY_REQUESTS));
jiraService.setSleepTimeMultiplier(100000);

Thread testThread = new Thread(() -> {
assertThrows(InterruptedException.class, () -> {
try {
jiraService.getIssue("key");
} catch (Exception e) {
throw new RuntimeException(e);
}
});
});
testThread.start();
Thread.sleep(100);
testThread.interrupt();
}

@ParameterizedTest
@MethodSource("provideHttpStatusCodesWithExceptionClass")
void testInvokeRestApiTokenExpired(HttpStatus statusCode, Class expectedExceptionType) throws JsonProcessingException {
List<String> issueType = new ArrayList<>();
List<String> issueStatus = new ArrayList<>();
List<String> projectKey = new ArrayList<>();
JiraSourceConfig jiraSourceConfig = createJiraConfiguration(BASIC, issueType, issueStatus, projectKey);
JiraService jiraService = new JiraService(restTemplate, jiraSourceConfig, authConfig);
jiraService.setSleepTimeMultiplier(1);
when(authConfig.getUrl()).thenReturn("https://example.com/rest/api/2/issue/key");
when(restTemplate.getForEntity(any(URI.class), any(Class.class))).thenThrow(new HttpClientErrorException(statusCode));
assertThrows(expectedExceptionType, () -> jiraService.getIssue("key"));
}

private IssueBean createIssueBean(boolean nullFields, boolean createdNull) {
IssueBean issue1 = new IssueBean();
issue1.setId(UUID.randomUUID().toString());
Expand Down
2 changes: 1 addition & 1 deletion ...a-source/src/test/java/org/opensearch/dataprepper/plugins/source/jira/JiraSourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.ACCESSIBLE_RESOURCES;
import static org.opensearch.dataprepper.plugins.source.jira.rest.auth.JiraOauthConfig.ACCESSIBLE_RESOURCES;
import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.BASIC;

@ExtendWith(MockitoExtension.class)
Expand Down
Loading