Skip to content
Snippets Groups Projects
Commit f9fddfec authored by Rustam Lotsmanenko (EPAM)'s avatar Rustam Lotsmanenko (EPAM)
Browse files

Merge branch 'cim-gc-group-caching' into 'master' 

Cim gc group caching

See merge request !965
parents 68402677 b0575f7f
No related branches found
No related tags found
1 merge request!965Cim gc group caching
Pipeline #294299 failed
Stage: build
Stage: coverage
Stage: containerize
Stage: scan
Stage: deploy
Stage: integration
Stage: acceptance
Stage: publish
Hide whitespace changes
Inline Side-by-side
Showing
with 57 additions and 108 deletions
NOTICE
+ 1
− 1
View file @ f9fddfec
......@@ -54,7 +54,7 @@ The following software have components provided under the terms of this license:
- Apache HttpCore (from http://hc.apache.org/httpcomponents-core-ga, http://hc.apache.org/httpcomponents-core-ga/, http://hc.apache.org/httpcomponents-core/)
- Apache Log4j API (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api)
- Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core)
- Apache Log4j JUL Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul)
- Apache Log4j JUL Handler (from https://logging.apache.org/log4j/3.x/)
- Apache Log4j SLF4J Binding (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-slf4j-impl)
- Apache Log4j to SLF4J Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-to-slf4j)
- AssertJ Core (from https://assertj.github.io/doc/#assertj-core)
......
provider/storage-gc/docs/gc/README.md
+ 4
− 0
View file @ f9fddfec
......@@ -41,6 +41,10 @@ Defined in default application property file but possible to override:
| `REDIS_STORAGE_PASSWORD` | ex `*****` | Redis storage host password | yes | |
| `REDIS_STORAGE_WITH_SSL` | ex `true` or `false` | Redis storage host ssl config | no | |
| `REDIS_STORAGE_EXPIRATION` | ex `30` | Redis storage cache expiration in seconds | no | |
| `REDIS_GROUP_HOST` | ex `127.0.0.1` | Redis host for storage groups | no | |
| `REDIS_GROUP_PASSWORD` | ex `*****` | Redis storage groups host password | yes | |
| `REDIS_GROUP_WITH_SSL` | ex `true` or `false` | Redis storage groups host ssl config | no | |
| `REDIS_GROUP_EXPIRATION` | ex `30` | Redis storage groups cache expiration in seconds | no | |
| `POLICY_API` | ex `http://localhost:8080/api/policy/v1/` | Police service endpoint | no | output of infrastructure deployment |
| `POLICY_ID` | ex `storage` | policeId from ex `http://localhost:8080/api/policy/v1/policies`. Look at `POLICY_API` | no | - |
| `PARTITION_API` | ex `http://localhost:8081/api/partition/v1` | Partition service endpoint | no | - |
......
provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/cache/CacheConfig.java
+ 14
− 5
View file @ f9fddfec
......@@ -35,11 +35,7 @@ public class CacheConfig {
private final RedisCacheBuilder<String, String> legalRedisCacheBuilder;
private final RedisCacheBuilder<String, Schema> schemaRedisCacheBuilder;
@Bean
public ICache<String, Groups> groupCache() {
return new GroupCache();
}
private final RedisCacheBuilder<String, Groups> groupsRedisCacheBuilder;
@Bean("LegalTagCache")
public ICache<String, String> legalTagCache(GcpAppServiceConfig gcpAppServiceConfig) {
......@@ -68,6 +64,19 @@ public class CacheConfig {
);
}
@Bean
public RedisCache<String, Groups> groupsCache(GcpAppServiceConfig gcpAppServiceConfig){
return groupsRedisCacheBuilder.buildRedisCache(
gcpAppServiceConfig.getRedisGroupHost(),
gcpAppServiceConfig.getRedisGroupPort(),
gcpAppServiceConfig.getRedisGroupPassword(),
gcpAppServiceConfig.getRedisGroupExpiration(),
gcpAppServiceConfig.getRedisGroupWithSsl(),
String.class,
Groups.class
);
}
@Bean
public ICache<String, PartitionInfo> partitionInfoCache() {
return new VmCache<>(600, 2000);
......
provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/cache/GroupCache.java deleted 100644 → 0
+ 0
− 46
View file @ 68402677
/*
* Copyright 2020-2023 Google LLC
* Copyright 2020-2023 EPAM Systems, Inc
*
* 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.
*/
package org.opengroup.osdu.storage.provider.gcp.web.cache;
import org.opengroup.osdu.core.common.cache.ICache;
import org.opengroup.osdu.core.common.model.entitlements.Groups;
// Group cache is used in common part. According to the current Google Cloud architecture, we don't
// use cache. Thus, methods are empty.
public class GroupCache implements ICache<String, Groups> {
@Override
public void put(String s, Groups o) {
// do nothing
}
@Override
public Groups get(String s) {
return null;
}
@Override
public void delete(String s) {
// do nothing
}
@Override
public void clearAll() {
// do nothing
}
}
provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/config/GcpAppServiceConfig.java
+ 5
− 0
View file @ f9fddfec
......@@ -34,4 +34,9 @@ public class GcpAppServiceConfig {
private Integer redisStorageExpiration = 60 * 60;
private Boolean redisStorageWithSsl = false;
private String redisGroupHost;
private Integer redisGroupPort;
private String redisGroupPassword;
private Integer redisGroupExpiration = 30;
private Boolean redisGroupWithSsl = false;
}
provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/repository/ObmStorage.java
+ 4
− 0
View file @ f9fddfec
......@@ -383,6 +383,10 @@ public class ObmStorage implements ICloudStorage {
}
private void validateMetadata(RecordMetadata metadata) {
if (entitlementsService.isDataManager(headers)) {
return;
}
List<String> aclGroups = new ArrayList<>();
Collections.addAll(aclGroups, metadata.getAcl().getViewers());
......
storage-core-plus/docs/baremetal/README.md
+ 4
− 0
View file @ f9fddfec
......@@ -56,6 +56,10 @@ Defined in default application property file but possible to override:
| `REDIS_STORAGE_PASSWORD` | ex `*****` | Redis storage host password | yes | |
| `REDIS_STORAGE_WITH_SSL` | ex `true` or `false` | Redis storage host ssl config | no | |
| `REDIS_STORAGE_EXPIRATION` | ex `30` | Redis storage cache expiration in seconds | no | |
| `REDIS_GROUP_HOST` | ex `127.0.0.1` | Redis host for storage groups | no | |
| `REDIS_GROUP_PASSWORD` | ex `*****` | Redis storage groups host password | yes | |
| `REDIS_GROUP_WITH_SSL` | ex `true` or `false` | Redis storage groups host ssl config | no | |
| `REDIS_GROUP_EXPIRATION` | ex `30` | Redis storage groups cache expiration in seconds | no | |
| `POLICY_API` | ex `http://localhost:8080/api/policy/v1/` | Police service endpoint | no | output of infrastructure deployment |
| `POLICY_ID` | ex `search` | policeId from ex `http://localhost:8080/api/policy/v1/policies`. Look at `POLICY_API` | no | - |
| `PARTITION_API` | ex `http://localhost:8081/api/partition/v1` | Partition service endpoint | no | - |
......
storage-core-plus/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/cache/CacheConfig.java
+ 14
− 6
View file @ f9fddfec
......@@ -25,7 +25,6 @@ import org.opengroup.osdu.core.common.cache.VmCache;
import org.opengroup.osdu.core.common.model.entitlements.Groups;
import org.opengroup.osdu.core.common.model.storage.Schema;
import org.opengroup.osdu.core.common.partition.PartitionInfo;
import org.opengroup.osdu.storage.provider.gcp.web.config.GcpAppServiceConfig;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
......@@ -36,11 +35,7 @@ public class CacheConfig {
private final RedisCacheBuilder<String, String> legalRedisCacheBuilder;
private final RedisCacheBuilder<String, Schema> schemaRedisCacheBuilder;
@Bean
public ICache<String, Groups> groupCache() {
return new GroupCache();
}
private final RedisCacheBuilder<String, Groups> groupsRedisCacheBuilder;
@Bean("LegalTagCache")
public ICache<String, String> legalTagCache(GcpAppServiceConfig gcpAppServiceConfig) {
......@@ -69,6 +64,19 @@ public class CacheConfig {
);
}
@Bean
public RedisCache<String, Groups> groupsCache(GcpAppServiceConfig gcpAppServiceConfig){
return groupsRedisCacheBuilder.buildRedisCache(
gcpAppServiceConfig.getRedisGroupHost(),
gcpAppServiceConfig.getRedisGroupPort(),
gcpAppServiceConfig.getRedisGroupPassword(),
gcpAppServiceConfig.getRedisGroupExpiration(),
gcpAppServiceConfig.getRedisGroupWithSsl(),
String.class,
Groups.class
);
}
@Bean
public ICache<String, PartitionInfo> partitionInfoCache() {
return new VmCache<>(600, 2000);
......
storage-core-plus/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/cache/GroupCache.java deleted 100644 → 0
+ 0
− 46
View file @ 68402677
/*
* Copyright 2020-2023 Google LLC
* Copyright 2020-2023 EPAM Systems, Inc
*
* 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.
*/
package org.opengroup.osdu.storage.provider.gcp.web.cache;
import org.opengroup.osdu.core.common.cache.ICache;
import org.opengroup.osdu.core.common.model.entitlements.Groups;
// Group cache is used in common part. According to the current Google Cloud architecture, we don't
// use cache. Thus, methods are empty.
public class GroupCache implements ICache<String, Groups> {
@Override
public void put(String s, Groups o) {
// do nothing
}
@Override
public Groups get(String s) {
return null;
}
@Override
public void delete(String s) {
// do nothing
}
@Override
public void clearAll() {
// do nothing
}
}
storage-core-plus/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/config/GcpAppServiceConfig.java
+ 5
− 0
View file @ f9fddfec
......@@ -34,4 +34,9 @@ public class GcpAppServiceConfig {
private Integer redisStorageExpiration = 60 * 60;
private Boolean redisStorageWithSsl = false;
private String redisGroupHost;
private Integer redisGroupPort;
private String redisGroupPassword;
private Integer redisGroupExpiration = 30;
private Boolean redisGroupWithSsl = false;
}
storage-core-plus/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/repository/ObmStorage.java
+ 4
− 0
View file @ f9fddfec
......@@ -383,6 +383,10 @@ public class ObmStorage implements ICloudStorage {
}
private void validateMetadata(RecordMetadata metadata) {
if (entitlementsService.isDataManager(headers)) {
return;
}
List<String> aclGroups = new ArrayList<>();
Collections.addAll(aclGroups, metadata.getAcl().getViewers());
......
testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/records/TestRecordAccessAuthorization.java
+ 2
− 4
View file @ f9fddfec
......@@ -67,14 +67,12 @@ public class TestRecordAccessAuthorization extends RecordAccessAuthorizationTest
Map<String, String> headers = HeaderUtils.getHeaders(TenantUtils.getTenantName(),
testUtils.getNoDataAccessToken());
CloseableHttpResponse response = TestUtils.send("records", "PUT", headers,
CloseableHttpResponse response = TestUtils.send("records", "PUT", headers,
RecordUtil.createDefaultJsonRecord(RECORD_ID, KIND, LEGAL_TAG), "");
assertEquals(HttpStatus.SC_UNAUTHORIZED, response.getCode());
JsonObject json = JsonParser.parseString(EntityUtils.toString(response.getEntity())).getAsJsonObject();
assertEquals(401, json.get("code").getAsInt());
assertEquals("Error from compliance service", json.get("reason").getAsString());
assertEquals("Legal response 401 {\"code\":401,\"reason\":\"Unauthorized\",\"message\":\"The user is not authorized to perform this action\"}", json.get("message").getAsString());
}
}
}
}
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