Skip to content

Commit 3444cb2

Browse files
committed
updated
1 parent 9ee07f3 commit 3444cb2

File tree

4 files changed

+20
-30
lines changed

4 files changed

+20
-30
lines changed

README.md

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,34 @@ It supports creating:
99
- Secondary ranges for the subnets (if applicable)
1010
- routes
1111
- firewall rules
12-
13-
[Sub modules](./modules/) are provided for creating individual vpc, subnets, routes, firewall rules, and firewall policies. See the [modules](./modules/) directory for the various sub modules usage.
14-
- [vpc](./modules/vpc/)
15-
- [subnet](./modules/subnets/)
16-
- [route](./modules/routes/)
17-
- [firewall rules](./modules/firewall-rules/)
18-
- [hierarchical firewall policy](./modules/hierarchical-firewall-policy/)
19-
- [network firewall policy](./modules/network-firewall-policy/)
20-
- [serverless vpc access connector](./modules/vpc-serverless-connector-beta/)
21-
- [hierarchical firewall policy](./modules/hierarchical-firewall-policy/)
12+
- network firewall policy
13+
- hierarchical firewall policy
14+
- serverless vpc access connector
15+
- network connectivity center
16+
17+
[Sub modules](https://github.com/terraform-google-modules/terraform-google-network/tree/main/modules) are provided for creating individual vpc, subnets, routes, firewall rules, network firewall policies, hierarchical firewall policy, serverless vpc access connector and network connectivity center. See the [modules](https://github.com/terraform-google-modules/terraform-google-network/tree/main/modules) directory for the various sub modules usage.
18+
- [vpc](https://github.com/terraform-google-modules/terraform-google-network/tree/main/modules/vpc)
19+
- [subnet](https://github.com/terraform-google-modules/terraform-google-network/tree/main/modules/subnets/)
20+
- [route](https://github.com/terraform-google-modules/terraform-google-network/tree/main/modules/routes)
21+
- [firewall rules](https://github.com/terraform-google-modules/terraform-google-network/tree/main/modules/firewall-rules)
22+
- [network firewall policy](https://github.com/terraform-google-modules/terraform-google-network/tree/main/modules/network-firewall-policy)
23+
- [hierarchical firewall policy](https://github.com/terraform-google-modules/terraform-google-network/tree/main/modules/hierarchical-firewall-policy)
24+
- [serverless vpc access connector](https://github.com/terraform-google-modules/terraform-google-network/tree/main/modules/vpc-serverless-connector-beta)
25+
- [network connectivity center](https://github.com/terraform-google-modules/terraform-google-network/tree/main/modules/network-connectivity-center)
2226

2327
## Compatibility
2428

25-
This module is meant for use with Terraform 1.3+ and tested using Terraform 1.4+.
29+
This module is meant for use with Terraform 1.3+.
2630
If you find incompatibilities using Terraform `>=1.3`, please open an issue.
2731

2832

2933
## Usage
30-
You can go to the [examples](./examples/) folder, however the usage of the module could be like this in your own main.tf file:
34+
Comprehensive examples are available in [examples](https://github.com/terraform-google-modules/terraform-google-network/tree/main/examples) folder. Simple usage:
3135

3236
```hcl
3337
module "vpc" {
3438
source = "terraform-google-modules/network/google"
35-
version = "~> 10.0"
39+
version = "~> 11.0"
3640
3741
project_id = "<PROJECT ID>"
3842
network_name = "example-vpc"
@@ -191,9 +195,6 @@ The routes list contains maps, where each object represents a route. For the nex
191195
## Requirements
192196
### Installed Software
193197
- [Terraform](https://www.terraform.io/downloads.html) >= 1.3
194-
- [Terraform Provider for GCP](https://github.com/terraform-providers/terraform-provider-google) >= 4.25
195-
- [Terraform Provider for GCP Beta](https://github.com/terraform-providers/terraform-provider-google-beta) >= 4.25
196-
- [gcloud](https://cloud.google.com/sdk/gcloud/) >243.0.0
197198

198199
### Configure a Service Account
199200
In order to execute this module you must have a Service Account with the following roles:
@@ -214,6 +215,3 @@ In order to operate with the Service Account you must activate the following API
214215

215216
Refer to the [contribution guidelines](./CONTRIBUTING.md) for
216217
information on contributing to this module.
217-
218-
[terraform-0.13-upgrade]: https://www.terraform.io/upgrade-guides/0-13.html
219-
[2.6.0]: https://registry.terraform.io/modules/terraform-google-modules/network/google/2.6.0

examples/global-network-firewall-policy/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Network Firewall Policy Rule
22

3-
This example creates a VPC network, Service Account, tag, address group and 2 `global` network firewall policy. First policy will have a few rules and will be attached to a VPC network. Second policy will not be attached and any VPC and will not have any rules. It also creates a packet mirroring rule.
3+
This example creates a VPC network, Service Account, tag, address group and 2 `global` network firewall policy. First policy will have a few rules and will be attached to a VPC network. Second policy will not be attached and any VPC and will not have any rules. It also creates a packet mirroring rule for out of band network service integration.
44

55
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
66
## Inputs

test/setup/iam.tf

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ resource "google_service_account_key" "int_test" {
5151
service_account_id = google_service_account.int_test.id
5252
}
5353

54-
# due to limitation we need to assign this role at org level otherwise TF throws an error. Issue is only happening when deployedusing APIs like in TF. Console works fine
54+
# due to limitation we need to assign this role at org level otherwise TF throws an error. Issue is only happening when deployed using APIs like in TF. Console works fine
5555
# b/265054739
5656

5757
resource "google_organization_iam_member" "organization" {
@@ -70,14 +70,6 @@ resource "google_folder_iam_member" "folder1" {
7070
member = "serviceAccount:${google_service_account.int_test.email}"
7171
}
7272

73-
# Roles needed on folders to create Attach firewall policies to the folders/org
74-
75-
# resource "google_organization_iam_member" "org_permission" {
76-
# org_id = var.org_id
77-
# role = "roles/compute.orgSecurityResourceAdmin"
78-
# member = "serviceAccount:${google_service_account.int_test.email}"
79-
# }
80-
8173
resource "google_folder_iam_member" "folder2" {
8274
for_each = toset(["roles/compute.orgSecurityResourceAdmin", "roles/compute.orgFirewallPolicyUser"])
8375
folder = google_folder.folder2.id

test/setup/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
terraform {
18-
required_version = ">=0.13.0"
18+
required_version = ">= 1.3"
1919

2020
required_providers {
2121
google = {

0 commit comments

Comments
 (0)