Merge branch 'FEATURE-BRANCH-resource-identity-generation' into mmv1/identity-generation

Author: BBBmau

.ci/infra/terraform/main.tf

@@ -334,6 +334,7 @@ module "project-services" {
     "resourceviews.googleapis.com",
     "run.googleapis.com",
     "runtimeconfig.googleapis.com",
+    "saasservicemgmt.googleapis.com",
     "secretmanager.googleapis.com",
     "securesourcemanager.googleapis.com",
     "securetoken.googleapis.com",

.ci/magician/cmd/collect_nightly_test_status.go

@@ -30,24 +30,25 @@ import (
 )
 
 const (
-	NightlyDataBucket = "nightly-test-data"
+	nightlyDataBucket = "nightly-test-data"
+	tcTimeFormat      = "20060102T150405Z0700"
 )
 
 var cntsRequiredEnvironmentVariables = [...]string{
 	"TEAMCITY_TOKEN",
 }
 
 type TestInfo struct {
-	Name            string `json:"name"`
-	Status          string `json:"status"`
-	Service         string `json:"service"`
-	ErrorMessage    string `json:"error_message"`
-	LogLink         string `json"log_link`
-	ProviderVersion string `json:"provider_version"`
-	QueuedDate      string `json:"queuedDate"`
-	StartDate       string `json:"startDate"`
-	FinishDate      string `json:"finishDate"`
-	Duration        int    `json:"duration"`
+	Name            string    `json:"name"`
+	Status          string    `json:"status"`
+	Service         string    `json:"service"`
+	ErrorMessage    string    `json:"error_message"`
+	LogLink         string    `json:"log_link"`
+	ProviderVersion string    `json:"provider_version"`
+	QueuedDate      time.Time `json:"queued_date"`
+	StartDate       time.Time `json:"start_date"`
+	FinishDate      time.Time `json:"finish_date"`
+	Duration        int       `json:"duration"`
 }
 
 // collectNightlyTestStatusCmd represents the collectNightlyTestStatus command
@@ -168,17 +169,31 @@ func createTestReport(pVersion provider.Version, tc TeamcityClient, gcs Cloudsto
 			if testResult.Status == "FAILURE" || testResult.Status == "UNKNOWN" {
 				errorMessage = convertErrorMessage(testResult.ErrorMessage)
 			}
+
+			queuedTime, err := time.Parse(tcTimeFormat, build.QueuedDate)
+			if err != nil {
+				return fmt.Errorf("failed to parse QueuedDate: %v", err)
+			}
+			startTime, err := time.Parse(tcTimeFormat, build.StartDate)
+			if err != nil {
+				return fmt.Errorf("failed to parse StartDate: %v", err)
+			}
+			finishTime, err := time.Parse(tcTimeFormat, build.FinishDate)
+			if err != nil {
+				return fmt.Errorf("failed to parse FinishDate: %v", err)
+			}
+
 			testInfoList = append(testInfoList, TestInfo{
 				Name:            testResult.Name,
 				Status:          testResult.Status,
 				Service:         serviceName,
 				ErrorMessage:    errorMessage,
 				LogLink:         logLink,
-				ProviderVersion: pVersion.String(),
+				ProviderVersion: strings.ToUpper(pVersion.String()),
 				Duration:        testResult.Duration,
-				QueuedDate:      build.QueuedDate,
-				StartDate:       build.StartDate,
-				FinishDate:      build.FinishDate,
+				QueuedDate:      queuedTime,
+				StartDate:       startTime,
+				FinishDate:      finishTime,
 			})
 		}
 	}
