Various updates (geekzter#50)

* Disable Bedrock container by default

* Update providers

* Install missing .NET 6 SDK

* Fix resource replacement validation

Author: geekzter

Brewfile

@@ -3,10 +3,9 @@ tap "isen-ng/dotnet-sdk-versions"
 
 brew "azure-cli"
 brew "azure-functions-core-tools@3"
-#brew "hashicorp/tap/terraform"
+brew "hashicorp/tap/terraform"
 brew "jq"
 brew "tfenv"
 
-# cask "dotnet-sdk" # Latest
-cask "dotnet-sdk3-1-400" # LTS
+cask "dotnet-sdk6"
 cask "powershell"

scripts/functions.ps1

@@ -213,11 +213,7 @@ function Invoke (
 ) {
     Write-Host "`n$cmd" -ForegroundColor Green 
     Invoke-Expression $cmd
-    $exitCode = $LASTEXITCODE
-    if ($exitCode -ne 0) {
-        Write-Warning "'$cmd' exited with status $exitCode"
-        exit $exitCode
-    }
+    Validate-ExitCode $cmd
 }
 
 function Migrate-StorageShareState (
@@ -471,6 +467,16 @@ function TearDown-Resources (
     }
 }
 
+function Validate-ExitCode (
+    [string]$cmd
+) {
+    $exitCode = $LASTEXITCODE
+    if ($exitCode -ne 0) {
+        Write-Warning "'$cmd' exited with status $exitCode"
+        exit $exitCode
+    }
+}
+
 function Validate-Plan (
     [parameter(Mandatory=$true)][string]$File
 ) {
@@ -484,9 +490,18 @@ function Validate-Plan (
     # Validation
     # Check whether key resources will be replaced
     if (Get-Command jq -ErrorAction SilentlyContinue) {
-        $containerGroupIDsToReplace = $planJSON | jq '.resource_changes[] | select(.address|endswith(\"azurerm_container_group.minecraft_server\"))    | select(.change.actions[]|contains(\"delete\")) | .change.before.id' | ConvertFrom-Json
-        $serverFQDNIDsToReplace     = $planJSON | jq '.resource_changes[] | select(.address|endswith(\"azurerm_dns_cname_record.vanity_hostname[0]\")) | select(.change.actions[]|contains(\"delete\")) | .change.before.id' | ConvertFrom-Json
-        $minecraftDataIDsToReplace  = $planJSON | jq '.resource_changes[] | select(.address|endswith(\"azurerm_storage_share.minecraft_share\"))       | select(.change.actions[]|contains(\"delete\")) | .change.before.id' | ConvertFrom-Json
+        $psNativeCommandArgumentPassingBackup = $PSNativeCommandArgumentPassing
+        try {
+            $PSNativeCommandArgumentPassing = "Legacy"
+            $containerGroupIDsToReplace = $planJSON | jq -r '.resource_changes[] | select(.address|endswith(\"azurerm_container_group.minecraft_server\"))    | select( any (.change.actions[];contains(\"delete\"))) | .change.before.id'
+            Validate-ExitCode "jq"
+            $serverFQDNIDsToReplace     = $planJSON | jq -r '.resource_changes[] | select(.address|endswith(\"azurerm_dns_cname_record.vanity_hostname[0]\")) | select( any (.change.actions[];contains(\"delete\"))) | .change.before.id'
+            Validate-ExitCode "jq"
+            $minecraftDataIDsToReplace  = $planJSON | jq -r '.resource_changes[] | select(.address|endswith(\"azurerm_storage_share.minecraft_share\"))       | select( any (.change.actions[];contains(\"delete\"))) | .change.before.id'
+            Validate-ExitCode "jq"
+        } finally {
+            $PSNativeCommandArgumentPassing = $psNativeCommandArgumentPassingBackup
+        }
     } else {
         Write-Warning "jq not found, plan validation skipped. Look at the plan carefully before approving"
         if ($Force) {

terraform/.terraform-version

@@ -1 +1 @@
-1.3.4
+latest

terraform/.terraform.lock.hcl

@@ -4,6 +4,28 @@
 # enable_backup                  = true
 # enable_log_filter              = false
 
+# variable minecraft_bedrock_config {
+#     primary                    = {
+#     allow_ops_only             = false
+#     container_image            = "itzg/minecraft-bedrock-server"
+#     container_image_tag        = "latest"
+#     environment_variables      = {
+#     ALLOW_CHEATS               = false
+#     DEBUG                      = "true" # Bedrock is Alpha software
+#     DIFFICULTY                 = "easy"
+#     EULA                       = true
+#     GAMEMODE                   = "creative"
+#     MAX_PLAYERS                = 10
+#     OVERRIDE_SERVER_PROPERTIES = true
+#     VERSION                    = "LATEST"
+#     }
+#     minecraft_server_port      = 19132
+#     start_time                 = ""
+#     stop_time                  = "00:01"
+#     vanity_hostname_prefix     = "bedrock"
+#   }
+# }
+
 # minecraft_config               = {
 #   primary                      = {
 #     allow_ops_only             = "false"

terraform/config.auto.example.tfvars

@@ -48,27 +48,7 @@ variable log_filter_jar {
 
 variable minecraft_bedrock_config {
   type                         = map
-  default                      = {
-    primary                    = {
-      allow_ops_only           = false
-      container_image          = "itzg/minecraft-bedrock-server"
-      container_image_tag      = "latest"
-      environment_variables    = {
-        ALLOW_CHEATS           = false
-        DEBUG                  = "true" # Bedrock is Alpha software
-        DIFFICULTY             = "easy"
-        EULA                   = true
-        GAMEMODE               = "creative"
-        MAX_PLAYERS            = 10
-        OVERRIDE_SERVER_PROPERTIES = true
-        VERSION                = "LATEST"
-      }
-      minecraft_server_port    = 19132
-      start_time               = ""
-      stop_time                = "00:01"
-      vanity_hostname_prefix   = "bedrock"
-    }
-  }
+  default                      = {}
 }
 variable minecraft_bedrock_ops {
   type                         = list