fix(securitycenter): issues related to flaky tests in SHA & ETD

securitycenter/go.mod

@@ -12,6 +12,7 @@ require (
 	github.com/google/uuid v1.6.0
 	google.golang.org/api v0.196.0
 	google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1
+	google.golang.org/grpc v1.66.0
 	google.golang.org/protobuf v1.34.2
 )
 
@@ -44,5 +45,4 @@ require (
 	golang.org/x/time v0.6.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
-	google.golang.org/grpc v1.66.0 // indirect
 )

securitycenter/management_api/create_security_health_analytics_custom_module.go

@@ -20,11 +20,11 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"math/rand"
-	"time"
+	"regexp"
 
 	securitycentermanagement "cloud.google.com/go/securitycentermanagement/apiv1"
 	securitycentermanagementpb "cloud.google.com/go/securitycentermanagement/apiv1/securitycentermanagementpb"
+	"github.com/google/uuid"
 	expr "google.golang.org/genproto/googleapis/type/expr"
 )
 
@@ -42,10 +42,12 @@ func createSecurityHealthAnalyticsCustomModule(w io.Writer, parent string) error
 	}
 	defer client.Close()
 
-	// Seed the random number generator
-	rand.Seed(time.Now().UnixNano())
-	// Generate a unique suffix
-	uniqueSuffix := fmt.Sprintf("%d_%d", time.Now().Unix(), rand.Intn(1000))
+	uniqueSuffix := uuid.New().String()
+
+	// Remove invalid characters (anything that isn't alphanumeric or an underscore)
+	re := regexp.MustCompile(`[^a-zA-Z0-9_]`)
+	uniqueSuffix = re.ReplaceAllString(uniqueSuffix, "_")
+
 	// Create unique display name
 	displayName := fmt.Sprintf("go_sample_sha_custom_module_%s", uniqueSuffix)
 

securitycenter/management_api/event_threat_detection/create_event_threat_detection_custom_module.go

@@ -20,11 +20,10 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"math/rand"
-	"time"
 
 	securitycentermanagement "cloud.google.com/go/securitycentermanagement/apiv1"
 	securitycentermanagementpb "cloud.google.com/go/securitycentermanagement/apiv1/securitycentermanagementpb"
+	"github.com/google/uuid"
 	"google.golang.org/protobuf/types/known/structpb"
 )
 
@@ -42,10 +41,7 @@ func createEventThreatDetectionCustomModule(w io.Writer, parent string) error {
 	}
 	defer client.Close()
 
-	// Seed the random number generator
-	rand.Seed(time.Now().UnixNano())
-	// Generate a unique suffix
-	uniqueSuffix := fmt.Sprintf("%d-%d", time.Now().Unix(), rand.Intn(1000))
+	uniqueSuffix := uuid.New().String()
 	// Create unique display name
 	displayName := fmt.Sprintf("go_sample_etd_custom_module_%s", uniqueSuffix)