Skip to content

Commit fda2a5e

Browse files
ludookarpok78
authored andcommitted
Implement FAST stage add-ons, refactor netsec as add-on (GoogleCloudPlatform#2800)
* security fixes * change netsec to be a virtual stage in resman * remove netsec bits from security stage, leave CAs in place * netsec - security profile groups * export regions to networking tfvars * netsec - trust stores * netsec refactor, untested * netsec plan working * netsec apply * netsec apply errors * netsec diagram * update diagram * move addon stages to addons folder * remove top-level assets folder * deprecate and remove fast plugins * addon tests * dynamic addon providers and cicd, untested * stage 1 addons in stage 0, refactor stage 0 cicd * addons and cicd refactor in stage 0 with tests * refactor stage 0 cicd * readd removed block * small bootstrap cicd fixes * refactor stage 1 cicd * resman tests * remove plugins from networking tests * fix fast tests * ngfw addon outputs * try to fix unrelated tflint error in bootstrap * remove common tfvars from bootstrap tests to fix linter errors * tfdoc * minimal readmes and links fixes * tfdoc * trim down test inventories * fix plan test * tfdoc * allow configuring output files names * fix tls inspection after adding count to project module * comment fixes * tfdoc
1 parent c39a12e commit fda2a5e

File tree

3 files changed

+22
-91
lines changed

3 files changed

+22
-91
lines changed

fast/addons/2-networking-test/outputs.tf

+18
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17+
<<<<<<<< HEAD:fast/addons/2-networking-test/outputs.tf
1718
output "instance_addresses" {
1819
description = "Instance names and addresses."
1920
value = {
@@ -35,4 +36,21 @@ output "service_account_emails" {
3536
value = {
3637
for k, v in module.service-accounts : k => v.email
3738
}
39+
========
40+
locals {
41+
project_id = try(module.project[0].project_id, var.project_id)
42+
}
43+
44+
module "project" {
45+
source = "../../../modules/project"
46+
count = var._fast_debug.skip_datasources == true ? 0 : 1
47+
name = var.project_id
48+
project_create = false
49+
services = [
50+
"certificatemanager.googleapis.com",
51+
"networkmanagement.googleapis.com",
52+
"networksecurity.googleapis.com",
53+
"privateca.googleapis.com"
54+
]
55+
>>>>>>>> 630e7f40 (Implement FAST stage add-ons, refactor netsec as add-on (#2800)):fast/addons/2-networking-ngfw/main.tf
3856
}

fast/stages/2-security/certs.tf

-90
This file was deleted.

tests/fast/addons/a2_networking_test/tftest.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024 Google LLC
1+
# Copyright 2025 Google LLC
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -11,8 +11,11 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14+
<<<<<<<< HEAD:tests/fast/addons/a2_networking_test/tftest.yaml
1415

1516
module: fast/addons/2-networking-test/
1617

1718
tests:
1819
simple:
20+
========
21+
>>>>>>>> 630e7f40 (Implement FAST stage add-ons, refactor netsec as add-on (#2800)):tests/fast/addons/__init__.py

0 commit comments

Comments
 (0)