Commit 6cd692d9 authored by Kelly Zhou's avatar Kelly Zhou
Browse files

Merge branch 'master' of...

Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/storage into multi-partition
parents c9294f3c a3fba32f
Pipeline #109736 failed with stages
in 122 minutes and 29 seconds
......@@ -5,7 +5,11 @@ metadata:
namespace: "{{ .Release.Namespace }}"
spec:
hosts:
{{- if .Values.conf.domain }}
- {{ printf "osdu.%s" .Values.conf.domain | quote }}
{{- else }}
- "*"
{{- end }}
gateways:
- service-gateway
http:
......
......@@ -8,7 +8,7 @@ data:
requests_memory: "2048M"
limits_cpu: "1"
limits_memory: "3G"
image: ""
image: ""
imagePullPolicy: "IfNotPresent"
serviceAccountName: "storage"
conf:
......@@ -20,3 +20,4 @@ conf:
postgres_secret_name: "storage-postgres-secret"
rabbitmq_secret_name: "rabbitmq-secret"
replicas: 3
domain: ""
......@@ -65,7 +65,7 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
<version>0.13.0</version>
<version>0.14.0-rc2</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
......
......@@ -60,7 +60,7 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
<version>0.10.0</version>
<version>0.14.0-rc2</version>
</dependency>
<dependency>
......
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
# http://www.apache.org/licenses/LICENSE-2.0
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
LOG_PREFIX=storage
AUTHORIZE_API=${ENTITLEMENTS_BASE_URL}/api/entitlements/v2
LEGALTAG_API=${LEGALTAG_BASE_URL}/api/legal/v1
CRS_API=${CRS_CONVERSION_BASE_URL}/api/crs/converter/v2
CRS_API=${CRS_CONVERSION_BASE_URL}/api/crs/converter/v3
server.servlet.contextPath=/api/storage/v2/
logging.level.org.springframework.web=${LOG_LEVEL:INFO}
......@@ -44,6 +58,9 @@ opa.opa-endpoint=notused
opa.enabled=false
spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration
# https://community.opengroup.org/osdu/platform/system/storage/-/issues/122
osdu.spring.config.enableEncodedSpecialCharacters=true
# to be removed, used by partition related factory.
aws.parameter.prefix=/osdu/${ENVIRONMENT}
......
......@@ -96,7 +96,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-gcp</artifactId>
<version>0.14.0-rc2</version>
<version>0.15.0-rc3</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
......
......@@ -34,7 +34,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<springfox-version>2.7.0</springfox-version>
<os-core-common.version>0.14.0-rc6</os-core-common.version>
<os-core-common.version>0.15.0-SNAPSHOT</os-core-common.version>
<!--
<springfox-version>2.9.2</springfox-version>
-->
......
......@@ -145,6 +145,8 @@ public class CrsConversionService {
if (asIngestedCoordinates.has(Constants.TYPE) && (!asIngestedCoordinates.get(Constants.TYPE).isJsonNull())) fc.setType(asIngestedCoordinates.get(Constants.TYPE).getAsString());
if (asIngestedCoordinates.has(Constants.PROPERTIES) && (!asIngestedCoordinates.get(Constants.PROPERTIES).isJsonNull())) fc.setProperties(asIngestedCoordinates.getAsJsonObject(Constants.PROPERTIES));
if (asIngestedCoordinates.has(Constants.PERSISTABLE_REFERENCE_CRS) && (!asIngestedCoordinates.get(Constants.PERSISTABLE_REFERENCE_CRS).isJsonNull())) fc.setPersistableReferenceCrs(asIngestedCoordinates.get(Constants.PERSISTABLE_REFERENCE_CRS).getAsString());
if (asIngestedCoordinates.has(Constants.COORDINATE_REFERENCE_SYSTEM_ID) && (!asIngestedCoordinates.get(Constants.COORDINATE_REFERENCE_SYSTEM_ID).isJsonNull())) fc.setCoordinateReferenceSystemID(asIngestedCoordinates.get(Constants.COORDINATE_REFERENCE_SYSTEM_ID).getAsString());
if (asIngestedCoordinates.has(Constants.VERTICAL_UNIT_ID) && (!asIngestedCoordinates.get(Constants.VERTICAL_UNIT_ID).isJsonNull())) fc.setVerticalUnitID(asIngestedCoordinates.get(Constants.VERTICAL_UNIT_ID).getAsString());
if (asIngestedCoordinates.has(Constants.PERSISTABLE_REFERENCE_UNIT_Z) && (!asIngestedCoordinates.get(Constants.PERSISTABLE_REFERENCE_UNIT_Z).isJsonNull())) fc.setPersistableReferenceUnitZ(asIngestedCoordinates.get(Constants.PERSISTABLE_REFERENCE_UNIT_Z).getAsString());
if (asIngestedCoordinates.has(Constants.BBOX) && (!asIngestedCoordinates.get(Constants.BBOX).isJsonNull())) fc.setBbox(this.bboxValues(asIngestedCoordinates.getAsJsonArray(Constants.BBOX)));
......@@ -166,6 +168,8 @@ public class CrsConversionService {
if (statusBuilder.getErrors().isEmpty()) {
ConvertGeoJsonResponse response = crsConverterService.convertGeoJson(request);
GeoJsonFeatureCollection wgs84Coordinates = response.getFeatureCollection();
wgs84Coordinates.setCoordinateReferenceSystemID(null);
wgs84Coordinates.setVerticalUnitID(null);
this.appendObjectInRecord(recordJsonObject, attributeName, wgs84Coordinates);
}
} catch (CrsConverterException crsEx) {
......
......@@ -40,7 +40,7 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
<version>0.3.7</version>
<version>0.3.8</version>
</dependency>
<dependency>
......
......@@ -40,7 +40,7 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
<version>0.10.0</version>
<version>0.14.0-rc2</version>
</dependency>
<dependency>
......
......@@ -20,6 +20,7 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.opengroup.osdu.storage.util.AWSTestUtils;
import org.opengroup.osdu.storage.util.ConfigUtils;
public class TestRecordsApiAcceptance extends RecordsApiAcceptanceTests {
......@@ -39,6 +40,7 @@ public class TestRecordsApiAcceptance extends RecordsApiAcceptanceTests {
@Override
public void setup() throws Exception {
this.testUtils = new AWSTestUtils();
this.configUtils = new ConfigUtils("test.properties");
}
@After
......
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
# http://www.apache.org/licenses/LICENSE-2.0
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
enableEncodedSpecialCharactersInURL=true
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment