renewed access token and refresh tokens are now updated back in the s…

…ecrets store Signed-off-by: Santhosh Gandhe <[email protected]>
opensearch-project · Jan 13, 2025 · 0c34119 · 0c34119
1 parent aa7ca59
commit 0c34119
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...s/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/AwsSecretsSupplier.java b/...s/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/AwsSecretsSupplier.java
@@ -138,6 +138,8 @@ public String updateValue(String secretId, String keyToUpdate, Object newValueTo
 
         try {
             final PutSecretValueResponse putSecretValueResponse = secretsManagerClient.putSecretValue(putSecretValueRequest);
+            LOG.info("Updated key: {} in the secret {}. New version of the store is {}",
+                    keyToUpdate, secretId, putSecretValueResponse.versionId());
             return putSecretValueResponse.versionId();
         } catch (Exception e) {
             throw new RuntimeException(

diff --git a/...c/main/java/org/opensearch/dataprepper/plugins/source/jira/rest/auth/JiraOauthConfig.java b/...c/main/java/org/opensearch/dataprepper/plugins/source/jira/rest/auth/JiraOauthConfig.java
@@ -118,7 +118,7 @@ public void renewCredentials() {
                 return;
             }
 
-            log.info("Renewing access-refresh token pair for Jira Connector.");
+            log.info("Renewing access token and refresh token pair for Jira Connector.");
             HttpHeaders headers = new HttpHeaders();
             headers.setContentType(MediaType.APPLICATION_JSON);
             String payloadTemplate = "{\"grant_type\": \"%s\", \"client_id\": \"%s\", \"client_secret\": \"%s\", \"refresh_token\": \"%s\"}";
@@ -132,6 +132,9 @@ public void renewCredentials() {
                 this.refreshToken = (String) oauthClientResponse.get(REFRESH_TOKEN);
                 this.expiresInSeconds = (int) oauthClientResponse.get(EXPIRES_IN);
                 this.expireTime = Instant.ofEpochMilli(System.currentTimeMillis() + (expiresInSeconds * 1000L));
+                // updating config object's PluginConfigVariable so that it updates the underlying Secret store
+                jiraSourceConfig.getAuthenticationConfig().getOauth2Config().getRefreshToken().setValue(this.refreshToken);
+                log.info("Access Token and Refresh Token pair is now refreshed. Corresponding Secret store key updated.");
             } catch (HttpClientErrorException ex) {
                 this.expireTime = Instant.ofEpochMilli(0);
                 this.expiresInSeconds = 0;