Merge pull request #123 from danistrebel/fix/apigee-org-reference-psc-sb

Fix/apigee org reference psc sb

Author: danistrebel

modules/apigee-x-core/README.md

@@ -1,7 +1,6 @@
 # Apigee Core Setup
 
 <!-- BEGIN_TF_DOCS -->
-
 ## Providers
 
 | Name | Version |
@@ -48,6 +47,6 @@
 | <a name="output_instance_endpoints"></a> [instance\_endpoints](#output\_instance\_endpoints) | Map of instance name -> internal runtime endpoint IP address |
 | <a name="output_instance_map"></a> [instance\_map](#output\_instance\_map) | Map of instance region -> instance object |
 | <a name="output_instance_service_attachments"></a> [instance\_service\_attachments](#output\_instance\_service\_attachments) | Map of instance region -> instance PSC service attachment |
-| <a name="output_org_id"></a> [org\_id](#output\_org\_id) | Apigee Organization ID |
+| <a name="output_org_id"></a> [org\_id](#output\_org\_id) | Apigee Organization ID in the format of 'organizations/<org\_id>' |
 | <a name="output_organization"></a> [organization](#output\_organization) | Apigee Organization. |
 <!-- END_TF_DOCS -->

modules/apigee-x-core/outputs.tf

@@ -36,7 +36,7 @@ output "instance_map" {
 }
 
 output "org_id" {
-  description = "Apigee Organization ID"
+  description = "Apigee Organization ID in the format of 'organizations/<org_id>'"
   value       = module.apigee.org_id
 }
 

modules/development-backend/README.md

@@ -37,4 +37,5 @@
 | <a name="output_ilb_forwarding_rule_address"></a> [ilb\_forwarding\_rule\_address](#output\_ilb\_forwarding\_rule\_address) | ILB forwarding rule IP address. |
 | <a name="output_ilb_forwarding_rule_self_link"></a> [ilb\_forwarding\_rule\_self\_link](#output\_ilb\_forwarding\_rule\_self\_link) | ILB forwarding rule self link. |
 | <a name="output_instance_group"></a> [instance\_group](#output\_instance\_group) | Backend Service MIG. |
+| <a name="output_region"></a> [region](#output\_region) | Backend Service region. |
 <!-- END_TF_DOCS -->

modules/nb-psc-l7ilb/README.md

@@ -1,14 +1,4 @@
 <!-- BEGIN_TF_DOCS -->
-# Apigee X L7 ILB PSC NEG Northbound Module
-
-## Requirements
-
-| Name | Version |
-|------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.1.0 |
-| <a name="requirement_google"></a> [google](#requirement\_google) | >= 4.32.0 |
-| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 4.32.0 |
-
 ## Providers
 
 | Name | Version |

modules/sb-psc-attachment/README.md

@@ -20,7 +20,7 @@ No modules.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_apigee_organization"></a> [apigee\_organization](#input\_apigee\_organization) | Apigee organization where the Endpoint Attachment should be added to. | `string` | n/a | yes |
+| <a name="input_apigee_organization"></a> [apigee\_organization](#input\_apigee\_organization) | Apigee organization where the Endpoint Attachment should be added to. Apigee Organization ID should be prefixed with 'organizations/' | `string` | n/a | yes |
 | <a name="input_name"></a> [name](#input\_name) | Name for the service attachment. | `string` | n/a | yes |
 | <a name="input_nat_subnets"></a> [nat\_subnets](#input\_nat\_subnets) | One or more NAT subnets to be used for PSC. | `list(string)` | n/a | yes |
 | <a name="input_project_id"></a> [project\_id](#input\_project\_id) | Project id. | `string` | n/a | yes |

modules/sb-psc-attachment/main.tf

@@ -27,7 +27,7 @@ resource "google_compute_service_attachment" "psc_service_attachment" {
 }
 
 resource "google_apigee_endpoint_attachment" "endpoint_attachment" {
-  org_id                 = "organizations/${var.apigee_organization}"
+  org_id                 = var.apigee_organization
   endpoint_attachment_id = var.name
   location               = var.region
   service_attachment     = google_compute_service_attachment.psc_service_attachment.id

modules/sb-psc-attachment/variables.tf

@@ -40,6 +40,10 @@ variable "target_service" {
 }
 
 variable "apigee_organization" {
-  description = "Apigee organization where the Endpoint Attachment should be added to."
+  description = "Apigee organization where the Endpoint Attachment should be added to. Apigee Organization ID should be prefixed with 'organizations/'"
   type        = string
+  validation {
+    condition     = can(regex("^(organizations/[a-zA-Z0-9-_]+)$", var.apigee_organization))
+    error_message = "Invalid Apigee Organization ID. Please use the format \"organizations/[a-zA-Z0-9-_]+\"."
+  }
 }

samples/hybrid-gke/README.md

@@ -170,10 +170,6 @@ curl -kv --resolve $INGRESS_DOMAIN:443:$INGRESS_IP "https://$INGRESS_DOMAIN/my-p
 * Implement CD for TF and k8s resources
 
 <!-- BEGIN_TF_DOCS -->
-## Requirements
-
-No requirements.
-
 ## Providers
 
 | Name | Version |

samples/x-basic/README.md

@@ -6,10 +6,6 @@ Please see the main [README](https://github.com/apigee/terraform-modules#deployi
 for detailed instructions.
 
 <!-- BEGIN_TF_DOCS -->
-## Requirements
-
-No requirements.
-
 ## Providers
 
 No providers.
@@ -45,8 +41,4 @@ No resources.
 ## Outputs
 
 No outputs.
-
-## Copyright
-
-Copyright 2023 Google LLC. This software is provided as-is, without warranty or representation for any use or purpose. Your use of it is subject to your agreement with Google.
 <!-- END_TF_DOCS -->

samples/x-controlled-internet-egress/README.md

@@ -19,10 +19,6 @@ Please see the main [README](https://github.com/apigee/terraform-modules#deployi
 for detailed instructions.
 
 <!-- BEGIN_TF_DOCS -->
-## Requirements
-
-No requirements.
-
 ## Providers
 
 | Name | Version |
@@ -69,7 +65,4 @@ No requirements.
 ## Outputs
 
 No outputs.
-
-## Copyright
-Copyright 2023 Google LLC. This software is provided as-is, without warranty or representation for any use or purpose. Your use of it is subject to your agreement with Google.
 <!-- END_TF_DOCS -->