Renaming and adding small fixes

Author: cody-constine-ttd

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-operator</artifactId>
-    <version>5.42.6</version>
+    <version>6.0.0</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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

@@ -82,7 +82,7 @@ public class Main {
     private IStatsCollectorQueue _statsCollectorQueue;
     private RotatingServiceStore serviceProvider;
     private RotatingServiceLinkStore serviceLinkProvider;
-    private RotatingCloudEncryptionKeyApiProvider s3KeyProvider;
+    private RotatingCloudEncryptionKeyApiProvider cloudEncryptionKeyProvider;
 
     public Main(Vertx vertx, JsonObject config) throws Exception {
         this.vertx = vertx;
@@ -134,17 +134,17 @@ public Main(Vertx vertx, JsonObject config) throws Exception {
             this.fsOptOut = configureCloudOptOutStore();
         }
 
-        String s3KeyMdPath = this.config.getString(Const.Config.CloudEncryptionKeysMetadataPathProp);
-        this.s3KeyProvider = new RotatingCloudEncryptionKeyApiProvider(fsStores, new GlobalScope(new CloudPath(s3KeyMdPath)));
+        String cloudEncryptionKeyMdPath = this.config.getString(Const.Config.CloudEncryptionKeysMetadataPathProp);
+        this.cloudEncryptionKeyProvider = new RotatingCloudEncryptionKeyApiProvider(fsStores, new GlobalScope(new CloudPath(cloudEncryptionKeyMdPath)));
         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)));
         String clientsMdPath = this.config.getString(Const.Config.ClientsMetadataPathProp);
-        this.clientKeyProvider = new RotatingClientKeyProvider(fsStores, new GlobalScope(new CloudPath(clientsMdPath)),s3KeyProvider);
+        this.clientKeyProvider = new RotatingClientKeyProvider(fsStores, new GlobalScope(new CloudPath(clientsMdPath)), cloudEncryptionKeyProvider);
         String keysetKeysMdPath = this.config.getString(Const.Config.KeysetKeysMetadataPathProp);
-        this.keysetKeyStore = new RotatingKeysetKeyStore(fsStores, new GlobalScope(new CloudPath(keysetKeysMdPath)),s3KeyProvider);
+        this.keysetKeyStore = new RotatingKeysetKeyStore(fsStores, new GlobalScope(new CloudPath(keysetKeysMdPath)), cloudEncryptionKeyProvider);
         String keysetMdPath = this.config.getString(Const.Config.KeysetsMetadataPathProp);
-        this.keysetProvider = new RotatingKeysetProvider(fsStores, new GlobalScope(new CloudPath(keysetMdPath)),s3KeyProvider);
+        this.keysetProvider = new RotatingKeysetProvider(fsStores, new GlobalScope(new CloudPath(keysetMdPath)), cloudEncryptionKeyProvider);
         String saltsMdPath = this.config.getString(Const.Config.SaltsMetadataPathProp);
         this.saltProvider = new RotatingSaltProvider(fsStores, saltsMdPath);
         this.optOutStore = new CloudSyncOptOutStore(vertx, fsLocal, this.config, operatorKey, Clock.systemUTC());
@@ -156,7 +156,7 @@ public Main(Vertx vertx, JsonObject config) throws Exception {
             this.serviceLinkProvider = new RotatingServiceLinkStore(fsStores, new GlobalScope(new CloudPath(serviceLinkMdPath)));
         }
 
