File tree 3 files changed +22
-91
lines changed
tests/fast/addons/a2_networking_test
3 files changed +22
-91
lines changed Original file line number Diff line number Diff line change 14
14
* limitations under the License.
15
15
*/
16
16
17
+ <<<<<<<< HEAD: fast/ addons/ 2 - networking- test/ outputs. tf
17
18
output "instance_addresses" {
18
19
description = " Instance names and addresses."
19
20
value = {
@@ -35,4 +36,21 @@ output "service_account_emails" {
35
36
value = {
36
37
for k , v in module . service-accounts : k => v . email
37
38
}
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
38
56
}
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 1
- # Copyright 2024 Google LLC
1
+ # Copyright 2025 Google LLC
2
2
#
3
3
# Licensed under the Apache License, Version 2.0 (the "License");
4
4
# you may not use this file except in compliance with the License.
11
11
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
12
# See the License for the specific language governing permissions and
13
13
# limitations under the License.
14
+ <<<<<<<< HEAD:tests/fast/addons/a2_networking_test/tftest.yaml
14
15
15
16
module : fast/addons/2-networking-test/
16
17
17
18
tests :
18
19
simple :
20
+ ========
21
+ >>>>>>>> 630e7f40 (Implement FAST stage add-ons, refactor netsec as add-on (#2800)):tests/fast/addons/__init__.py
You can’t perform that action at this time.
0 commit comments