reverting useragent changes

devops/aws/chart/values.yaml

@@ -30,10 +30,6 @@ environmentVariables:
     value: "{{ default `dynamodb` .Values.global.coreDbProvider }}"
   - name: TMP_VOLUME_PATH
     value: "/tmp"
-  - name: DISABLE_USER_AGENT
-    value: "{{ .Values.global.disableUserAgent }}"
-  - name: OSDU_VERSION
-    value: "3.18.0"
 
 # Resource Config
 replicaCount: 1

provider/schema-aws/pom.xml

@@ -80,7 +80,7 @@
         <dependency>
             <groupId>org.opengroup.osdu.core.aws</groupId>
             <artifactId>os-core-lib-aws</artifactId>
-            <version>0.21.0-bios-tf3-SNAPSHOT</version>
+            <version>0.21.0-rc1</version>
         </dependency>
 
         <dependency>

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

@@ -26,8 +26,7 @@ LOG_PREFIX=schema
 aws.ssm=${SSM_ENABLED:True}
 aws.parameter.prefix=/osdu/${ENVIRONMENT}
 aws.environment=${ENVIRONMENT}
-aws.disableUserAgent=${DISABLE_USER_AGENT}
-aws.osduVersion=${OSDU_VERSION}
+
 ## AWS s3 Configuraiton 
 
 #Tenant Specific S3 Bucket Configuration

testing/schema-test-core/pom.xml

@@ -12,7 +12,7 @@
 	<properties>
 		<os-core-lib-ibm.version>0.15.2</os-core-lib-ibm.version>
 		<os-core-lib-azure.version>0.6.1</os-core-lib-azure.version>
-        <os-core-lib-aws.version>0.20.0-bios-tf3-SNAPSHOT</os-core-lib-aws.version>
+        <os-core-lib-aws.version>0.13.0</os-core-lib-aws.version>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

testing/schema-test-core/src/test/java/org/opengroup/osdu/schema/util/AwsServicePrincipalUtil.java

@@ -21,7 +21,6 @@ import com.amazonaws.services.simplesystemsmanagement.AWSSimpleSystemsManagement
 import com.amazonaws.services.simplesystemsmanagement.AWSSimpleSystemsManagementClientBuilder;
 import com.amazonaws.services.simplesystemsmanagement.model.GetParameterRequest;
 import com.amazonaws.services.simplesystemsmanagement.model.GetParameterResult;
-import org.opengroup.osdu.core.aws.configurationsetup.ConfigSetup;
 import org.opengroup.osdu.core.aws.entitlements.ServicePrincipal;
 import org.opengroup.osdu.core.aws.iam.IAMConfig;
 import org.opengroup.osdu.core.aws.secrets.SecretsManager;
@@ -36,7 +35,6 @@ public class AwsServicePrincipalUtil {
     private static final AWSSimpleSystemsManagement ssmManager = AWSSimpleSystemsManagementClientBuilder.standard()
             .withCredentials(amazonAWSCredentials)
             .withRegion(amazonRegion)
-            .withClientConfiguration(ConfigSetup.setUpConfig())
             .build();
     private static final SecretsManager sm = new SecretsManager();