adding values in application.properties

provider/schema-aws/src/main/java/org/opengroup/osdu/schema/provider/aws/security/AuthorizationServiceForServicePrincipalImpl.java

@@ -20,7 +20,7 @@ public class AuthorizationServiceForServicePrincipalImpl implements IAuthorizati
     private DpsHeaders headers;
 
 
-    @Value("${aws.dynamodb.region}")
+    @Value("${aws.region}")
     private String awsRegion;
 
     @Value("${aws.environment}")

provider/schema-gcp/src/main/java/org/opengroup/osdu/schema/configuration/PropertiesConfiguration.java

@@ -16,14 +16,10 @@ import java.util.Objects;
 public class PropertiesConfiguration {
     private String googleAudiences;
 
-    private List<String> partitionAdminAccounts;
+    private List<String> adminAccounts;
 
     private String googleCloudProject;
 
-    private int cacheExpiration;
-
-    private int cacheMaxSize;
-
     private String serviceAccountTail;
 
     @PostConstruct

provider/schema-gcp/src/main/java/org/opengroup/osdu/schema/security/AuthorizationServiceForServicePrincipalImpl.java

@@ -40,7 +40,7 @@ public class AuthorizationServiceForServicePrincipalImpl implements IAuthorizati
                 throw AppException.createUnauthorized("Unauthorized. The JWT token could not be validated");
             }
             email = googleIdToken.getPayload().getEmail();
-            List<String> partitionAdminAccounts = configuration.getPartitionAdminAccounts();
+            List<String> partitionAdminAccounts = configuration.getAdminAccounts();
             if (Objects.nonNull(partitionAdminAccounts) && !partitionAdminAccounts.isEmpty()) {
                 return isAllowedAccount(email);
             } else {
@@ -61,7 +61,7 @@ public class AuthorizationServiceForServicePrincipalImpl implements IAuthorizati
 
     private boolean isAllowedAccount(String accountEmail) {
         if (StringUtils.endsWith(accountEmail, configuration.getServiceAccountTail())) {
-            for (String partitionAdmin : configuration.getPartitionAdminAccounts()) {
+            for (String partitionAdmin : configuration.getAdminAccounts()) {
                 if (partitionAdmin.equals(accountEmail)) {
                     return true;
                 }

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

@@ -13,7 +13,10 @@ LOG_PREFIX=schema
 shared.tenant.name=common
         
 google.audiences=123.apps.googleusercontent.com
+admin-accounts=osdu-gcp-sa
 partition.api=http://localhost:8081/api/partition/v1
 
 gcp.schema-changed.messagingEnabled=false
-gcp.schema-changed.topicName=topicName
\ No newline at end of file
+gcp.schema-changed.topicName=topicName
+
+GOOGLE_CLOUD_PROJECT=${google-cloud-project:opendes}
\ No newline at end of file

provider/schema-ibm/src/main/java/org/opengroup/osdu/schema/provider/ibm/security/AuthorizationServiceForServicePrincipalImpl.java

@@ -16,7 +16,7 @@ import org.springframework.web.context.annotation.RequestScope;
 @RequestScope
 @Slf4j
 public class AuthorizationServiceForServicePrincipalImpl implements IAuthorizationServiceForServicePrincipal {
-    @Value("${service.partition.admin.user}")
+    @Value("${service.admin.user}")
     String partitionAdminUser;
 
 

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

@@ -21,6 +21,7 @@ ibm.tenant.db.name=TODO
 
 spring.main.allow-bean-definition-overriding=true
 
+service.admin.user=partition-service-admin@in.ibm.com
 
 # Use this property to name your shared tenant name
 shared.tenant.name=common