diff --git a/.terraform-docs.yml b/.terraform-docs.yml index 08f3a2d..ae2d7c6 100644 --- a/.terraform-docs.yml +++ b/.terraform-docs.yml @@ -1,6 +1,6 @@ formatter: markdown table output: file: README.terraform.md - mode: replace + mode: inject sort: by: required diff --git a/README.terraform.md b/README.terraform.md index 10d42d7..7d422c3 100644 --- a/README.terraform.md +++ b/README.terraform.md @@ -64,14 +64,11 @@ No modules. | [oci\_region](#input\_oci\_region) | The region for the OCI provider | `string` | n/a | yes | | [tenancy\_id](#input\_tenancy\_id) | The OCID of the tenancy | `string` | n/a | yes | | [admin\_create\_credentials](#input\_admin\_create\_credentials) | Types of credentials to create for the admin user |
object({
api_key = bool
auth_token = bool
customer_key = bool
password = bool
}) | {
"api_key": true,
"auth_token": false,
"customer_key": false,
"password": false
} | no |
-| [attach\_static\_ip\_to\_flex](#input\_attach\_static\_ip\_to\_flex) | Attach reserved static IP to flex instance | `bool` | `true` | no |
-| [create\_databases](#input\_create\_databases) | Create databases | `bool` | `true` | no |
| [create\_instances](#input\_create\_instances) | Create compute instances types | object({
micro = bool
flex = bool
}) | {
"flex": true,
"micro": true
} | no |
| [create\_static\_ip](#input\_create\_static\_ip) | Create a reserved static IP | `bool` | `true` | no |
| [create\_topics](#input\_create\_topics) | Create notification topics | `bool` | `true` | no |
| [create\_vault](#input\_create\_vault) | Create vault | `bool` | `true` | no |
| [created\_compute\_ssh\_key\_algorithm](#input\_created\_compute\_ssh\_key\_algorithm) | The algorithm for the created SSH key if no key is provided | `string` | `"ED25519"` | no |
-| [database\_types](#input\_database\_types) | Types of database workloads to create | `list(string)` | `[]` | no |
| [email\_configuration](#input\_email\_configuration) | values for email configuration | object({
email_domains = list(string)
approved_senders = list(string)
suppression_list = list(string)
}) | {
"approved_senders": [],
"email_domains": [],
"suppression_list": []
} | no |
| [enable\_email\_delivery](#input\_enable\_email\_delivery) | Create email delivery supporting configurations | `bool` | `true` | no |
| [enable\_ipv6](#input\_enable\_ipv6) | Enable IPv6 for the VCN | `bool` | `true` | no |
@@ -114,4 +111,4 @@ No modules.
| [vcn\_cidr\_blocks](#output\_vcn\_cidr\_blocks) | The CIDR block for the VCN |
| [vcn\_ipv6\_cidr\_blocks](#output\_vcn\_ipv6\_cidr\_blocks) | The IPv6 CIDR block for the VCN |
| [vcn\_ipv6\_cidr\_private\_blocks](#output\_vcn\_ipv6\_cidr\_private\_blocks) | The IPv6 CIDR block for the VCN |
-
\ No newline at end of file
+
diff --git a/oci.compute.tf b/oci.compute.tf
index 7b827b1..9b73fca 100644
--- a/oci.compute.tf
+++ b/oci.compute.tf
@@ -53,7 +53,7 @@ resource "oci_core_instance" "compute" {
lifecycle {
ignore_changes = [
# don't replace running instances when latest available image changes
- source_details.0.source_id
+ source_details[0].source_id
]
}
}
diff --git a/oci.locals.tf b/oci.locals.tf
index ab6bcee..695fe80 100644
--- a/oci.locals.tf
+++ b/oci.locals.tf
@@ -30,11 +30,11 @@ locals {
compute_availability_domains = {
micro = !var.create_instances.micro ? [] : [
for domain, value in data.oci_core_shapes.available :
- domain if contains(value.shapes.*.name, local.compute_shapes.micro)
+ domain if contains(value.shapes[*].name, local.compute_shapes.micro)
]
flex = !var.create_instances.flex ? [] : [
for domain, value in data.oci_core_shapes.available :
- domain if contains(value.shapes.*.name, local.compute_shapes.flex)
+ domain if contains(value.shapes[*].name, local.compute_shapes.flex)
]
}
diff --git a/terraform.variables.tf b/terraform.variables.tf
index 407020a..847bd9c 100644
--- a/terraform.variables.tf
+++ b/terraform.variables.tf
@@ -115,27 +115,27 @@ variable "create_static_ip" {
default = true
}
-variable "attach_static_ip_to_flex" {
- description = "Attach reserved static IP to flex instance"
- type = bool
- default = true
-}
+# variable "attach_static_ip_to_flex" {
+# description = "Attach reserved static IP to flex instance"
+# type = bool
+# default = true
+# }
-variable "create_databases" {
- description = "Create databases"
- type = bool
- default = true
-}
-
-variable "database_types" {
- description = "Types of database workloads to create"
- type = list(string)
- default = []
- validation {
- error_message = "database_types must be a list of 'OLTP', 'DW', 'AJD' or 'APEX'"
- condition = alltrue([for v in var.database_types : contains(["OLTP", "DW", "AJD", "APEX"], v)])
- }
-}
+# variable "create_databases" {
+# description = "Create databases"
+# type = bool
+# default = true
+# }
+#
+# variable "database_types" {
+# description = "Types of database workloads to create"
+# type = list(string)
+# default = []
+# validation {
+# error_message = "database_types must be a list of 'OLTP', 'DW', 'AJD' or 'APEX'"
+# condition = alltrue([for v in var.database_types : contains(["OLTP", "DW", "AJD", "APEX"], v)])
+# }
+# }
variable "enable_email_delivery" {
description = "Create email delivery supporting configurations"