Merge branch 'master' into ap-patch-tpg

Author: apeabody

.github/conventional-commit-lint.yaml

@@ -1,4 +1,4 @@
-# Copyright 2022 Google LLC
+# Copyright 2022-2023 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,5 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# NOTE: This file is automatically generated from:
+# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/github
+
 enabled: true
 always_check_pr_title: true

CODEOWNERS

@@ -1 +1,4 @@
+# NOTE: This file is automatically generated from values at:
+# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/org/locals.tf
+
 * @terraform-google-modules/cft-admins @Jberlinsky @ericyz