Skip to content

xuy-UID2-5873-remove-gcp-vmid #349

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

Merged
clarkxuyang merged 1 commit into from
Oct 10, 2025
Merged

xuy-UID2-5873-remove-gcp-vmid #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 0 additions & 14 deletions src/main/java/com/uid2/core/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.uid2.core;

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

// try read GoogleCredentials
GoogleCredentials googleCredentials = CloudUtils.getGoogleCredentialsFromConfig(config);
if (googleCredentials != null) {
Set<String> enclaveParams = null;
String params = config.getString(Const.Config.GcpEnclaveParamsProp);
if (params != null) {
enclaveParams = Set.of(params.split(","));
}

// enable gcp-vmid attestation if requested
attestationService
.with("gcp-vmid", new GcpVmidCoreAttestationService(googleCredentials, enclaveParams));
}

var maaServerBaseUrl = ConfigStore.Global.getOrDefault(com.uid2.core.Const.Config.MaaServerBaseUrlProp, "https://sharedeus.eus.attest.azure.net");
attestationService.with("azure-cc", new AzureCCCoreAttestationService(maaServerBaseUrl, ConfigStore.Global.get(Const.Config.CorePublicUrlProp)));
Expand Down
6 changes: 0 additions & 6 deletions src/main/resources/com.uid2.core/test/enclaves/enclaves.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@
"identifier": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"created": 1620693995
},
{
"name": "debug-gcp-vmid",
"protocol": "gcp-vmid",
"identifier": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"created": 1620693995
},
{
"name": "debug-gcp-oidc",
"protocol": "gcp-oidc",
Expand Down
10 changes: 0 additions & 10 deletions src/main/resources/com.uid2.core/test/operators/operators.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,6 @@
"key_salt": "W0i/DcKwCqBGD3jN6dNTsFl+tp6akTc3LpEVRuK5OB0=",
"key_id": "test-partner-key"
},
{
"key": "test-gcp-key",
"name": "partner-gcp@uid2.com",
"contact": "partner-gcp@uid2.com",
"created": 1617149276,
"protocol": "gcp-vmid",
"key_hash": "+8Vp3bOKibg7PpWomCtolqZu3uRqR7G5DLcAwvt9n2ZqkWAdmPGoXuQMcEBAmE/nAslF7eA+VwXLp7zN40IZkA==",
"key_salt": "uJYzyAZujZ6QOatbwEB9/+/sgXe3jvPvYaULNANxgkQ=",
"key_id": "test-gcp-key"
},
{
"key": "test-gcp-key-2",
"name": "partner-gcp-2@uid2.com",
Expand Down