Merge pull request #16 from IABTechLab/aul-UID2-646-upgrade-operator

Aul UI d2 646 upgrade operator
IABTechLab · Feb 1, 2023 · ca8b10a · ca8b10a
2 parents f8c4671 + 8f1155c
commit ca8b10a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/conf/local-config.json b/conf/local-config.json
@@ -11,5 +11,6 @@
   "partners_config_path": "/com.uid2.core/test/partners/config.json",
   "partners_metadata_path": "/com.uid2.core/test/partners/metadata.json",
   "clients_metadata_path": "/com.uid2.core/test/clients/metadata.json",
-  "operators_metadata_path": "/com.uid2.core/test/operators/metadata.json"
+  "operators_metadata_path": "/com.uid2.core/test/operators/metadata.json",
+  "optout_observe_only": false
 }
diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
     <vertx.version>3.9.4</vertx.version>
     <!-- check micrometer.version vertx-micrometer-metrics consumes before bumping up -->
     <micrometer.version>1.1.0</micrometer.version>
-    <uid2-shared.version>1.19.0</uid2-shared.version>
+    <uid2-shared.version>1.20.1</uid2-shared.version>
     <image.version>${project.version}</image.version>
   </properties>
 

diff --git a/src/main/java/com/uid2/optout/Main.java b/src/main/java/com/uid2/optout/Main.java
@@ -59,7 +59,7 @@ public class Main {
     private final JsonObject config;
     private final ICloudStorage fsLocal = new LocalStorageMock();
     private final ICloudStorage fsOptOut;
-    private final ICloudStorage fsOperatorKeyConfig;
+    private final DownloadCloudStorage fsOperatorKeyConfig;
     private final ICloudStorage fsPartnerConfig;
     private final RotatingOperatorKeyProvider operatorKeyProvider;
     private final boolean observeOnly;
@@ -113,7 +113,7 @@ public Main(Vertx vertx, JsonObject config) throws Exception {
         ApplicationVersion appVersion = ApplicationVersion.load("uid2-optout", "uid2-shared", "enclave-attestation-api");
 
         String coreAttestUrl = this.config.getString(Const.Config.CoreAttestUrlProp);
-        final ICloudStorage contentStorage;
+        final DownloadCloudStorage contentStorage;
         if (coreAttestUrl != null) {
             String coreApiToken = this.config.getString(Const.Config.CoreApiTokenProp);
             boolean enforceHttps = this.config.getBoolean("enforce_https", true);
@@ -364,7 +364,7 @@ private Future<String> createPartnerConfigMonitor(String eventCloudSyncDownloade
     }
 
     private Future<String> createPartnerConfigMonitorV2(String eventCloudSyncDownloaded) {
-        final ICloudStorage fsMetadata, fsContent;
+        final DownloadCloudStorage fsMetadata, fsContent;
         if (this.fsOperatorKeyConfig instanceof UidCoreClient) {
             fsMetadata = this.fsOperatorKeyConfig;
             fsContent = ((UidCoreClient)this.fsOperatorKeyConfig).getContentStorage();

diff --git a/src/main/java/com/uid2/optout/vertx/PartnerConfigMonitorV2.java b/src/main/java/com/uid2/optout/vertx/PartnerConfigMonitorV2.java
@@ -5,6 +5,7 @@
 import com.uid2.optout.partner.PartnersConfig;
 import com.uid2.shared.Utils;
 import com.uid2.shared.auth.ClientKey;
+import com.uid2.shared.cloud.DownloadCloudStorage;
 import com.uid2.shared.cloud.ICloudStorage;
 import com.uid2.shared.store.reader.IMetadataVersionedStore;
 import io.vertx.core.CompositeFuture;
@@ -29,14 +30,14 @@ public class PartnerConfigMonitorV2 implements IMetadataVersionedStore {
 
     private final Vertx vertx;
     private final JsonObject globalConfig;
-    private final ICloudStorage metadataStorage;
-    private final ICloudStorage contentStorage;
+    private final DownloadCloudStorage metadataStorage;
+    private final DownloadCloudStorage contentStorage;
     private final String partnersMetadataPath;
     private final String eventCloudDownloaded;
     private final AtomicReference<Map<String, String>> senderDeploymentIds = new AtomicReference<>();
 
-    public PartnerConfigMonitorV2(Vertx vertx, JsonObject globalConfig, ICloudStorage metadataStorage,
-                                  ICloudStorage contentStorage, String eventCloudDownloaded) {
+    public PartnerConfigMonitorV2(Vertx vertx, JsonObject globalConfig, DownloadCloudStorage metadataStorage,
+                                  DownloadCloudStorage contentStorage, String eventCloudDownloaded) {
         this.vertx = vertx;
         this.globalConfig = globalConfig;
         this.metadataStorage = metadataStorage;