Catching up to rename changes

conf/default-config.json

@@ -30,7 +30,7 @@
   "salts_metadata_path": "salts/metadata.json",
   "services_metadata_path": "services/metadata.json",
   "service_links_metadata_path": "service_links/metadata.json",
-  "s3_keys_metadata_path": "s3encryption_keys/metadata.json",
+  "cloud_encryption_keys_metadata_path": "s3encryption_keys/metadata.json",
   "optout_metadata_path": null,
   "optout_inmem_cache": false,
   "enclave_platform": null,

conf/docker-config.json

@@ -32,7 +32,7 @@
   "salts_metadata_path": "/com.uid2.core/test/salts/metadata.json",
   "services_metadata_path": "/com.uid2.core/test/services/metadata.json",
   "service_links_metadata_path": "/com.uid2.core/test/service_links/metadata.json",
-  "s3_keys_metadata_path": "/com.uid2.core/test/s3encryption_keys/metadata.json",
+  "cloud_encryption_keys_metadata_path": "/com.uid2.core/test/s3encryption_keys/metadata.json",
   "identity_token_expires_after_seconds": 3600,
   "optout_metadata_path": null,
   "optout_inmem_cache": false,

conf/integ-config.json

@@ -14,6 +14,6 @@
   "optout_api_token": "test-operator-key",
   "optout_api_uri": "http://localhost:8081/optout/replicate",
   "salts_expired_shutdown_hours": 12,
-  "s3_keys_metadata_path": "http://localhost:8088/s3encryption_keys/retrieve",
+  "cloud_encryption_keys_metadata_path": "http://localhost:8088/s3encryption_keys/retrieve",
   "operator_type": "public"
 }

conf/local-config.json

@@ -9,7 +9,7 @@
   "salts_metadata_path": "/com.uid2.core/test/salts/metadata.json",
   "services_metadata_path": "/com.uid2.core/test/services/metadata.json",
   "service_links_metadata_path": "/com.uid2.core/test/service_links/metadata.json",
-  "s3_keys_metadata_path":"/com.uid2.core/test/s3encryption_keys/metadata.json",
+  "cloud_encryption_keys_metadata_path":"/com.uid2.core/test/s3encryption_keys/metadata.json",
   "identity_token_expires_after_seconds": 3600,
   "refresh_token_expires_after_seconds": 86400,
   "refresh_identity_token_after_seconds": 900,

conf/local-e2e-docker-private-config.json

@@ -11,7 +11,7 @@
   "keysets_metadata_path": "http://core:8088/key/keyset/refresh",
   "keyset_keys_metadata_path": "http://core:8088/key/keyset-keys/refresh",
   "salts_metadata_path": "http://core:8088/salt/refresh",
-  "s3_keys_metadata_path": "http://core:8088/s3encryption_keys/retrieve",
+  "cloud_encryption_keys_metadata_path": "http://core:8088/s3encryption_keys/retrieve",
   "identity_token_expires_after_seconds": 3600,
   "refresh_token_expires_after_seconds": 86400,
   "refresh_identity_token_after_seconds": 900,

conf/local-e2e-docker-public-config.json

@@ -13,7 +13,7 @@
   "salts_metadata_path": "http://core:8088/salt/refresh",
   "services_metadata_path": "http://core:8088/services/refresh",
   "service_links_metadata_path": "http://core:8088/service_links/refresh",
-  "s3_keys_metadata_path": "http://core:8088/s3encryption_keys/retrieve",
+  "cloud_encryption_keys_metadata_path": "http://core:8088/s3encryption_keys/retrieve",
   "identity_token_expires_after_seconds": 3600,
   "refresh_token_expires_after_seconds": 86400,
   "refresh_identity_token_after_seconds": 900,

conf/local-e2e-private-config.json

@@ -13,7 +13,7 @@
   "salts_metadata_path": "http://localhost:8088/salt/refresh",
   "services_metadata_path": "http://localhost:8088/services/refresh",
   "service_links_metadata_path": "http://localhost:8088/service_links/refresh",
