Skip to content

Commit 1bc1d5e

Browse files
authored
xuy-UID2-5873-remove-gcp-vmid (#349)
1 parent 875fe66 commit 1bc1d5e

File tree

3 files changed

+0
-30
lines changed

3 files changed

+0
-30
lines changed

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.uid2.core;
22

3-
import com.google.auth.oauth2.GoogleCredentials;
43
import com.uid2.core.model.ConfigStore;
54
import com.uid2.core.model.Constants;
65
import com.uid2.core.model.SecretStore;
@@ -131,19 +130,6 @@ public static void main(String[] args) {
131130
.with("trusted", new TrustedCoreAttestationService())
132131
.with("aws-nitro", new NitroCoreAttestationService(new InMemoryAWSCertificateStore(), corePublicUrl));
133132

134-
// try read GoogleCredentials
135-
GoogleCredentials googleCredentials = CloudUtils.getGoogleCredentialsFromConfig(config);
136-
if (googleCredentials != null) {
137-
Set<String> enclaveParams = null;
138-
String params = config.getString(Const.Config.GcpEnclaveParamsProp);
139-
if (params != null) {
140-
enclaveParams = Set.of(params.split(","));
141-
}
142-
143-
// enable gcp-vmid attestation if requested
144-
attestationService
145-
.with("gcp-vmid", new GcpVmidCoreAttestationService(googleCredentials, enclaveParams));
146-
}
147133

148134
var maaServerBaseUrl = ConfigStore.Global.getOrDefault(com.uid2.core.Const.Config.MaaServerBaseUrlProp, "https://sharedeus.eus.attest.azure.net");
149135
attestationService.with("azure-cc", new AzureCCCoreAttestationService(maaServerBaseUrl, ConfigStore.Global.get(Const.Config.CorePublicUrlProp)));

src/main/resources/com.uid2.core/test/enclaves/enclaves.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@
55
"identifier": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
66
"created": 1620693995
77
},
8-
{
9-
"name": "debug-gcp-vmid",
10-
"protocol": "gcp-vmid",
11-
"identifier": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
12-
"created": 1620693995
13-
},
148
{
159
"name": "debug-gcp-oidc",
1610
"protocol": "gcp-oidc",

src/main/resources/com.uid2.core/test/operators/operators.json

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,6 @@
2626
"key_salt": "W0i/DcKwCqBGD3jN6dNTsFl+tp6akTc3LpEVRuK5OB0=",
2727
"key_id": "test-partner-key"
2828
},
29-
{
30-
"key": "test-gcp-key",
31-
"name": "[email protected]",
32-
"contact": "[email protected]",
33-
"created": 1617149276,
34-
"protocol": "gcp-vmid",
35-
"key_hash": "+8Vp3bOKibg7PpWomCtolqZu3uRqR7G5DLcAwvt9n2ZqkWAdmPGoXuQMcEBAmE/nAslF7eA+VwXLp7zN40IZkA==",
36-
"key_salt": "uJYzyAZujZ6QOatbwEB9/+/sgXe3jvPvYaULNANxgkQ=",
37-
"key_id": "test-gcp-key"
38-
},
3929
{
4030
"key": "test-gcp-key-2",
4131
"name": "[email protected]",

0 commit comments

Comments
 (0)