Sync main sept 17 feature branch resource identity (#15399)

Author: BBBmau

.ci/magician/cloudbuild/community.go

@@ -30,7 +30,8 @@ func (cb *Client) ApproveDownstreamGenAndTest(prNumber, commitSha string) error
 	}
 
 	if buildId == "" {
-		return fmt.Errorf("Failed to find pending build for PR %s", prNumber)
+		fmt.Printf("WARNING: Failed to find pending build for PR %s\nThis build may have been approved already.\n", prNumber)
+		return nil
 	}
 
 	err = approveBuild(PROJECT_ID, buildId)

.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/test_terraform_vcr.go

@@ -237,7 +237,6 @@ func execTestTerraformVCR(prNumber, mmCommitSha, buildID, projectID, buildStep,
 	}
 
 	notRunBeta, notRunGa := notRunTests(tpgRepo.UnifiedZeroDiff, tpgbRepo.UnifiedZeroDiff, replayingResult)
-
 	postReplayData := postReplay{
 		RunFullVCR:       runFullVCR,
 		AffectedServices: sort.StringSlice(servicesArr),

.ci/magician/github/membership_data.go

@@ -83,8 +83,8 @@ var (
 		"melinath": {
 			vacations: []Vacation{
 				{
-					startDate: newDate(2025, 6, 26),
-					endDate:   newDate(2025, 7, 7),
+					startDate: newDate(2025, 9, 17),
+					endDate:   newDate(2025, 9, 22),
 				},
 			},
 		},
@@ -140,13 +140,17 @@ var (
 					startDate: newDate(2025, 8, 7),
 					endDate:   newDate(2025, 8, 10),
 				},
+				{
+					startDate: newDate(2025, 9, 18),
+					endDate:   newDate(2025, 9, 28),
+				},
 			},
 		},
 		"zli82016": {
 			vacations: []Vacation{
 				{
-					startDate: newDate(2025, 1, 15),
-					endDate:   newDate(2025, 2, 9),
+					startDate: newDate(2025, 8, 27),
+					endDate:   newDate(2025, 9, 2),
 				},
 			},
 		},
@@ -155,7 +159,6 @@ var (
 	// This is for new team members who are onboarding
 	trustedContributors = map[string]struct{}{
 		"bbasata":           struct{}{},
-		"jaylonmcshan03":    struct{}{},
 		"malhotrasagar2212": struct{}{},
 	}
 )

.github/workflows/codeql.yml

@@ -30,7 +30,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@05963f47d870e2cb19a537396c1f668a348c7d8f # v3.24.8
+      uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -44,7 +44,7 @@ jobs:
     # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@05963f47d870e2cb19a537396c1f668a348c7d8f # v3.24.8
+      uses: github/codeql-action/autobuild@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -57,6 +57,6 @@ jobs:
     #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
       with:
         category: "/language:${{matrix.language}}"

docs/content/reference/field.md

@@ -107,12 +107,11 @@ Example:
 sensitive: true
 ```
 
-### `write_only`
-Set to true to enable write-only functionality for this field.
-If true, the write-only fields will be automatically generated by the code generator (`<field_name>_wo` and `<field_name>_wo_version`). 
-When the write-only variant of a field is used, it means that its value will be obscured in Terraform output as well as not be stored in state. 
-This field is meant to replace `sensitive` as it doesn't store the value in state. 
-See [Ephemerality in Resources - Use Write-only arguments](https://developer.hashicorp.com/terraform/language/resources/ephemeral/write-only) for more information.
+### `write_only_legacy` (deprecated)
+If true, the field is considered "write-only", which means that its value will
+be obscured in Terraform output as well as not be stored in state. This field is meant to replace `sensitive` as it doesn't store the value in state.
+See [Ephemerality in Resources - Use Write-only arguments](https://developer.hashicorp.com/terraform/language/resources/ephemeral/write-only)
+for more information.
 
 Write-only fields are only supported in Terraform v1.11+. Because the provider supports earlier Terraform versions, write only fields must be paired with (mutually exclusive) `sensitive` fields covering the same functionality for compatibility with those older versions.
 This field cannot be used in conjuction with `immutable` or `sensitive`.
@@ -122,9 +121,11 @@ This field cannot be used in conjuction with `immutable` or `sensitive`.
 Example:
 
 ```yaml
-write_only: true
+write_only_legacy: true
 ```
 
+**Deprecated**: This field is deprecated and will be removed in a future release.
+
 ### `ignore_read`
 If true, the provider sets the field's value in the resource state based only
 on the user's configuration. If false or unset, the provider sets the field's