Merge branch 'aws-integration' into 'master'

Enabling AWS Partition Policies on Search

See merge request !360

devops/aws/chart/values.yaml

@@ -53,8 +53,8 @@ environmentVariables:
     value: "http://os-policy:8080"
   - name: POLICY_SERVICE_ENABLED
     value: "true"
-  - name: POLICY_ID
-    value: "osdu.instance.search"
+  - name: POLICY_CACHE_TIMEOUT
+    value: "2"
   - name: ELASTIC_DISABLE_CERTIFICATE_TRUST
     value: "true"
   - name: PARAMETER_MOUNT_PATH

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

@@ -67,7 +67,8 @@ server.ssl.key-store-password=${SSL_KEY_STORE_PASSWORD:}
 # Policy service properties
 service.policy.enabled=${POLICY_SERVICE_ENABLED:true}
 service.policy.endpoint=${POLICY_BASE_URL}/api/policy/v1
-service.policy.id=${POLICY_ID}
+service.policy.id=osdu.partition["%s"].search
+policy.cache.timeout=${POLICY_CACHE_TIMEOUT}
 PARTITION_API=${PARTITION_BASE_URL}/api/partition/v1
 aws.environment=${ENVIRONMENT}