Additional module schemas (#2494)

* resman modules

* billing account

* net-vpc subnets

* fast schemas and subnet validation

fast/stages/0-bootstrap/data/custom-roles/gcve_network_admin.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# yaml-language-server: $schema=../../../../../modules/organization/schemas/custom-role.schema.json
+# yaml-language-server: $schema=../../schemas/custom-role.schema.json
 
 name: gcveNetworkAdmin
 includedPermissions:

fast/stages/0-bootstrap/data/custom-roles/network_firewall_policies_admin.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# yaml-language-server: $schema=../../../../../modules/organization/schemas/custom-role.schema.json
+# yaml-language-server: $schema=../../schemas/custom-role.schema.json
 
 name: networkFirewallPoliciesAdmin
 includedPermissions:

fast/stages/0-bootstrap/data/custom-roles/ngfw_enterprise_admin.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# yaml-language-server: $schema=../../../../../modules/organization/schemas/custom-role.schema.json
+# yaml-language-server: $schema=../../schemas/custom-role.schema.json
 
 name: ngfwEnterpriseAdmin
 includedPermissions:

fast/stages/0-bootstrap/data/custom-roles/organization_admin_viewer.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# yaml-language-server: $schema=../../../../../modules/organization/schemas/custom-role.schema.json
+# yaml-language-server: $schema=../../schemas/custom-role.schema.json
 # this is used by the plan-only admin SA
 
 name: organizationAdminViewer

fast/stages/0-bootstrap/data/custom-roles/organization_iam_admin.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# yaml-language-server: $schema=../../../../../modules/organization/schemas/custom-role.schema.json
+# yaml-language-server: $schema=../../schemas/custom-role.schema.json
 # this is needed for use in additive IAM bindings, to avoid conflicts
 
 name: organizationIamAdmin

fast/stages/0-bootstrap/data/custom-roles/service_project_network_admin.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# yaml-language-server: $schema=../../../../../modules/organization/schemas/custom-role.schema.json
+# yaml-language-server: $schema=../../schemas/custom-role.schema.json
 
 name: serviceProjectNetworkAdmin
 includedPermissions:

fast/stages/0-bootstrap/data/custom-roles/storage_viewer.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# yaml-language-server: $schema=../../../../../modules/organization/schemas/custom-role.schema.json
+# yaml-language-server: $schema=../../schemas/custom-role.schema.json
 # the following permissions are a descoped version of storage.admin
 
 name: storageViewer

fast/stages/0-bootstrap/data/custom-roles/tag_viewer.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# yaml-language-server: $schema=../../../../../modules/organization/schemas/custom-role.schema.json
+# yaml-language-server: $schema=../../schemas/custom-role.schema.json
 # the following permissions are a descoped version of tagAdm
 
 name: tagViewer

fast/stages/0-bootstrap/data/custom-roles/tenant_network_admin.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# yaml-language-server: $schema=../../../../../modules/organization/schemas/custom-role.schema.json
+# yaml-language-server: $schema=../../schemas/custom-role.schema.json
 
 name: tenantNetworkAdmin
 includedPermissions:

fast/stages/0-bootstrap/data/org-policies/compute.yaml

@@ -16,7 +16,7 @@
 # sample subset of useful organization policies, edit to suit requirements
 # start of document (---) avoids errors if the file only contains comments
 
-# yaml-language-server: $schema=../../../../../modules/organization/schemas/org-policies.schema.json
+# yaml-language-server: $schema=../../schemas/org-policies.schema.json
 
 compute.disableGuestAttributesAccess:
   rules:

fast/stages/0-bootstrap/data/org-policies/gcp.yaml

@@ -16,7 +16,7 @@
 # sample subset of useful organization policies, edit to suit requirements
 # start of document (---) avoids errors if the file only contains comments
 
-# yaml-language-server: $schema=../../../../../modules/organization/schemas/org-policies.schema.json
+# yaml-language-server: $schema=../../schemas/org-policies.schema.json
 
 # gcp.resourceLocations:
 #   rules:

fast/stages/0-bootstrap/data/org-policies/iam.yaml

@@ -16,7 +16,7 @@
 # sample subset of useful organization policies, edit to suit requirements
 # start of document (---) avoids errors if the file only contains comments
 
-# yaml-language-server: $schema=../../../../../modules/organization/schemas/org-policies.schema.json
+# yaml-language-server: $schema=../../schemas/org-policies.schema.json
 
 iam.automaticIamGrantsForDefaultServiceAccounts:
   rules:

fast/stages/0-bootstrap/data/org-policies/serverless.yaml

@@ -16,7 +16,7 @@
 # sample subset of useful organization policies, edit to suit requirements
 # start of document (---) avoids errors if the file only contains comments
 
-# yaml-language-server: $schema=../../../../../modules/organization/schemas/org-policies.schema.json
+# yaml-language-server: $schema=../../schemas/org-policies.schema.json
 
 run.allowedIngress:
   rules:

fast/stages/0-bootstrap/data/org-policies/sql.yaml

@@ -16,7 +16,7 @@
 # sample subset of useful organization policies, edit to suit requirements
 # start of document (---) avoids errors if the file only contains comments
 
-# yaml-language-server: $schema=../../../../../modules/organization/schemas/org-policies.schema.json
+# yaml-language-server: $schema=../../schemas/org-policies.schema.json
 
 sql.restrictAuthorizedNetworks:
   rules:

fast/stages/0-bootstrap/data/org-policies/storage.yaml

@@ -16,7 +16,7 @@
 # sample subset of useful organization policies, edit to suit requirements
 # start of document (---) avoids errors if the file only contains comments
 
-# yaml-language-server: $schema=../../../../../modules/organization/schemas/org-policies.schema.json
+# yaml-language-server: $schema=../../schemas/org-policies.schema.json
 
 storage.uniformBucketLevelAccess:
   rules:

fast/stages/0-bootstrap/schemas/custom-role.schema.json

@@ -0,0 +1 @@
+../../../../modules/organization/schemas/custom-role.schema.json

fast/stages/0-bootstrap/schemas/org-policies.schema.json

@@ -0,0 +1 @@
+../../../../modules/organization/schemas/org-policies.schema.json

fast/stages/1-resman/data/org-policies/sandbox/compute.yaml

@@ -6,6 +6,8 @@
 # Terraform will be unable to decode this file if it does not contain valid YAML
 # You can retain `---` (start of the document) to indicate an empty document.
 
+# yaml-language-server: $schema=../../../schemas/org-policies.schema.json
+
 compute.vmExternalIpAccess:
   rules:
     - allow:

fast/stages/1-resman/data/org-policies/sandbox/sql.yaml

@@ -6,6 +6,8 @@
 # Terraform will be unable to decode this file if it does not contain valid YAML
 # You can retain `---` (start of the document) to indicate an empty document.
 
+# yaml-language-server: $schema=../../../schemas/org-policies.schema.json
+
 sql.restrictPublicIp:
   rules:
     - enforce: true

fast/stages/1-resman/schemas/org-policies.schema.json

@@ -0,0 +1 @@
+../../../../modules/organization/schemas/org-policies.schema.json

fast/stages/1-vpcsc/data/access-levels/geo.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# yaml-language-server: $schema=../../../../../modules/vpc-sc/schemas/access-level.schema.json
+# yaml-language-server: $schema=../../schemas/access-level.schema.json
 
 # this is just an example that reflects the FAST core team members' locations
 # and needs to be edited, or not referenced in the perimeter variable

fast/stages/1-vpcsc/schemas/access-level.schema.json

@@ -0,0 +1 @@
+../../../../modules/vpc-sc/schemas/access-level.schema.json

fast/stages/1-vpcsc/schemas/egress-policy.schema.json

@@ -0,0 +1 @@
+../../../../modules/vpc-sc/schemas/egress-policy.schema.json

fast/stages/1-vpcsc/schemas/ingress-policy.schema.json

@@ -0,0 +1 @@
+../../../../modules/vpc-sc/schemas/ingress-policy.schema.json

fast/stages/2-networking-a-simple/data/subnets/dev/dev-dataplatform.yaml

@@ -1,5 +1,7 @@
 # skip boilerplate check
 
+# yaml-language-server: $schema=../../../schemas/subnet.schema.json
+
 name: dev-dataplatform
 region: primary
 description: Default subnet for dev Data Platform

fast/stages/2-networking-a-simple/data/subnets/dev/dev-default.yaml

@@ -1,5 +1,7 @@
 # skip boilerplate check
 
+# yaml-language-server: $schema=../../../schemas/subnet.schema.json
+
 name: dev-default
 region: primary
 ip_cidr_range: 10.68.0.0/24

fast/stages/2-networking-a-simple/data/subnets/dev/dev-gke-nodes.yaml

@@ -1,5 +1,7 @@
 # skip boilerplate check
 
+# yaml-language-server: $schema=../../../schemas/subnet.schema.json
+
 name: dev-gke-nodes
 region: primary
 description: Default subnet for prod gke nodes

fast/stages/2-networking-a-simple/data/subnets/landing/landing-default.yaml

@@ -1,5 +1,7 @@
 # skip boilerplate check
 
+# yaml-language-server: $schema=../../../schemas/subnet.schema.json
+
 name: landing-default
 region: primary
 ip_cidr_range: 10.64.0.0/24

fast/stages/2-networking-a-simple/data/subnets/prod/prod-default.yaml

@@ -1,5 +1,7 @@
 # skip boilerplate check
 
+# yaml-language-server: $schema=../../../schemas/subnet.schema.json
+
 name: prod-default
 region: primary
 ip_cidr_range: 10.72.0.0/24

fast/stages/2-networking-a-simple/schemas/subnet.schema.json

@@ -0,0 +1 @@
+../../../../modules/net-vpc/schemas/subnet.schema.json

fast/stages/2-networking-b-nva/data/subnets/dev/dev-dataplatform.yaml

@@ -1,5 +1,7 @@
 # skip boilerplate check
 
+# yaml-language-server: $schema=../../../schemas/subnet.schema.json
+
 name: dev-dataplatform
 region: primary
 description: Default subnet for dev Data Platform

fast/stages/2-networking-b-nva/data/subnets/dev/dev-default-pri.yaml

@@ -1,5 +1,7 @@
 # skip boilerplate check
 
+# yaml-language-server: $schema=../../../schemas/subnet.schema.json
+
 name: dev-default
 region: primary
 ip_cidr_range: 10.68.0.0/24

fast/stages/2-networking-b-nva/data/subnets/dev/dev-default-sec.yaml

@@ -1,5 +1,7 @@
 # skip boilerplate check
 
+# yaml-language-server: $schema=../../../schemas/subnet.schema.json
+
 name: dev-default
 region: secondary
 ip_cidr_range: 10.84.0.0/24

fast/stages/2-networking-b-nva/data/subnets/dev/dev-gke-nodes.yaml

@@ -1,5 +1,7 @@
 # skip boilerplate check
 
+# yaml-language-server: $schema=../../../schemas/subnet.schema.json
+
 name: dev-gke-nodes
 region: primary
 description: Default subnet for prod gke nodes

fast/stages/2-networking-b-nva/data/subnets/dmz/dmz-default-pri.yaml

@@ -1,5 +1,7 @@
 # skip boilerplate check
 
+# yaml-language-server: $schema=../../../schemas/subnet.schema.json
+
 name: dmz-default
 region: primary
 ip_cidr_range: 10.64.128.0/24

fast/stages/2-networking-b-nva/data/subnets/dmz/dmz-default-sec.yaml

@@ -1,5 +1,7 @@
 # skip boilerplate check
 
+# yaml-language-server: $schema=../../../schemas/subnet.schema.json
+
 name: dmz-default
 region: secondary
 ip_cidr_range: 10.80.128.0/24

fast/stages/2-networking-b-nva/data/subnets/landing/landing-default-pri.yaml

@@ -1,5 +1,7 @@
 # skip boilerplate check
 
+# yaml-language-server: $schema=../../../schemas/subnet.schema.json
+
 name: landing-default
 region: primary
 ip_cidr_range: 10.64.0.0/24

fast/stages/2-networking-b-nva/data/subnets/landing/landing-default-sec.yaml

@@ -1,5 +1,7 @@
 # skip boilerplate check
 
+# yaml-language-server: $schema=../../../schemas/subnet.schema.json
+
 name: landing-default
 region: secondary
 ip_cidr_range: 10.80.0.0/24

fast/stages/2-networking-b-nva/data/subnets/prod/prod-default-ew1.yaml

@@ -1,5 +1,7 @@
 # skip boilerplate check
 
+# yaml-language-server: $schema=../../../schemas/subnet.schema.json
+
 name: prod-default
 region: primary
 ip_cidr_range: 10.72.0.0/24

fast/stages/2-networking-b-nva/data/subnets/prod/prod-default-ew4.yaml

@@ -1,5 +1,7 @@
 # skip boilerplate check
 
+# yaml-language-server: $schema=../../../schemas/subnet.schema.json
+
 name: prod-default
 region: secondary
 ip_cidr_range: 10.88.0.0/24

fast/stages/2-networking-b-nva/schemas/subnet.schema.json

@@ -0,0 +1 @@
+../../../../modules/net-vpc/schemas/subnet.schema.json

fast/stages/2-networking-c-separate-envs/data/subnets/dev/dev-dataplatform.yaml

@@ -1,5 +1,7 @@
 # skip boilerplate check
 
+# yaml-language-server: $schema=../../../schemas/subnet.schema.json
+
 name: dev-dataplatform
 region: primary
 description: Default subnet for dev Data Platform

fast/stages/2-networking-c-separate-envs/data/subnets/dev/dev-default.yaml

@@ -1,5 +1,7 @@
 # skip boilerplate check
 
+# yaml-language-server: $schema=../../../schemas/subnet.schema.json
+
 name: dev-default
 region: europe-west1
 ip_cidr_range: 10.68.0.0/24

fast/stages/2-networking-c-separate-envs/data/subnets/dev/dev-gke-nodes.yaml

@@ -1,5 +1,7 @@
 # skip boilerplate check
 
+# yaml-language-server: $schema=../../../schemas/subnet.schema.json
+
 name: dev-gke-nodes
 region: primary
 description: Default subnet for prod gke nodes

fast/stages/2-networking-c-separate-envs/data/subnets/prod/prod-default.yaml

@@ -1,5 +1,7 @@
 # skip boilerplate check
 
+# yaml-language-server: $schema=../../../schemas/subnet.schema.json
+
 name: prod-default
 region: primary
 ip_cidr_range: 10.72.0.0/24

fast/stages/2-networking-c-separate-envs/schemas/subnet.schema.json

@@ -0,0 +1 @@
+../../../../modules/net-vpc/schemas/subnet.schema.json

modules/billing-account/README.md

@@ -238,7 +238,6 @@ module "billing-account" {
 ```
 
 ```yaml
-# tftest-file id=test-1 path=data/billing-budgets/folder-net-month-current-100.yaml
 display_name: 100 dollars in current spend
 amount:
   units: 100
@@ -255,6 +254,8 @@ update_rules:
     disable_default_iam_recipients: true
     monitoring_notification_channels:
     - billing-default
+
+# tftest-file id=test-1 path=data/billing-budgets/folder-net-month-current-100.yaml schema=budget.schema.json
 ```
 
 <!-- markdownlint-enable -->