tgc-revival: use timestamp in check function of each test step to read CAI asset (#14681) (#23850)

[upstream:20ae9538038b4ac6eaef62bf4243af6bf3cc6048]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

google/acctest/tgc_utils.go

@@ -24,6 +24,7 @@ import (
 	"regexp"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
@@ -43,11 +44,14 @@ type ImportMetadata struct {
 	IgnoredFields []string `json:"ignored_fields,omitempty"`
 }
 
+// The metadata for each step in one test
 type TgcMetadataPayload struct {
 	TestName         string                      `json:"test_name"`
+	StepNumber       int                         `json:"step_number"`
 	RawConfig        string                      `json:"raw_config"`
 	ResourceMetadata map[string]ResourceMetadata `json:"resource_metadata"`
 	PrimaryResource  string                      `json:"primary_resource"`
+	CaiReadTime      time.Time                   `json:"cai_read_time"`
 }
 
 // PROJECT_NUMBER instead of PROJECT_ID is in the CAI asset names for the resources in those services
@@ -88,6 +92,8 @@ func encodeToBase64JSON(data interface{}) (string, error) {
 // CollectAllTgcMetadata collects metadata for all resources in a test step
 func CollectAllTgcMetadata(tgcPayload TgcMetadataPayload) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
+		tgcPayload.CaiReadTime = time.Now()
+
 		projectId := envvar.GetTestProjectFromEnv()
 		projectNumber := envvar.GetTestProjectNumberFromEnv()
 
@@ -134,12 +140,14 @@ func CollectAllTgcMetadata(tgcPayload TgcMetadataPayload) resource.TestCheckFunc
 			tgcPayload.ResourceMetadata[address] = metadata
 		}
 
+		log.Printf("[DEBUG] tgcPayload caireadtime %s", tgcPayload.CaiReadTime)
+
 		// Encode the entire payload to base64 JSON
 		encodedData, err := encodeToBase64JSON(tgcPayload)
 		if err != nil {
-			log.Printf("[DEBUG]TGC Terraform error: %v", err)
+			log.Printf("[DEBUG]test_step_number=%d TGC Terraform error: %v", tgcPayload.StepNumber, err)
 		} else {
-			log.Printf("[DEBUG]TGC Terraform metadata: %s", encodedData)
+			log.Printf("[DEBUG]test_step_number=%d TGC Terraform metadata: %s", tgcPayload.StepNumber, encodedData)
 		}
 
 		return nil
@@ -209,20 +217,10 @@ func determineImportMetadata(steps []resource.TestStep, currentStepIndex int, re
 func extendWithTGCData(t *testing.T, c resource.TestCase) resource.TestCase {
 	var updatedSteps []resource.TestStep
 
-	// Find the last non-plan config step
-	lastNonPlanConfigStep := -1
-	for i := len(c.Steps) - 1; i >= 0; i-- {
-		step := c.Steps[i]
-		if step.Config != "" && !step.PlanOnly {
-			lastNonPlanConfigStep = i
-			break
-		}
-	}
-
 	// Process all steps
 	for i, step := range c.Steps {
-		// If this is the last non-plan config step, add our TGC check
-		if i == lastNonPlanConfigStep {
+		// If this is a non-plan config step, add our TGC check
+		if step.Config != "" && !step.PlanOnly {
 			// Parse resources from the config
 			resources := parseResources(step.Config)
 
@@ -246,6 +244,7 @@ func extendWithTGCData(t *testing.T, c resource.TestCase) resource.TestCase {
 			// Create the consolidated TGC payload
 			tgcPayload := TgcMetadataPayload{
 				TestName:         t.Name(),
+				StepNumber:       i + 1, // Step number starts from 1
 				RawConfig:        step.Config,
 				ResourceMetadata: resourceMetadata,
 			}