Added NewTdxAdapter.

Author: arvind5

go-tdx/tdx_adapter.go

@@ -1,5 +1,5 @@
 /*
- *   Copyright (c) 2022-2024 Intel Corporation
+ *   Copyright (c) 2022-2025 Intel Corporation
  *   All rights reserved.
  *   SPDX-License-Identifier: BSD-3-Clause
  */
@@ -27,6 +27,15 @@ type compositeTdxEvidence struct {
 	VerifierNonce *connector.VerifierNonce `json:"verifier_nonce,omitempty"`
 }
 
+// NewTdxAdapter returns a new TDX Adapter instance
+func NewTdxAdapter(udata []byte, withCcel bool) (connector.EvidenceAdapter, error) {
+	return &tdxAdapter{
+		uData:            udata,
+		withCcel:         withCcel,
+		cfsQuoteProvider: &cfsQuoteProviderImpl{},
+	}, nil
+}
+
 // CollectEvidence is used to get TDX quote using TDX Quote Generation service
 func (adapter *tdxAdapter) CollectEvidence(nonce []byte) (*connector.Evidence, error) {
 

go-tdx/tdx_adapter_test.go

@@ -1,12 +1,13 @@
 /*
- *   Copyright (c) 2022-2024 Intel Corporation
+ *   Copyright (c) 2022-2025 Intel Corporation
  *   All rights reserved.
  *   SPDX-License-Identifier: BSD-3-Clause
  */
 
 package tdx
 
 import (
+	"bytes"
 	"testing"
 
 	"github.com/intel/trustauthority-client/go-connector"
@@ -146,6 +147,30 @@ func TestCompositeAdapterNew(t *testing.T) {
 	}
 }
 
+func TestTdxAdapterNew(t *testing.T) {
+	udata := []byte("userdata")
+	adapter, err := NewTdxAdapter(udata, false)
+	if err != nil {
+		t.Errorf("Error: %v", err)
+	}
+
+	if adapter == nil {
+		t.Errorf("expected adapter")
+	}
+
+	if bytes.Equal(adapter.(*tdxAdapter).uData, udata) == false {
+		t.Errorf("expected uData to match")
+	}
+
+	if adapter.(*tdxAdapter).withCcel != false {
+		t.Errorf("expected withCcel to be false")
+	}
+
+	if adapter.(*tdxAdapter).cfsQuoteProvider == nil {
+		t.Errorf("expected cfsQuoteProvider")
+	}
+}
+
 type MockCfsQuoteProvider struct {
 	mock.Mock
 }

tdx-cli/cmd/token.go

@@ -13,10 +13,13 @@ import (
 	"fmt"
 	"os"
 	"regexp"
+	"strings"
 
 	"github.com/golang-jwt/jwt/v4"
 	"github.com/google/uuid"
+	"github.com/intel/trustauthority-client/go-aztdx"
 	"github.com/intel/trustauthority-client/go-connector"
+	"github.com/intel/trustauthority-client/go-tdx"
 	"github.com/intel/trustauthority-client/go-tpm"
 	"github.com/intel/trustauthority-client/tdx-cli/constants"
 	"github.com/pkg/errors"
@@ -281,12 +284,24 @@ func getToken(cmd *cobra.Command,
 		return err
 	}
 
-	evidence, err := evidenceBuilder.Build()
+	_, err = evidenceBuilder.Build()
 	if err != nil {
 		return err
 	}
 
-	response, err := trustAuthorityConnector.AttestEvidence(evidence, config.CloudProvider, reqId)
+	var adapter connector.EvidenceAdapter
+	if strings.ToLower(config.CloudProvider) == CloudProviderAzure {
+		tpmFactory := tpm.NewTpmFactory()
+		adapter, err = aztdx.NewAzureTdxAdapter(tpmFactory, userDataBytes)
+	} else {
+		adapter, err = tdx.NewTdxAdapter(userDataBytes, withCcel)
+	}
+	if err != nil {
+		return errors.Wrap(err, "Error while creating tdx adapter")
+	}
+
+	response, err := trustAuthorityConnector.Attest(connector.AttestArgs{Adapter: adapter, PolicyIds: pIds, RequestId: reqId, TokenSigningAlg: tokenSigningAlg, PolicyMustMatch: policyMustMatch})
+	//response, err := trustAuthorityConnector.AttestEvidence(evidence, config.CloudProvider, reqId)
 	if response.Headers != nil {
 		fmt.Fprintln(os.Stderr, "Trace Id:", response.Headers.Get(connector.HeaderTraceId))
 		if reqId != "" {