@@ -193,7 +208,7 @@ func createTestReport(pVersion provider.Version, tc TeamcityClient, gcs Cloudsto
 
 	// Upload test status data file to gcs bucket
 	objectName := fmt.Sprintf("test-metadata/%s/%s", pVersion.String(), testStatusFileName)
-	err = gcs.WriteToGCSBucket(NightlyDataBucket, objectName, testStatusFileName)
+	err = gcs.WriteToGCSBucket(nightlyDataBucket, objectName, testStatusFileName)
 	if err != nil {
 		return err
 	}

.ci/magician/cmd/create_test_failure_ticket.go

@@ -268,7 +268,7 @@ func getTestInfoList(pVersion provider.Version, date time.Time, gcs Cloudstorage
 	objectName := fmt.Sprintf("test-metadata/%s/%s", pVersion.String(), testStatusFileName)
 
 	var testInfoList []TestInfo
-	err := gcs.DownloadFile(NightlyDataBucket, objectName, testStatusFileName)
+	err := gcs.DownloadFile(nightlyDataBucket, objectName, testStatusFileName)
 	if err != nil {
 		return testInfoList, err
 	}
@@ -506,13 +506,13 @@ func storeErrorMessage(pVersion provider.Version, gcs CloudstorageClient, errorM
 
 	// upload file to GCS
 	objectName := fmt.Sprintf("test-errors/%s/%s/%s", pVersion.String(), date, fileName)
-	err = gcs.WriteToGCSBucket(NightlyDataBucket, objectName, fileName)
+	err = gcs.WriteToGCSBucket(nightlyDataBucket, objectName, fileName)
 	if err != nil {
 		return "", fmt.Errorf("failed to upload error message file %s to GCS bucket: %w", objectName, err)
 	}
 
 	// compute object view path
-	link := fmt.Sprintf("https://storage.cloud.google.com/%s/%s", NightlyDataBucket, objectName)
+	link := fmt.Sprintf("https://storage.cloud.google.com/%s/%s", nightlyDataBucket, objectName)
 	return link, nil
 }
 

.ci/magician/cmd/templates/vcr/post_replay.tmpl

@@ -31,6 +31,7 @@ None
 {{end}}
 </blockquote>
 </details>
+
 {{ if gt (len .ReplayingResult.FailedTests) 0 -}}
 #### Action taken
 <details>
@@ -52,4 +53,4 @@ None
 {{- end}}
 
 View the [build log](https://storage.cloud.google.com/{{.LogBucket}}/{{.Version}}/refs/heads/{{.Head}}/artifacts/{{.BuildID}}/build-log/replaying_test.log)
-{{- end}}
+{{- end}}

.ci/magician/cmd/templates/vcr/post_replay_eap.tmpl

@@ -0,0 +1,46 @@
+{{- if or (gt (len .NotRunBetaTests) 0) (gt (len .NotRunGATests) 0)}}
+#### Non-exercised tests
+
+{{if gt (len .NotRunBetaTests) 0 -}}
+{{color "red" "Tests were added that are skipped in VCR:"}}
+{{range .NotRunBetaTests}}{{. | printf "- %s\n"}}{{end}}
+{{end}}
+
+{{if gt (len .NotRunGATests) 0 -}}
+{{color "red" "Tests were added that are GA-only additions and require manual runs:"}}
+{{range .NotRunGATests}}{{. | printf "- %s\n"}}{{end}}
+{{end}}
+{{end}}
+#### Tests analytics
+Total tests: {{add (add (len .ReplayingResult.PassedTests) (len .ReplayingResult.SkippedTests)) (len .ReplayingResult.FailedTests) }}
+Passed tests: {{len .ReplayingResult.PassedTests}}
+Skipped tests: {{len .ReplayingResult.SkippedTests}}
+Affected tests: {{len .ReplayingResult.FailedTests}}
+
+Affected service packages:
+{{if .RunFullVCR}}
+All service packages are affected
+{{else if gt (len .AffectedServices) 0}}
+{{range .AffectedServices}}
+`{{.}}` {{/* remove trailing whitespace */ -}}
+{{end}}
+{{else}}
+None
+{{end}}
+{{ if gt (len .ReplayingResult.FailedTests) 0 -}}
+#### Action taken
+Found {{len .ReplayingResult.FailedTests}} affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Affected tests:
+{{range .ReplayingResult.FailedTests}}
+`{{.}}` {{/* remove trailing whitespace */ -}}
+{{end}}
+
+[Get to know how VCR tests work](https://googlecloudplatform.github.io/magic-modules/develop/test/test/)
+{{ else -}}
+{{- if .ReplayingErr -}}
+{{color "red" "Errors occurred during REPLAYING mode. Please fix them to complete your PR."}}
+{{- else -}}
+{{color "green" "All tests passed!"}}
+{{- end}}
+
+View the [build log](https://storage.cloud.google.com/{{.LogBucket}}/{{.Version}}/refs/heads/{{.Head}}/artifacts/{{.BuildID}}/build-log/replaying_test.log)
+{{- end}}

.ci/magician/cmd/test_eap_vcr.go

@@ -15,6 +15,11 @@ import (
 	"github.com/spf13/cobra"
 )
 
+var (
+	//go:embed templates/vcr/post_replay_eap.tmpl
+	postReplayEAPTmplText string
+)
+
 var tevRequiredEnvironmentVariables = [...]string{
 	"GEN_PATH",
 	"GOCACHE",
@@ -31,7 +36,6 @@ var tevRequiredEnvironmentVariables = [...]string{
 	"GOOGLE_IMPERSONATE_SERVICE_ACCOUNT",
 	"KOKORO_ARTIFACTS_DIR",
 	"HOME",
-	"MODIFIED_FILE_PATH",
 	"PATH",
 	"USER",
 }
@@ -125,7 +129,7 @@ The following environment variables are required:
 			return fmt.Errorf("wrong number of arguments %d, expected 1", len(args))
 		}
 
-		return execTestEAPVCR(args[0], env["GEN_PATH"], env["KOKORO_ARTIFACTS_DIR"], env["MODIFIED_FILE_PATH"], rnr, vt)
+		return execTestEAPVCR(args[0], env["GEN_PATH"], env["KOKORO_ARTIFACTS_DIR"], rnr, vt)
 	},
 }
 
@@ -137,7 +141,7 @@ func listTEVEnvironmentVariables() string {
 	return result
 }
 
-func execTestEAPVCR(changeNumber, genPath, kokoroArtifactsDir, modifiedFilePath string, rnr ExecRunner, vt *vcr.Tester) error {
+func execTestEAPVCR(changeNumber, genPath, kokoroArtifactsDir string, rnr ExecRunner, vt *vcr.Tester) error {
 	vt.SetRepoPath(provider.Private, genPath)
 	if err := rnr.PushDir(genPath); err != nil {
 		return fmt.Errorf("error changing to gen path: %w", err)
@@ -190,7 +194,7 @@ func execTestEAPVCR(changeNumber, genPath, kokoroArtifactsDir, modifiedFilePath
 		Version:          provider.Private.String(),
 		Head:             head,
 	}
-	comment, err := formatPostReplay(postReplayData)
+	comment, err := formatPostReplayEAP(postReplayData)
 	if err != nil {
 		return fmt.Errorf("error formatting post replay comment: %w", err)
 	}
@@ -291,3 +295,7 @@ View the [build log](https://storage.cloud.google.com/ci-vcr-logs/%s/refs/heads/
 func init() {
 	rootCmd.AddCommand(testEAPVCRCmd)
 }
+
+func formatPostReplayEAP(data postReplay) (string, error) {
+	return formatComment("post_replay_eap.tmpl", postReplayEAPTmplText, data)
+}