Merge branch 'aws-integration-bios-useragent' into 'master'

adding useragent changes

See merge request !351

provider/register-aws/src/main/java/org/opengroup/osdu/register/provider/aws/subscriber/KmsConfig.java

@@ -13,10 +13,12 @@
 // limitations under the License.
 package org.opengroup.osdu.register.provider.aws.subscriber;
 
+import com.amazonaws.ClientConfiguration;
 import com.amazonaws.auth.AWSCredentialsProvider;
 import com.amazonaws.client.builder.AwsClientBuilder;
 import com.amazonaws.services.kms.AWSKMS;
 import com.amazonaws.services.kms.AWSKMSClientBuilder;
+import org.opengroup.osdu.core.aws.configurationsetup.ConfigSetup;
 import org.opengroup.osdu.core.aws.iam.IAMConfig;
 
 //This class should be moved to os-core-lib-aws. Keeping it here temporarily till testing is complete
@@ -39,6 +41,7 @@ public class KmsConfig {
         return AWSKMSClientBuilder.standard()
                 .withCredentials(amazonAWSCredentials)
                 .withEndpointConfiguration(amazonKmsEndpointConfiguration())
+                .withClientConfiguration(ConfigSetup.setUpConfig())
                 .build();
     }
 

provider/register-aws/src/main/resources/application.properties

@@ -35,6 +35,8 @@ aws.ssm=${SSM_ENABLED:True}
 #aws.register.sns.topic.arn=${aws.parameter.prefix}/register/register-sns-topic-arn
 #aws.register.kms.key.id=${aws.parameter.prefix}/register/register-kms-key-id
 
+
+
 #aws.records.changes.topic.arn=${RECORDS_CHANGED_TOPIC_ARN}
 #logging configuration
 logging.transaction.enabled=true
@@ -57,3 +59,6 @@ CRON_JOB_EXPECTED_IP=0:0:0:0:0:0:0:1
 SUBSCRIBER_PRIVATE_KEY_ID=notused
 SUBSCRIBER_SECRET=notused
 
+# AWS user agent variables
+aws.disableUserAgent=${DISABLE_USER_AGENT}
+aws.osduVersion={OSDU_VERSION}