From ea0de3adbbf36a3d76753f85441b44240a600923 Mon Sep 17 00:00:00 2001 From: Alejandro Leal Date: Fri, 18 Aug 2023 05:51:00 +0000 Subject: [PATCH 1/4] Fixing some typos --- blueprints/data-solutions/data-playground/README.md | 2 +- blueprints/gke/binauthz/README.md | 2 +- fast/stages/2-networking-c-nva/README.md | 2 +- fast/stages/2-networking-e-nva-bgp/README.md | 3 ++- modules/bigtable-instance/README.md | 2 +- modules/projects-data-source/README.md | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/blueprints/data-solutions/data-playground/README.md b/blueprints/data-solutions/data-playground/README.md index c3693ee2..413445d4 100644 --- a/blueprints/data-solutions/data-playground/README.md +++ b/blueprints/data-solutions/data-playground/README.md @@ -24,7 +24,7 @@ If the network_config variable is not provided, one VPC will be created in each ## Deploy your environment -We assume the identiy running the following steps has the following role: +We assume the identity running the following steps has the following role: - resourcemanager.projectCreator in case a new project will be created. - owner on the project in case you use an existing project. diff --git a/blueprints/gke/binauthz/README.md b/blueprints/gke/binauthz/README.md index 740982e6..d4aa5f49 100644 --- a/blueprints/gke/binauthz/README.md +++ b/blueprints/gke/binauthz/README.md @@ -36,7 +36,7 @@ Once the resources have been created, do the following to verify that everything kubectl apply -f tenant-setup.yaml - By applying that manifest thw following is created: + By applying that manifest the following is created: * A namespace called "apis". This is the namespace where the application will be deployed. * A Role and a RoleBinding in previously created namespace so the service account that has been configured for the CD pipeline trigger in Cloud Build is able to deploy the kubernetes application to that namespace. diff --git a/fast/stages/2-networking-c-nva/README.md b/fast/stages/2-networking-c-nva/README.md index a587d68c..778de036 100644 --- a/fast/stages/2-networking-c-nva/README.md +++ b/fast/stages/2-networking-c-nva/README.md @@ -83,7 +83,7 @@ By default, the design assumes the following: - cross-environment traffic and traffic from any untrusted network to any trusted network (and vice versa) pass through the NVAs. For demo purposes, the current NVA performs simple routing/natting only - any traffic from a trusted network to an untrusted network (e.g. Internet) is natted by the NVAs. Users can configure further exclusions -The trusted landing VPC acts as a hub: it bridges internal resources with the outside world and it hosts the shared services consumed by the spoke VPCs, connected to the hub thorugh VPC network peerings. Spokes are used to partition the environments. By default: +The trusted landing VPC acts as a hub: it bridges internal resources with the outside world and it hosts the shared services consumed by the spoke VPCs, connected to the hub through VPC network peerings. Spokes are used to partition the environments. By default: - one spoke VPC hosts the development environment resources - one spoke VPC hosts the production environment resources diff --git a/fast/stages/2-networking-e-nva-bgp/README.md b/fast/stages/2-networking-e-nva-bgp/README.md index a9f444e1..32be44b1 100644 --- a/fast/stages/2-networking-e-nva-bgp/README.md +++ b/fast/stages/2-networking-e-nva-bgp/README.md @@ -37,6 +37,7 @@ The final number of subnets, and their IP addressing will depend on the user-spe - [Design overview and choices](#design-overview-and-choices) - [Multi-regional deployment](#multi-regional-deployment) - [VPC design](#vpc-design) + - [NCC, NVAs and BGP sessions](#ncc-nvas-and-bgp-sessions) - [External connectivity](#external-connectivity) - [Internal connectivity](#internal-connectivity) - [IP ranges, subnetting, routing](#ip-ranges-subnetting-routing) @@ -105,7 +106,7 @@ By default, the design assumes that: - cross-spoke (environment) traffic and traffic from any untrusted network to any trusted network (and vice versa) pass through the NVAs. - any traffic from a trusted network to an untrusted network (e.g. Internet) is natted by the NVAs. Users can configure further exclusions. -The trusted landing VPC acts as a hub: it bridges internal resources with the outside world and it hosts the shared services consumed by the spoke VPCs, connected to the hub thorugh VPC network peerings. Spokes are used to partition the environments. By default: +The trusted landing VPC acts as a hub: it bridges internal resources with the outside world and it hosts the shared services consumed by the spoke VPCs, connected to the hub through VPC network peerings. Spokes are used to partition the environments. By default: - one spoke VPC hosts the development environment resources - one spoke VPC hosts the production environment resources diff --git a/modules/bigtable-instance/README.md b/modules/bigtable-instance/README.md index abc1509f..afe1ec42 100644 --- a/modules/bigtable-instance/README.md +++ b/modules/bigtable-instance/README.md @@ -246,7 +246,7 @@ module "bigtable-instance" { | name | description | sensitive | |---|---|:---:| | [id](outputs.tf#L17) | Fully qualified instance id. | | -| [instance](outputs.tf#L26) | BigTable intance. | | +| [instance](outputs.tf#L26) | BigTable instance. | | | [table_ids](outputs.tf#L35) | Map of fully qualified table ids keyed by table name. | | | [tables](outputs.tf#L40) | Table resources. | | diff --git a/modules/projects-data-source/README.md b/modules/projects-data-source/README.md index 25402a04..93dd67f4 100644 --- a/modules/projects-data-source/README.md +++ b/modules/projects-data-source/README.md @@ -80,7 +80,7 @@ output "filtered-projects" { | name | description | type | required | default | |---|---|:---:|:---:|:---:| | [parent](variables.tf#L55) | Parent folder or organization in 'folders/folder_id' or 'organizations/org_id' format. | string | ✓ | | -| [ignore_folders](variables.tf#L17) | A list of folder IDs or numbers to be excluded from the output, all the subfolders and projects are exluded from the output regardless of the include_projects variable. | list(string) | | [] | +| [ignore_folders](variables.tf#L17) | A list of folder IDs or numbers to be excluded from the output, all the subfolders and projects are excluded from the output regardless of the include_projects variable. | list(string) | | [] | | [ignore_projects](variables.tf#L28) | A list of project IDs, numbers or prefixes to exclude matching projects from the module output. | list(string) | | [] | | [include_projects](variables.tf#L41) | A list of project IDs/numbers to include to the output if some of them are excluded by `ignore_projects` wildcard entries. | list(string) | | [] | | [query](variables.tf#L64) | A string query as defined in the [Query Syntax](https://cloud.google.com/asset-inventory/docs/query-syntax). | string | | "state:ACTIVE" | From c2c7ec4f1d012a339235b0a41fe76b620449f855 Mon Sep 17 00:00:00 2001 From: Alejandro Leal Date: Fri, 18 Aug 2023 06:35:09 +0000 Subject: [PATCH 2/4] Adding exception for idx --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ed88b00d..cbf110dd 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ **/.test.lock .idea .vscode +.idx/dev.nix backend.tf backend-config.hcl credentials.json From dc78ad3493b9e3322d943ab5a419e1ae7381c6ff Mon Sep 17 00:00:00 2001 From: Julio Castillo Date: Fri, 18 Aug 2023 10:06:32 +0200 Subject: [PATCH 3/4] Update outputs.tf --- modules/bigtable-instance/outputs.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/bigtable-instance/outputs.tf b/modules/bigtable-instance/outputs.tf index 93f817dc..a2fd2646 100644 --- a/modules/bigtable-instance/outputs.tf +++ b/modules/bigtable-instance/outputs.tf @@ -24,7 +24,7 @@ output "id" { } output "instance" { - description = "BigTable intance." + description = "BigTable instance." value = google_bigtable_instance.default depends_on = [ google_bigtable_instance_iam_binding.default, From 476d6eaf307a027e6f69f28b9f031b84389e9bdc Mon Sep 17 00:00:00 2001 From: Julio Castillo Date: Fri, 18 Aug 2023 10:07:23 +0200 Subject: [PATCH 4/4] Update variables.tf --- modules/projects-data-source/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/projects-data-source/variables.tf b/modules/projects-data-source/variables.tf index c774784c..888cab21 100644 --- a/modules/projects-data-source/variables.tf +++ b/modules/projects-data-source/variables.tf @@ -15,7 +15,7 @@ */ variable "ignore_folders" { - description = "A list of folder IDs or numbers to be excluded from the output, all the subfolders and projects are exluded from the output regardless of the include_projects variable." + description = "A list of folder IDs or numbers to be excluded from the output, all the subfolders and projects are excluded from the output regardless of the include_projects variable." type = list(string) default = [] # example exlusing a folder