-        this.siteProvider = clientSideTokenGenerate ? new RotatingSiteStore(fsStores, new GlobalScope(new CloudPath(sitesMdPath)), s3KeyProvider) : null;
+        this.siteProvider = clientSideTokenGenerate ? new RotatingSiteStore(fsStores, new GlobalScope(new CloudPath(sitesMdPath)), cloudEncryptionKeyProvider) : null;
 
         if (useStorageMock && coreAttestUrl == null) {
             if (clientSideTokenGenerate) {
@@ -167,7 +167,7 @@ public Main(Vertx vertx, JsonObject config) throws Exception {
             this.saltProvider.loadContent();
             this.keysetProvider.loadContent();
             this.keysetKeyStore.loadContent();
-            this.s3KeyProvider.loadContent();
+            this.cloudEncryptionKeyProvider.loadContent();
 
             if (this.validateServiceLinks) {
                 this.serviceProvider.loadContent();
@@ -307,6 +307,8 @@ private void run() throws Exception {
 
     private Future<Void> createStoreVerticles() throws Exception {
         // load metadatas for the first time
+        cloudEncryptionKeyProvider.loadContent();
+
         if (clientSideTokenGenerate) {
             siteProvider.getMetadata();
             clientSideKeypairProvider.getMetadata();
@@ -335,7 +337,7 @@ private Future<Void> createStoreVerticles() throws Exception {
         fs.add(createAndDeployRotatingStoreVerticle("auth", clientKeyProvider, "auth_refresh_ms"));
         fs.add(createAndDeployRotatingStoreVerticle("keyset", keysetProvider, "keyset_refresh_ms"));
         fs.add(createAndDeployRotatingStoreVerticle("keysetkey", keysetKeyStore, "keysetkey_refresh_ms"));
-        fs.add(createAndDeployRotatingStoreVerticle("cloud_encryption_keys", s3KeyProvider, "s3keys_refresh_ms"));
+        fs.add(createAndDeployRotatingStoreVerticle("cloud_encryption_keys", cloudEncryptionKeyProvider, "cloud_encryption_keys_refresh_ms"));
         fs.add(createAndDeployRotatingStoreVerticle("salt", saltProvider, "salt_refresh_ms"));
         fs.add(createAndDeployCloudSyncStoreVerticle("optout", fsOptOut, optOutCloudSync));
         CompositeFuture.all(fs).onComplete(ar -> {

src/main/java/com/uid2/operator/reader/ApiStoreReader.java

@@ -28,12 +28,12 @@ public long loadContent(JsonObject contents, String dataType) throws Exception {
         }
 
         try {
-            JsonArray s3KeysArray = contents.getJsonArray(dataType);
-            if (s3KeysArray == null) {
+            JsonArray dataArray = contents.getJsonArray(dataType);
+            if (dataArray == null) {
                 throw new IllegalArgumentException("No array found in the contents");
             }
 
-            String jsonString = s3KeysArray.toString();
+            String jsonString = dataArray.toString();
             InputStream inputStream = new ByteArrayInputStream(jsonString.getBytes(StandardCharsets.UTF_8));
 
             ParsingResult<T> parsed = parser.deserialize(inputStream);

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

@@ -35,7 +35,7 @@ public CloudPath getMetadataPath() {
 
     @Override
     public long loadContent(JsonObject metadata) throws Exception {
-        return apiStoreReader.loadContent(metadata, "s3Keys");
+        return apiStoreReader.loadContent(metadata, "cloudEncryptionKeys");
     }
 
     @Override

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

@@ -61,11 +61,11 @@ void testGetMetadataPath() {
     @Test
     void testLoadContentWithMetadata() throws Exception {
         JsonObject metadata = new JsonObject();
-        when(mockApiStoreReader.loadContent(metadata, "s3Keys")).thenReturn(1L);
+        when(mockApiStoreReader.loadContent(metadata, "cloudEncryptionKeys")).thenReturn(1L);
 
         long version = rotatingCloudEncryptionKeyApiProvider.loadContent(metadata);
         assertEquals(1L, version);
-        verify(mockApiStoreReader).loadContent(metadata, "s3Keys");
+        verify(mockApiStoreReader).loadContent(metadata, "cloudEncryptionKeys");
     }
 
     @Test
@@ -94,10 +94,10 @@ void testGetAllWithNullSnapshot() {
     void testLoadContent() throws Exception {
         JsonObject metadata = new JsonObject().put("version", 1L);
         when(mockApiStoreReader.getMetadata()).thenReturn(metadata);
-        when(mockApiStoreReader.loadContent(metadata, "s3Keys")).thenReturn(1L);
+        when(mockApiStoreReader.loadContent(metadata, "cloudEncryptionKeys")).thenReturn(1L);
 
         rotatingCloudEncryptionKeyApiProvider.loadContent();
         verify(mockApiStoreReader).getMetadata();
-        verify(mockApiStoreReader).loadContent(metadata, "s3Keys");
+        verify(mockApiStoreReader).loadContent(metadata, "cloudEncryptionKeys");
     }
 }