From 71e207d5496c5033eca3ce68460801a88750c1ba Mon Sep 17 00:00:00 2001
From: Rucha Deshpande <deshruch@amazon.com>
Date: Thu, 12 Nov 2020 16:07:30 -0600
Subject: [PATCH] Bug Fix: Update SSM parameter retrieval
---
.../impl/ServiceAccountJwtAwsClientImpl.java | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
diff --git a/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/impl/ServiceAccountJwtAwsClientImpl.java b/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/impl/ServiceAccountJwtAwsClientImpl.java
index edaf0f28d..21e1efe20 100644
--- a/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/impl/ServiceAccountJwtAwsClientImpl.java
+++ b/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/impl/ServiceAccountJwtAwsClientImpl.java
@@ -101,22 +101,9 @@ public class ServiceAccountJwtAwsClientImpl implements IServiceAccountJwtClient
GetParameterRequest paramRequest = new GetParameterRequest()
.withName(client_credentials_client_id)
.withWithDecryption(true);
- GetParameterResult paramResult = new GetParameterResult();
- paramResult = ssmManager.getParameter(paramRequest);
- List<Parameter> paramsResultList = new ArrayList<>();
- List<String> paramsResultListInvalid = new ArrayList<>();
- paramsResultList = paramResult.getParameters();
- paramsResultListInvalid = paramResult.getInvalidParameters();
-
- if(paramsResultListInvalid.size() >0)
- {
- log.error("Notification Service: SSM did not retrieve all parameters");
- }
- for (Parameter s : paramsResultList) {
- if (s.getName().equalsIgnoreCase(client_credentials_client_id)) {
- client_credentials_clientid = s.getValue();
- }
- }
+ GetParameterResult paramResult = ssmManager.getParameter(paramRequest);
+ Parameter paramsResult = paramResult.getParameter();
+ client_credentials_clientid = paramsResult.getValue();
client_credentials_secret = getSecret(client_secret_secretName,amazonRegion,client_secret_key);
--
GitLab