Merge pull request #64 from oracle-quickstart/integration

Integration to Main
oci-landing-zones · Jul 10, 2023 · e1f1003 · e1f1003
2 parents c1bc117 + b93b5fc
commit e1f1003
Show file tree

Hide file tree

Showing 64 changed files with 224 additions and 65 deletions.
diff --git a/modules/bucket/main.tf b/modules/bucket/main.tf
@@ -22,4 +22,7 @@ resource "oci_objectstorage_bucket" "bucket" {
       time_unit   = var.retention_policy_duration_time_unit
     }
   }
+  lifecycle {
+    ignore_changes = all
+  }
 }
diff --git a/modules/service-connector/main.tf b/modules/service-connector/main.tf
@@ -30,7 +30,8 @@ resource "oci_sch_service_connector" "service_connector" {
   }
   lifecycle {
     ignore_changes = [ 
-      source[0].stream_id 
+      source[0],
+      target[0]
     ]
   }
 }
diff --git a/templates/elz-budget/README.md b/templates/elz-budget/README.md
@@ -40,6 +40,8 @@
 | <a name="input_budget_display_name"></a> [budget\_display\_name](#input\_budget\_display\_name) | n/a | `string` | n/a | yes |
 | <a name="input_budget_target"></a> [budget\_target](#input\_budget\_target) | The compartment ocid for the budget | `string` | n/a | yes |
 | <a name="input_environment_prefix"></a> [environment\_prefix](#input\_environment\_prefix) | the 1 character string representing the environment eg. P (prod), N (non-prod), D, T, U | `string` | n/a | yes |
+| <a name="input_home_compartment_id"></a> [home\_compartment\_id](#input\_home\_compartment\_id) | Home Compartment ID | `string` | n/a | yes |
+| <a name="input_is_baseline_deploy"></a> [is\_baseline\_deploy](#input\_is\_baseline\_deploy) | TagNameSpace Optimization: Enable this flag to disable dependent module TagNameSpace Tag Creation. | `bool` | n/a | yes |
 | <a name="input_region"></a> [region](#input\_region) | The OCI region | `string` | n/a | yes |
 | <a name="input_tenancy_ocid"></a> [tenancy\_ocid](#input\_tenancy\_ocid) | The OCID of tenancy | `string` | n/a | yes |
 

diff --git a/templates/elz-budget/tagging.tf b/templates/elz-budget/tagging.tf
@@ -30,6 +30,7 @@ resource "random_id" "tag" {
 }
 
 module "architecture_tag" {
+  count                     = var.is_baseline_deploy ? 0 : 1
   source                    = "../../modules/tag"
   compartment_id            = var.tenancy_ocid
   tag_namespace_description = local.architecture_tag.tag_namespace_description

diff --git a/templates/elz-budget/variables.tf b/templates/elz-budget/variables.tf
@@ -20,7 +20,10 @@ variable "home_compartment_id" {
   type        = string
   description = "Home Compartment ID"
 }
-
+variable "is_baseline_deploy" {
+  type        = bool
+  description = "TagNameSpace Optimization: Enable this flag to disable dependent module TagNameSpace Tag Creation."
+}
 # -----------------------------------------------------------------------------
 # 
 # -----------------------------------------------------------------------------

diff --git a/templates/elz-compartment/README.md b/templates/elz-compartment/README.md
@@ -44,6 +44,7 @@
 | <a name="input_environment_compartment_name"></a> [environment\_compartment\_name](#input\_environment\_compartment\_name) | The name of the compartment that acts as the main compartment for the environment. Resources related to this environment will be created under this compartment. | `string` | `""` | no |
 | <a name="input_environment_prefix"></a> [environment\_prefix](#input\_environment\_prefix) | the 1 character string representing the environment eg. P (prod), N (non-prod), D, T, U | `string` | n/a | yes |
 | <a name="input_home_compartment_id"></a> [home\_compartment\_id](#input\_home\_compartment\_id) | the OCID of the compartment where the environment will be created. In general, this should be the Landing zone parent compartment. | `string` | n/a | yes |
+| <a name="input_is_baseline_deploy"></a> [is\_baseline\_deploy](#input\_is\_baseline\_deploy) | TagNameSpace Optimization: Enable this flag to disable dependent module TagNameSpace Tag Creation. | `bool` | n/a | yes |
 | <a name="input_region"></a> [region](#input\_region) | The OCI region | `string` | n/a | yes |
 | <a name="input_tenancy_ocid"></a> [tenancy\_ocid](#input\_tenancy\_ocid) | The OCID of tenancy | `string` | n/a | yes |
 

diff --git a/templates/elz-compartment/tagging.tf b/templates/elz-compartment/tagging.tf
@@ -30,6 +30,7 @@ resource "random_id" "tag" {
 }
 
 module "architecture_tag" {
+  count                     = var.is_baseline_deploy ? 0 : 1
   source                    = "../../modules/tag"
   compartment_id            = var.tenancy_ocid
   tag_namespace_description = local.architecture_tag.tag_namespace_description

diff --git a/templates/elz-compartment/variables.tf b/templates/elz-compartment/variables.tf
@@ -15,6 +15,10 @@ variable "environment_prefix" {
   type        = string
   description = "the 1 character string representing the environment eg. P (prod), N (non-prod), D, T, U"
 }
+variable "is_baseline_deploy" {
+  type        = bool
+  description = "TagNameSpace Optimization: Enable this flag to disable dependent module TagNameSpace Tag Creation."
+}
 # -----------------------------------------------------------------------------
 # Compartment Variables
 # -----------------------------------------------------------------------------

diff --git a/templates/elz-environment/README.md b/templates/elz-environment/README.md
@@ -94,6 +94,7 @@
 | <a name="input_igw_hub_check"></a> [igw\_hub\_check](#input\_igw\_hub\_check) | n/a | `list(string)` | n/a | yes |
 | <a name="input_ipsec_connection_static_routes"></a> [ipsec\_connection\_static\_routes](#input\_ipsec\_connection\_static\_routes) | n/a | `list(string)` | n/a | yes |
 | <a name="input_ipsec_display_name"></a> [ipsec\_display\_name](#input\_ipsec\_display\_name) | n/a | `string` | n/a | yes |
+| <a name="input_is_baseline_deploy"></a> [is\_baseline\_deploy](#input\_is\_baseline\_deploy) | TagNameSpace Optimization: Enable this flag to disable dependent module TagNameSpace Tag Creation. | `bool` | n/a | yes |
 | <a name="input_is_create_alarms"></a> [is\_create\_alarms](#input\_is\_create\_alarms) | Enable Alarms Creation in all Compartment | `bool` | n/a | yes |
 | <a name="input_is_service_connector_limit"></a> [is\_service\_connector\_limit](#input\_is\_service\_connector\_limit) | Restrict Number of Service Connector Deployment | `bool` | n/a | yes |
 | <a name="input_nat_gw_hub_check"></a> [nat\_gw\_hub\_check](#input\_nat\_gw\_hub\_check) | n/a | `list(string)` | n/a | yes |

diff --git a/templates/elz-environment/logging.tf b/templates/elz-environment/logging.tf
@@ -13,6 +13,7 @@ module "logging" {
   retention_policy_duration_amount    = var.retention_policy_duration_amount
   retention_policy_duration_time_unit = var.retention_policy_duration_time_unit
   subnets_map                         = module.network.subnets
+  is_baseline_deploy                  = var.is_baseline_deploy
 
   depends_on = [ module.network ]
 

diff --git a/templates/elz-environment/main.tf b/templates/elz-environment/main.tf
@@ -8,6 +8,7 @@ module "compartment" {
   environment_compartment_name = var.environment_compartment_name
   enable_tf_state_backup       = var.enable_tf_state_backup
   enable_logging               = var.enable_logging
+  is_baseline_deploy           = var.is_baseline_deploy
 
   providers = {
     oci             = oci
@@ -43,6 +44,7 @@ module "identity" {
   workload_compartment_name    = module.workload.compartment_name
   workload_compartment_names   = var.workload_compartment_names
   home_compartment_id          = var.home_compartment_id
+  is_baseline_deploy           = var.is_baseline_deploy
 
   providers = {
     oci             = oci
@@ -73,6 +75,7 @@ module "budget" {
   budget_alert_rule_message    = var.budget_alert_rule_message
   budget_alert_rule_recipients = var.budget_alert_rule_recipients
   home_compartment_id          = var.home_compartment_id
+  is_baseline_deploy           = var.is_baseline_deploy
 
   providers = {
     oci             = oci
@@ -99,6 +102,7 @@ module "security" {
   replica_region                       = var.vault_replica_region
   enable_replication                   = var.enable_vault_replication
   create_master_encryption_key         = var.create_master_encryption_key
+  is_baseline_deploy                   = var.is_baseline_deploy
 
   providers = {
     oci             = oci
@@ -120,6 +124,7 @@ module "network" {
   region                 = var.region
   network_compartment_id = module.compartment.compartments.network.id
   home_compartment_id          = var.home_compartment_id
+  is_baseline_deploy           = var.is_baseline_deploy
 
   enable_internet_gateway_hub  = var.enable_internet_gateway_hub
   enable_nat_gateway_hub       = var.enable_nat_gateway_hub
@@ -169,6 +174,7 @@ module "tagging" {
   cost_center_tagging          = var.cost_center_tagging
   geo_location_tagging         = var.geo_location_tagging
   home_compartment_id          = var.home_compartment_id
+  is_baseline_deploy           = var.is_baseline_deploy
 
   providers = {
     oci             = oci
@@ -184,6 +190,7 @@ module "monitoring" {
   environment_prefix = var.environment_prefix
   resource_label     = var.resource_label
   home_compartment_id  = var.home_compartment_id
+  is_baseline_deploy           = var.is_baseline_deploy
 
   environment_compartment_id = module.compartment.compartments.environment.id
   security_compartment_id    = module.compartment.compartments.security.id

diff --git a/templates/elz-environment/network-extension.tf b/templates/elz-environment/network-extension.tf
@@ -40,6 +40,7 @@ module "network-extension" {
   drg_route_table_rpc_id            = var.enable_vpn_or_fastconnect == "FASTCONNECT" && var.enable_fastconnect_on_environment ? module.network.drg_route_tables.RT-RPC.id : null
   drg_route_table_vc_id             = var.enable_vpn_or_fastconnect == "FASTCONNECT" && var.enable_fastconnect_on_environment ? module.network.drg_route_tables.RT-Onprem.id : null
   home_compartment_id               = var.home_compartment_id
+  is_baseline_deploy           = var.is_baseline_deploy
 
   providers = {
     oci             = oci

diff --git a/templates/elz-environment/tagging.tf b/templates/elz-environment/tagging.tf
@@ -30,6 +30,7 @@ resource "random_id" "tag" {
 }
 
 module "architecture_tag" {
+  count                     = var.is_baseline_deploy ? 0 : 1
   source                    = "../../modules/tag"
   compartment_id            = var.tenancy_ocid
   tag_namespace_description = local.architecture_tag.tag_namespace_description

diff --git a/templates/elz-environment/variables.tf b/templates/elz-environment/variables.tf
@@ -25,6 +25,11 @@ variable "workload_compartment_names" {
   default     = []
   description = "The names of the workload compartments to update policies for the Admin Groups"
 }
+variable "is_baseline_deploy" {
+  type        = bool
+  description = "TagNameSpace Optimization: Enable this flag to disable dependent module TagNameSpace Tag Creation."
+}
+
 # -----------------------------------------------------------------------------
 # Compartment Variables
 # -----------------------------------------------------------------------------

diff --git a/templates/elz-environment/workload.tf b/templates/elz-environment/workload.tf
@@ -11,15 +11,15 @@ locals {
 module "workload" {
   source = "../elz-workload"
 
-  tenancy_ocid       = var.tenancy_ocid
-  region             = var.region
-  environment_prefix = var.environment_prefix
+  tenancy_ocid                 = var.tenancy_ocid
+  region                       = var.region
+  environment_prefix           = var.environment_prefix
 
-  workload_name              = local.workload.workload_name
-  enable_compartment_delete  = local.workload.enable_compartment_delete
-  environment_compartment_id = module.compartment.compartments.environment.id
-  security_compartment_id    = module.compartment.compartments.security.id
-  network_compartment_id     = module.compartment.compartments.network.id
+  workload_name                = local.workload.workload_name
+  enable_compartment_delete    = local.workload.enable_compartment_delete
+  environment_compartment_id   = module.compartment.compartments.environment.id
+  security_compartment_id      = module.compartment.compartments.security.id
+  network_compartment_id       = module.compartment.compartments.network.id
 
   security_compartment_name    = module.compartment.compartments.security.name
   identity_domain_id           = module.identity.domain.id

diff --git a/templates/elz-exadata-spoke/README.md b/templates/elz-exadata-spoke/README.md
@@ -4,13 +4,13 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
-| <a name="requirement_oci"></a> [oci](#requirement\_oci) | 4.122.0 |
+| <a name="requirement_oci"></a> [oci](#requirement\_oci) | 5.1.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_oci"></a> [oci](#provider\_oci) | 4.122.0 |
+| <a name="provider_oci"></a> [oci](#provider\_oci) | 5.1.0 |
 
 ## Modules
 
@@ -32,8 +32,8 @@
 
 | Name | Type |
 |------|------|
-| [oci_core_services.service_gateway](https://registry.terraform.io/providers/oracle/oci/4.122.0/docs/data-sources/core_services) | data source |
-| [oci_identity_region_subscriptions.regions](https://registry.terraform.io/providers/oracle/oci/4.122.0/docs/data-sources/identity_region_subscriptions) | data source |
+| [oci_core_services.service_gateway](https://registry.terraform.io/providers/oracle/oci/5.1.0/docs/data-sources/core_services) | data source |
+| [oci_identity_region_subscriptions.regions](https://registry.terraform.io/providers/oracle/oci/5.1.0/docs/data-sources/identity_region_subscriptions) | data source |
 
 ## Inputs
 

diff --git a/templates/elz-exadata-workload/README.md b/templates/elz-exadata-workload/README.md
@@ -4,13 +4,13 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
-| <a name="requirement_oci"></a> [oci](#requirement\_oci) | 4.122.0 |
+| <a name="requirement_oci"></a> [oci](#requirement\_oci) | 5.1.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_oci"></a> [oci](#provider\_oci) | 4.122.0 |
+| <a name="provider_oci"></a> [oci](#provider\_oci) | 5.1.0 |
 | <a name="provider_random"></a> [random](#provider\_random) | n/a |
 
 ## Modules
@@ -35,7 +35,7 @@
 | Name | Type |
 |------|------|
 | [random_id.tag](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/id) | resource |
-| [oci_identity_region_subscriptions.regions](https://registry.terraform.io/providers/oracle/oci/4.122.0/docs/data-sources/identity_region_subscriptions) | data source |
+| [oci_identity_region_subscriptions.regions](https://registry.terraform.io/providers/oracle/oci/5.1.0/docs/data-sources/identity_region_subscriptions) | data source |
 
 ## Inputs
 
@@ -73,6 +73,7 @@
 | <a name="input_identity_domain_id"></a> [identity\_domain\_id](#input\_identity\_domain\_id) | the ocid of identity domain | `string` | `"ocid1.domain."` | no |
 | <a name="input_identity_domain_name"></a> [identity\_domain\_name](#input\_identity\_domain\_name) | identity domain name | `string` | `""` | no |
 | <a name="input_ipsec_connection_static_routes"></a> [ipsec\_connection\_static\_routes](#input\_ipsec\_connection\_static\_routes) | n/a | `list(string)` | <pre>[<br>  ""<br>]</pre> | no |
+| <a name="input_is_baseline_deploy"></a> [is\_baseline\_deploy](#input\_is\_baseline\_deploy) | TagNameSpace Optimization: Enable this flag to disable dependent module TagNameSpace Tag Creation. | `bool` | n/a | yes |
 | <a name="input_is_create_alarms"></a> [is\_create\_alarms](#input\_is\_create\_alarms) | Enable Alarms Creation in all Compartment | `bool` | `true` | no |
 | <a name="input_nat_gateway_display_name"></a> [nat\_gateway\_display\_name](#input\_nat\_gateway\_display\_name) | (Updatable) Name of NAT Gateway. Does not have to be unique. | `string` | `"ngw"` | no |
 | <a name="input_nat_gw_spoke_check"></a> [nat\_gw\_spoke\_check](#input\_nat\_gw\_spoke\_check) | n/a | `list(string)` | <pre>[<br>  ""<br>]</pre> | no |

diff --git a/templates/elz-exadata-workload/tagging.tf b/templates/elz-exadata-workload/tagging.tf
@@ -30,6 +30,7 @@ resource "random_id" "tag" {
 }
 
 module "architecture_tag" {
+  count                     = var.is_baseline_deploy ? 0 : 1
   source                    = "../../modules/tag"
   compartment_id            = var.tenancy_ocid
   tag_namespace_description = local.architecture_tag.tag_namespace_description

diff --git a/templates/elz-exadata-workload/variables.tf b/templates/elz-exadata-workload/variables.tf
@@ -33,6 +33,10 @@ variable "enable_fan_events" {
   description = "Security List to be enabled for ONS FAN events"
   default     = true
 }
+variable "is_baseline_deploy" {
+  type        = bool
+  description = "TagNameSpace Optimization: Enable this flag to disable dependent module TagNameSpace Tag Creation."
+}
 
 # -----------------------------------------------------------------------------
 # IAM Variables

diff --git a/templates/elz-hub/README.md b/templates/elz-hub/README.md
@@ -53,8 +53,10 @@
 | <a name="input_enable_vpn_on_environment"></a> [enable\_vpn\_on\_environment](#input\_enable\_vpn\_on\_environment) | n/a | `bool` | n/a | yes |
 | <a name="input_enable_vpn_or_fastconnect"></a> [enable\_vpn\_or\_fastconnect](#input\_enable\_vpn\_or\_fastconnect) | Option to enable VPN or FASTCONNECT service. Options are NONE, VPN, FASTCONNECT. | `string` | n/a | yes |
 | <a name="input_environment_prefix"></a> [environment\_prefix](#input\_environment\_prefix) | the 1 character string representing the environment eg. P (prod), N (non-prod), D, T, U | `string` | n/a | yes |
+| <a name="input_home_compartment_id"></a> [home\_compartment\_id](#input\_home\_compartment\_id) | Home Compartment ID | `string` | n/a | yes |
 | <a name="input_igw_hub_check"></a> [igw\_hub\_check](#input\_igw\_hub\_check) | n/a | `list(string)` | n/a | yes |
 | <a name="input_ipsec_connection_static_routes"></a> [ipsec\_connection\_static\_routes](#input\_ipsec\_connection\_static\_routes) | ----------------------------------------------------------------------------- Network Extension Variables ----------------------------------------------------------------------------- | `list(string)` | n/a | yes |
+| <a name="input_is_baseline_deploy"></a> [is\_baseline\_deploy](#input\_is\_baseline\_deploy) | TagNameSpace Optimization: Enable this flag to disable dependent module TagNameSpace Tag Creation. | `bool` | n/a | yes |
 | <a name="input_nat_gw_hub_check"></a> [nat\_gw\_hub\_check](#input\_nat\_gw\_hub\_check) | n/a | `list(string)` | n/a | yes |
 | <a name="input_network_compartment_id"></a> [network\_compartment\_id](#input\_network\_compartment\_id) | Network Compartment OCID | `string` | n/a | yes |
 | <a name="input_private_spoke_subnet_app_cidr_block"></a> [private\_spoke\_subnet\_app\_cidr\_block](#input\_private\_spoke\_subnet\_app\_cidr\_block) | Spoke: Private Subnet App CIDR Block-1. | `string` | n/a | yes |

diff --git a/templates/elz-hub/tagging.tf b/templates/elz-hub/tagging.tf
@@ -30,6 +30,7 @@ resource "random_id" "tag" {
 }
 
 module "architecture_tag" {
+  count                     = var.is_baseline_deploy ? 0 : 1
   source                    = "../../modules/tag"
   compartment_id            = var.tenancy_ocid
   tag_namespace_description = local.architecture_tag.tag_namespace_description

diff --git a/templates/elz-hub/variables.tf b/templates/elz-hub/variables.tf
@@ -20,6 +20,11 @@ variable "home_compartment_id" {
   type        = string
   description = "Home Compartment ID"
 }
+variable "is_baseline_deploy" {
+  type        = bool
+  description = "TagNameSpace Optimization: Enable this flag to disable dependent module TagNameSpace Tag Creation."
+}
+
 # -----------------------------------------------------------------------------
 # Network Variables
 # -----------------------------------------------------------------------------

diff --git a/templates/elz-identity/README.md b/templates/elz-identity/README.md
@@ -51,7 +51,9 @@
 | <a name="input_environment_compartment_id"></a> [environment\_compartment\_id](#input\_environment\_compartment\_id) | n/a | `string` | n/a | yes |
 | <a name="input_environment_compartment_name"></a> [environment\_compartment\_name](#input\_environment\_compartment\_name) | ----------------------------------------------------------------------------- Policy Variables ----------------------------------------------------------------------------- | `string` | n/a | yes |
 | <a name="input_environment_prefix"></a> [environment\_prefix](#input\_environment\_prefix) | the 1 character string representing the environment eg. P (prod), N (non-prod), D, T, U | `string` | n/a | yes |
+| <a name="input_home_compartment_id"></a> [home\_compartment\_id](#input\_home\_compartment\_id) | Home Compartment ID | `string` | n/a | yes |
 | <a name="input_iam_admin_group_name"></a> [iam\_admin\_group\_name](#input\_iam\_admin\_group\_name) | The group name for the OCI Landing Zone IAM Administrators Group | `string` | `""` | no |
+| <a name="input_is_baseline_deploy"></a> [is\_baseline\_deploy](#input\_is\_baseline\_deploy) | TagNameSpace Optimization: Enable this flag to disable dependent module TagNameSpace Tag Creation. | `bool` | n/a | yes |
 | <a name="input_network_admin_group_name"></a> [network\_admin\_group\_name](#input\_network\_admin\_group\_name) | The group name for the OCI Landing Zone Network Administrators Group | `string` | `""` | no |
 | <a name="input_network_compartment_id"></a> [network\_compartment\_id](#input\_network\_compartment\_id) | n/a | `string` | n/a | yes |
 | <a name="input_network_compartment_name"></a> [network\_compartment\_name](#input\_network\_compartment\_name) | n/a | `string` | n/a | yes |

diff --git a/templates/elz-identity/tagging.tf b/templates/elz-identity/tagging.tf
@@ -30,6 +30,7 @@ resource "random_id" "tag" {
 }
 
 module "architecture_tag" {
+  count                     = var.is_baseline_deploy ? 0 : 1
   source                    = "../../modules/tag"
   compartment_id            = var.tenancy_ocid
   tag_namespace_description = local.architecture_tag.tag_namespace_description