Skip to content
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions examples/postgresql/advanced/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,37 @@ provider "sys11dbaas" {
organization = var.org
}

resource "sys11dbaas_database" "db" {
resource "sys11dbaas_database_v2" "db" {
name = var.db_name
description = var.db_description
application_config = {
instances = var.db_instances
password = var.db_password
type = var.db_type
version = var.db_version

private_networking = {
enabled = var.private_networking
shared_subnet_cidr = var.shared_subnet_cidr
allowed_cidrs = var.db_remote_ips
}

public_networking = {
enabled = var.public_networking
allowed_cidrs = var.db_remote_ips
}

scheduled_backups = {
schedule = {
hour = var.db_backup_hour
}
}
}

service_config = {
disksize = var.db_disk_size
flavor = var.db_flavor
region = var.region
remote_ips = var.db_remote_ips
disksize = var.db_disk_size
flavor = var.db_flavor
region = var.region
remote_ips = var.db_remote_ips
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you test this? 🤔 I think remote_ips isn't valid here with v2.

}
}
20 changes: 18 additions & 2 deletions examples/postgresql/advanced/output.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
output "db" {
value = [resource.sys11dbaas_database.db.uuid, resource.sys11dbaas_database.db.status, resource.sys11dbaas_database.db.phase, resource.sys11dbaas_database.db.resource_status]
output "db-hostname" {
value = resource.sys11dbaas_database_v2.db.application_config.private_networking.hostname
}

output "db-uuid" {
value = resource.sys11dbaas_database_v2.db.uuid
}

output "db-status" {
value = resource.sys11dbaas_database_v2.db.status
}

output "subnet-id" {
value = resource.sys11dbaas_database_v2.db.application_config.private_networking.shared_subnet_id
}

output "network-id" {
value = resource.sys11dbaas_database_v2.db.application_config.private_networking.shared_network_id
}
17 changes: 16 additions & 1 deletion examples/postgresql/advanced/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,22 @@ variable "db_backup_hour" {
default = 4
}

variable "private_networking" {
type = bool
default = true
}

variable "public_networking" {
type = bool
default = false
}

variable "shared_subnet_cidr" {
type = string
default = "10.245.0.0/24"
}

variable "db_remote_ips" {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
variable "db_remote_ips" {
variable "allowed_cidrs" {

type = list(string)
default = ["0.0.0.0/0"]
default = ["10.245.0.0/24"]
}
2 changes: 1 addition & 1 deletion examples/postgresql/advanced/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
sys11dbaas = {
source = "registry.terraform.io/syseleven/sys11dbaas"
version = ">= 0.2.0"
version = ">= 0.3.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
version = ">= 0.3.0"
version = ">= 0.3.2"

}
}
}
19 changes: 17 additions & 2 deletions examples/postgresql/basic/basic.tf
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,22 @@ resource "sys11dbaas_database" "postgresql" {
}
}

output "db" {
value = [resource.sys11dbaas_database.postgresql.uuid, resource.sys11dbaas_database.postgresql.status]
output "db-v2-uuid" {
value = resource.sys11dbaas_database_v2.postgresql-v2.uuid
}

output "db-v2-status" {
value = resource.sys11dbaas_database_v2.postgresql-v2.status
}

output "db-v2-subnet" {
value = resource.sys11dbaas_database_v2.postgresql-v2.application_config.private_networking.shared_subnet_id
}

output "db-v2-network" {
value = resource.sys11dbaas_database_v2.postgresql-v2.application_config.private_networking.shared_network_id
}

output "db-v2-hostname" {
value = resource.sys11dbaas_database_v2.postgresql-v2.application_config.private_networking.hostname
}