-  "s3_keys_metadata_path": "http://core:8088/s3encryption_keys/retrieve",
+  "cloud_encryption_keys_metadata_path": "http://core:8088/s3encryption_keys/retrieve",
   "identity_token_expires_after_seconds": 3600,
   "refresh_token_expires_after_seconds": 86400,
   "refresh_identity_token_after_seconds": 900,

conf/local-e2e-public-config.json

@@ -13,7 +13,7 @@
   "salts_metadata_path": "http://localhost:8088/salt/refresh",
   "services_metadata_path": "http://localhost:8088/services/refresh",
   "service_links_metadata_path": "http://localhost:8088/service_links/refresh",
-  "s3_keys_metadata_path": "http://core:8088/s3encryption_keys/retrieve",
+  "cloud_encryption_keys_metadata_path": "http://core:8088/s3encryption_keys/retrieve",
   "identity_token_expires_after_seconds": 3600,
   "refresh_token_expires_after_seconds": 86400,
   "refresh_identity_token_after_seconds": 900,

conf/validator-latest-e2e-docker-public-config.json

@@ -14,7 +14,7 @@
   "salts_metadata_path": "http://core:8088/salt/refresh",
   "services_metadata_path": "http://core:8088/services/refresh",
   "service_links_metadata_path": "http://core:8088/service_links/refresh",
-  "s3_keys_metadata_path": "https://core:8088/s3encryption_keys/retrieve",
+  "cloud_encryption_keys_metadata_path": "https://core:8088/s3encryption_keys/retrieve",
   "identity_token_expires_after_seconds": 3600,
   "refresh_token_expires_after_seconds": 86400,
   "refresh_identity_token_after_seconds": 900,

src/main/java/com/uid2/operator/Main.java

@@ -8,7 +8,7 @@
 import com.uid2.operator.monitoring.IStatsCollectorQueue;
 import com.uid2.operator.monitoring.OperatorMetrics;
 import com.uid2.operator.monitoring.StatsCollectorVerticle;
-import com.uid2.operator.reader.RotatingS3KeyOperatorProvider;
+import com.uid2.operator.reader.RotatingCloudEncryptionKeyApiProvider;
 import com.uid2.operator.service.SecureLinkValidatorService;
 import com.uid2.operator.service.ShutdownService;
 import com.uid2.operator.vertx.Endpoints;
