Fix terraform outputs (#82)

* output instance ids

* Bring Terraform up to date

---------

Co-authored-by: Adam Ciarciński <adam@defguard.net>

Author: t-aleksander

terraform/examples/basic/main.tf.example

@@ -144,7 +144,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.0"
+      version = "~> 6.0"
     }
   }
 }
@@ -536,31 +536,31 @@ resource "aws_security_group" "defguard_db_sg" {
 ###########################################################################
 
 output "defguard_core_private_address" {
-  description = "The IP address of the Defguard Core instance in the internal network"
+  description = "IP address of Defguard Core instance in the internal network"
   value       = aws_network_interface.defguard_core_network_interface.private_ip
 }
 
 output "defguard_core_public_address" {
-  description = "The public IP address of the Defguard Core instance"
+  description = "Public IP address of Defguard Core instance"
   value       = aws_eip.defguard_core_endpoint.public_ip
 }
 
 output "defguard_proxy_public_address" {
-  description = "The public IP address of the Defguard Proxy instance"
+  description = "Public IP address of Defguard Proxy instance"
   value       = aws_eip.defguard_proxy_endpoint.public_ip
 }
 
 output "defguard_proxy_private_address" {
-  description = "The private IP address of the Defguard Proxy instance"
+  description = "Private IP address of Defguard Proxy instance"
   value       = aws_network_interface.defguard_proxy_network_interface.private_ip
 }
 
 output "defguard_gateway_public_addresses" {
-  description = "The public IP addresses of the Defguard Gateway instances"
+  description = "Public IP addresses of Defguard Gateway instances"
   value       = [for gw in aws_eip.defguard_gateway_endpoint : gw.public_ip]
 }
 
 output "defguard_gateway_private_addresses" {
-  description = "The private IP addresses of the Defguard Gateway instances"
+  description = "Private IP addresses of Defguard Gateway instances"
   value       = [for gw in aws_network_interface.defguard_gateway_network_interface : gw.private_ip]
 }

terraform/modules/core/main.tf

@@ -24,13 +24,11 @@ resource "aws_instance" "defguard_core" {
   })
   user_data_replace_on_change = true
 
-  network_interface {
+  primary_network_interface {
     network_interface_id = var.network_interface_id
-    device_index         = 0
   }
 
   tags = {
     Name = "defguard-core-instance"
   }
 }
-

terraform/modules/core/outputs.tf

@@ -0,0 +1,4 @@
+output "instance_id" {
+  description = "ID of Defguard Core instance"
+  value       = aws_instance.defguard_core.id
+}

terraform/modules/gateway/main.tf

@@ -16,9 +16,8 @@ resource "aws_instance" "defguard_gateway" {
   })
   user_data_replace_on_change = true
 
-  network_interface {
+  primary_network_interface {
     network_interface_id = var.network_interface_id
-    device_index         = 0
   }
 
   tags = {

terraform/modules/gateway/outputs.tf

@@ -0,0 +1,4 @@
+output "instance_id" {
+  description = "ID of Defguard Gateway instance"
+  value       = aws_instance.defguard_gateway.id
+}

terraform/modules/proxy/main.tf

@@ -12,9 +12,8 @@ resource "aws_instance" "defguard_proxy" {
   })
   user_data_replace_on_change = true
 
-  network_interface {
+  primary_network_interface {
     network_interface_id = var.network_interface_id
-    device_index         = 0
   }
 
   tags = {

terraform/modules/proxy/outputs.tf

@@ -1,4 +1,9 @@
 output "proxy_private_address" {
-  description = "The private IP address of the Defguard Proxy instance"
+  description = "Private IP address of Defguard Proxy instance"
   value       = aws_instance.defguard_proxy.private_ip
 }
+
+output "instance_id" {
+  description = "ID of Defguard Proxy instance"
+  value       = aws_instance.defguard_proxy.id
+}

terraform/modules/proxy/setup.sh

@@ -45,4 +45,3 @@ rm -f /tmp/defguard-proxy.deb
 
 log "Setup completed."
 ) 2>&1 | tee -a "$LOG_FILE"
-