Merge remote-tracking branch 'origin/master' into fast-dev

tests/fast/stages/s1_vpcsc/data/vpc-sc/perimeters/default.yaml

@@ -12,18 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# yaml-language-server: $schema=../../../../../../../modules/vpc-sc/schemas/perimeters.schema.json
+# yaml-language-server: $schema=../../../../../../../modules/vpc-sc/schemas/perimeter.schema.json
 
 use_explicit_dry_run_spec: true
 spec:
   access_levels:
-    - geo_it
-    - identity_me
+    - $access_levels:geo_it
+    - $access_levels:identity_me
   ingress_policies:
-    - fast-org-log-sinks
-    - test
+    - $ingress_policies:fast-org-log-sinks
+    - $ingress_policies:test
   egress_policies:
-    - test
+    - $egress_policies:test
   restricted_services:
     - $service_sets:restricted_services
   resources:

tests/fast/stages/s1_vpcsc/simple.tfvars

@@ -24,9 +24,9 @@ perimeters = {
   default = {
     use_explicit_dry_run_spec = true
     spec = {
-      access_levels       = ["geo_it", "identity_me"]
-      egress_policies     = ["test"]
-      ingress_policies    = ["fast-org-log-sinks", "test"]
+      access_levels       = ["$access_levels:geo_it", "$access_levels:identity_me"]
+      egress_policies     = ["$egress_policies:test"]
+      ingress_policies    = ["$ingress_policies:fast-org-log-sinks", "$ingress_policies:test"]
       restricted_services = ["$service_sets:restricted_services"]
       resources = [
         "projects/1234567890"

tests/fast/stages/s2_project_factory/simple.tfvars

@@ -17,3 +17,8 @@ data_defaults = {
     storage = "europe-west1"
   }
 }
+organization = {
+  domain      = "fast.example.com"
+  id          = 123456789012
+  customer_id = "C00000000"
+}