Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Aul UI d2 646 upgrade operator #16

Merged
merged 2 commits into from
Feb 1, 2023
Merged

Aul UI d2 646 upgrade operator #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39d4f4e
UidCoreClient no longer extends full ICloudStorage interface but onl…
aulme Jan 27, 2023
8f1155c
Upgrade Shared to latest
aulme Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion conf/local-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/uid2/optout/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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();
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/com/uid2/optout/vertx/PartnerConfigMonitorV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down