Skip to content

Commit f1969cc

Browse files
added identity environment scope to remote config
1 parent 3ddbc6a commit f1969cc

20 files changed

Lines changed: 217 additions & 74 deletions

conf/local-config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,6 @@
4242
"encrypted_files": false,
4343
"disable_optout_token": true,
4444
"enable_remote_config": false,
45-
"uid_instance_id_prefix": "local-operator"
45+
"uid_instance_id_prefix": "local-operator",
46+
"identity_environment": "test"
4647
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,6 @@
3232
"salts_expired_shutdown_hours": 12,
3333
"operator_type": "private",
3434
"enable_remote_config": false,
35-
"uid_instance_id_prefix": "local-private-operator"
35+
"uid_instance_id_prefix": "local-private-operator",
36+
"identity_environment": "test"
3637
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,6 @@
3939
"operator_type": "public",
4040
"disable_optout_token": true,
4141
"enable_remote_config": false,
42-
"uid_instance_id_prefix": "local-public-operator"
42+
"uid_instance_id_prefix": "local-public-operator",
43+
"identity_environment": "test"
4344
}

conf/local-e2e-private-config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,6 @@
4343
"salts_expired_shutdown_hours": 12,
4444
"operator_type": "private",
4545
"enable_remote_config": false,
46-
"uid_instance_id_prefix": "local-private-operator"
46+
"uid_instance_id_prefix": "local-private-operator",
47+
"identity_environment": "test"
4748
}

conf/local-e2e-public-config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,6 @@
4545
"operator_type": "public",
4646
"disable_optout_token": true,
4747
"enable_remote_config": false,
48-
"uid_instance_id_prefix": "local-public-operator"
48+
"uid_instance_id_prefix": "local-public-operator",
49+
"identity_environment": "test"
4950
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,6 @@
4444
},
4545
"disable_optout_token": true,
4646
"enable_remote_config": false,
47-
"uid_instance_id_prefix": "local-public-operator"
47+
"uid_instance_id_prefix": "local-public-operator",
48+
"identity_environment": "test"
4849
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,7 @@ public class Config extends com.uid2.shared.Const.Config {
3636
public static final String DisableOptoutTokenProp = "disable_optout_token";
3737
public static final String EnableRemoteConfigProp = "enable_remote_config";
3838
public static final String RuntimeConfigMetadataPathProp = "runtime_config_metadata_path";
39+
40+
public static final String IdentityEnvironmentProp = "identity_environment";
3941
}
4042
}
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package com.uid2.operator.model;
2+
3+
import com.fasterxml.jackson.annotation.JsonCreator;
4+
import com.uid2.operator.vertx.ClientInputValidationException;
5+
6+
public enum IdentityEnvironment {
7+
TEST(0), INTEG(1), PROD(2);
8+
9+
public final int value;
10+
11+
IdentityEnvironment(int value) {
12+
this.value = value;
13+
}
14+
15+
public static IdentityEnvironment fromValue(int value) {
16+
return switch (value) {
17+
case 0 -> TEST;
18+
case 1 -> INTEG;
19+
case 2 -> PROD;
20+
default -> throw new ClientInputValidationException("Invalid valid for IdentityEnvironment: " + value);
21+
};
22+
}
23+
24+
@JsonCreator
25+
public static IdentityEnvironment fromString(String value) {
26+
return switch (value.toLowerCase()) {
27+
case "test" -> TEST;
28+
case "integ" -> INTEG;
29+
case "prod" -> PROD;
30+
default -> throw new ClientInputValidationException("Invalid valid for IdentityEnvironment: " + value);
31+
};
32+
}
33+
}

src/main/java/com/uid2/operator/model/IdentityRequest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,18 @@ public final class IdentityRequest {
44
public final PublisherIdentity publisherIdentity;
55
public final UserIdentity userIdentity;
66
public final OptoutCheckPolicy optoutCheckPolicy;
7+
public final IdentityEnvironment identityEnvironment;
78

89
public IdentityRequest(
910
PublisherIdentity publisherIdentity,
1011
UserIdentity userIdentity,
11-
OptoutCheckPolicy tokenGeneratePolicy)
12+
OptoutCheckPolicy tokenGeneratePolicy,
13+
IdentityEnvironment identityEnvironment)
1214
{
1315
this.publisherIdentity = publisherIdentity;
1416
this.userIdentity = userIdentity;
1517
this.optoutCheckPolicy = tokenGeneratePolicy;
18+
this.identityEnvironment = identityEnvironment;
1619
}
1720

1821
public boolean shouldCheckOptOut() {

src/main/java/com/uid2/operator/model/MapRequest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,18 @@ public final class MapRequest {
66
public final UserIdentity userIdentity;
77
public final OptoutCheckPolicy optoutCheckPolicy;
88
public final Instant asOf;
9+
public final IdentityEnvironment identityEnvironment;
910

1011
public MapRequest(
1112
UserIdentity userIdentity,
1213
OptoutCheckPolicy optoutCheckPolicy,
13-
Instant asOf)
14+
Instant asOf,
15+
IdentityEnvironment identityEnvironment)
1416
{
1517
this.userIdentity = userIdentity;
1618
this.optoutCheckPolicy = optoutCheckPolicy;
1719
this.asOf = asOf;
20+
this.identityEnvironment = identityEnvironment;
1821
}
1922

2023
public boolean shouldCheckOptOut() {

0 commit comments

Comments
 (0)