@@ -82,7 +82,7 @@ public class Main {
     private IStatsCollectorQueue _statsCollectorQueue;
     private RotatingServiceStore serviceProvider;
     private RotatingServiceLinkStore serviceLinkProvider;
-    private RotatingS3KeyOperatorProvider s3KeyProvider;
+    private RotatingCloudEncryptionKeyApiProvider s3KeyProvider;
 
     public Main(Vertx vertx, JsonObject config) throws Exception {
         this.vertx = vertx;
@@ -134,8 +134,8 @@ public Main(Vertx vertx, JsonObject config) throws Exception {
             this.fsOptOut = configureCloudOptOutStore();
         }
 
-        String s3KeyMdPath = this.config.getString(Const.Config.S3keysMetadataPathProp);
-        this.s3KeyProvider = new RotatingS3KeyOperatorProvider(fsStores, new GlobalScope(new CloudPath(s3KeyMdPath)));
+        String s3KeyMdPath = this.config.getString(Const.Config.CloudEncryptionKeysMetadataPathProp);
+        this.s3KeyProvider = new RotatingCloudEncryptionKeyApiProvider(fsStores, new GlobalScope(new CloudPath(s3KeyMdPath)));
         String sitesMdPath = this.config.getString(Const.Config.SitesMetadataPathProp);
         String keypairMdPath = this.config.getString(Const.Config.ClientSideKeypairsMetadataPathProp);
         this.clientSideKeypairProvider = new RotatingClientSideKeypairStore(fsStores, new GlobalScope(new CloudPath(keypairMdPath)));

src/main/java/com/uid2/operator/reader/RotatingS3KeyOperatorProvider.java → src/main/java/com/uid2/operator/reader/RotatingCloudEncryptionKeyApiProvider.java

@@ -1,28 +1,25 @@
 package com.uid2.operator.reader;
 
-import com.uid2.operator.reader.ApiStoreReader;
 import com.uid2.shared.cloud.DownloadCloudStorage;
-import com.uid2.shared.model.S3Key;
+import com.uid2.shared.model.CloudEncryptionKey;
 import com.uid2.shared.store.CloudPath;
-import com.uid2.shared.store.parser.S3KeyParser;
-import com.uid2.shared.store.reader.RotatingS3KeyProvider;
+import com.uid2.shared.store.parser.CloudEncryptionKeyParser;
+import com.uid2.shared.store.reader.RotatingCloudEncryptionKeyProvider;
 import com.uid2.shared.store.scope.StoreScope;
 import io.vertx.core.json.JsonObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.time.Instant;
 import java.util.*;
-import java.util.stream.Collectors;
 
-public class RotatingS3KeyOperatorProvider extends RotatingS3KeyProvider {
-    private static final Logger LOGGER = LoggerFactory.getLogger(RotatingS3KeyOperatorProvider.class);
+public class RotatingCloudEncryptionKeyApiProvider extends RotatingCloudEncryptionKeyProvider {
+    private static final Logger LOGGER = LoggerFactory.getLogger(RotatingCloudEncryptionKeyApiProvider.class);
 
-    public ApiStoreReader<Map<Integer, S3Key>> apiStoreReader;
+    public ApiStoreReader<Map<Integer, CloudEncryptionKey>> apiStoreReader;
 
-    public RotatingS3KeyOperatorProvider(DownloadCloudStorage fileStreamProvider, StoreScope scope) {
+    public RotatingCloudEncryptionKeyApiProvider(DownloadCloudStorage fileStreamProvider, StoreScope scope) {
         super(fileStreamProvider, scope);
-        this.apiStoreReader = new ApiStoreReader<>(fileStreamProvider, scope, new S3KeyParser(), "s3encryption_keys");
+        this.apiStoreReader = new ApiStoreReader<>(fileStreamProvider, scope, new CloudEncryptionKeyParser(), "s3encryption_keys");
     }
 
     @Override
@@ -41,8 +38,8 @@ public long loadContent(JsonObject metadata) throws Exception {
     }
 
     @Override
-    public Map<Integer, S3Key> getAll() {
-        Map<Integer, S3Key> keys = apiStoreReader.getSnapshot();
+    public Map<Integer, CloudEncryptionKey> getAll() {
+        Map<Integer, CloudEncryptionKey> keys = apiStoreReader.getSnapshot();
         return keys != null ? keys : new HashMap<>();
     }
 

src/test/java/com/uid2/operator/RotatingS3KeyOperatorProviderTest.java → src/test/java/com/uid2/operator/RotatingCloudEncryptionKeyApiProviderTest.java

@@ -1,9 +1,9 @@
 package com.uid2.operator;
 
 import com.uid2.operator.reader.ApiStoreReader;
-import com.uid2.operator.reader.RotatingS3KeyOperatorProvider;
+import com.uid2.operator.reader.RotatingCloudEncryptionKeyApiProvider;
 import com.uid2.shared.cloud.DownloadCloudStorage;
-import com.uid2.shared.model.S3Key;
+import com.uid2.shared.model.CloudEncryptionKey;
 import com.uid2.shared.store.CloudPath;
 import com.uid2.shared.store.scope.StoreScope;
 import io.vertx.core.json.JsonObject;
@@ -18,7 +18,7 @@
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-class RotatingS3KeyOperatorProviderTest {
+class RotatingCloudEncryptionKeyApiProviderTest {
 
     @Mock
     private DownloadCloudStorage mockFileStreamProvider;
@@ -27,23 +27,23 @@ class RotatingS3KeyOperatorProviderTest {
     private StoreScope mockScope;
 
     @Mock
-    private ApiStoreReader<Map<Integer, S3Key>> mockApiStoreReader;
+    private ApiStoreReader<Map<Integer, CloudEncryptionKey>> mockApiStoreReader;
 
-    private RotatingS3KeyOperatorProvider rotatingS3KeyOperatorProvider;
+    private RotatingCloudEncryptionKeyApiProvider rotatingCloudEncryptionKeyApiProvider;
 
     @BeforeEach
     void setUp() {
         MockitoAnnotations.openMocks(this);
-        rotatingS3KeyOperatorProvider = new RotatingS3KeyOperatorProvider(mockFileStreamProvider, mockScope);
-        rotatingS3KeyOperatorProvider.apiStoreReader = mockApiStoreReader;
+        rotatingCloudEncryptionKeyApiProvider = new RotatingCloudEncryptionKeyApiProvider(mockFileStreamProvider, mockScope);
+        rotatingCloudEncryptionKeyApiProvider.apiStoreReader = mockApiStoreReader;
     }
 
     @Test
     void testGetMetadata() throws Exception {
         JsonObject expectedMetadata = new JsonObject().put("version", 1L);
         when(mockApiStoreReader.getMetadata()).thenReturn(expectedMetadata);
 
-        JsonObject metadata = rotatingS3KeyOperatorProvider.getMetadata();
+        JsonObject metadata = rotatingCloudEncryptionKeyApiProvider.getMetadata();
         assertEquals(expectedMetadata, metadata);
         verify(mockApiStoreReader).getMetadata();
     }
@@ -53,7 +53,7 @@ void testGetMetadataPath() {
         CloudPath expectedPath = new CloudPath("test/path");
         when(mockApiStoreReader.getMetadataPath()).thenReturn(expectedPath);
 
-        CloudPath path = rotatingS3KeyOperatorProvider.getMetadataPath();
+        CloudPath path = rotatingCloudEncryptionKeyApiProvider.getMetadataPath();
         assertEquals(expectedPath, path);
         verify(mockApiStoreReader).getMetadataPath();
     }
@@ -63,19 +63,19 @@ void testLoadContentWithMetadata() throws Exception {
         JsonObject metadata = new JsonObject();
         when(mockApiStoreReader.loadContent(metadata, "s3Keys")).thenReturn(1L);
 
-        long version = rotatingS3KeyOperatorProvider.loadContent(metadata);
+        long version = rotatingCloudEncryptionKeyApiProvider.loadContent(metadata);
         assertEquals(1L, version);
         verify(mockApiStoreReader).loadContent(metadata, "s3Keys");
     }
 
     @Test
     void testGetAll() {
-        Map<Integer, S3Key> expectedKeys = new HashMap<>();
-        S3Key key = new S3Key(1, 123, 1687635529, 1687808329, "secret");
+        Map<Integer, CloudEncryptionKey> expectedKeys = new HashMap<>();
+        CloudEncryptionKey key = new CloudEncryptionKey(1, 123, 1687635529, 1687808329, "secret");
         expectedKeys.put(1, key);
         when(mockApiStoreReader.getSnapshot()).thenReturn(expectedKeys);
 
-        Map<Integer, S3Key> keys = rotatingS3KeyOperatorProvider.getAll();
+        Map<Integer, CloudEncryptionKey> keys = rotatingCloudEncryptionKeyApiProvider.getAll();
         assertEquals(expectedKeys, keys);
         verify(mockApiStoreReader).getSnapshot();
     }
@@ -84,7 +84,7 @@ void testGetAll() {
     void testGetAllWithNullSnapshot() {
         when(mockApiStoreReader.getSnapshot()).thenReturn(null);
 
-        Map<Integer, S3Key> keys = rotatingS3KeyOperatorProvider.getAll();
+        Map<Integer, CloudEncryptionKey> keys = rotatingCloudEncryptionKeyApiProvider.getAll();
         assertNotNull(keys);
         assertTrue(keys.isEmpty());
         verify(mockApiStoreReader).getSnapshot();
@@ -96,7 +96,7 @@ void testLoadContent() throws Exception {
         when(mockApiStoreReader.getMetadata()).thenReturn(metadata);
         when(mockApiStoreReader.loadContent(metadata, "s3Keys")).thenReturn(1L);
 
-        rotatingS3KeyOperatorProvider.loadContent();
+        rotatingCloudEncryptionKeyApiProvider.loadContent();
         verify(mockApiStoreReader).getMetadata();
         verify(mockApiStoreReader).loadContent(metadata, "s3Keys");
     }