fix: talos_version nil parsing

Fix talos_version validation code.

Signed-off-by: Noel Georgi <git@frezbo.dev>
(cherry picked from commit 2ff68ba)

Author: rgl

.github/workflows/acceptance-tests.yaml

@@ -1,13 +1,20 @@
 name: acceptance-tests
+concurrency:
+  group: ${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
 on:
   pull_request:
     paths:
       - 'go.mod'
       - 'go.sum'
       - '**.go'
 jobs:
-  run-tests:
-    runs-on: ubuntu-latest
+  acc-tests:
+    runs-on:
+      - self-hosted
+      - generic
+    env:
+      GOTOOLCHAIN: local
     steps:
       - name: Checkout
         uses: actions/checkout@v3

.github/workflows/pull-request.yaml

@@ -2,8 +2,12 @@ name: check-dirty
 on:
   pull_request:
 jobs:
-  run-tests:
-    runs-on: ubuntu-latest
+  check-dirty:
+    runs-on:
+      - self-hosted
+      - generic
+    env:
+      GOTOOLCHAIN: local
     steps:
       - name: Checkout
         uses: actions/checkout@v3

.github/workflows/release.yml

@@ -18,7 +18,9 @@ permissions:
   contents: write
 jobs:
   goreleaser:
-    runs-on: ubuntu-latest
+    runs-on:
+      - self-hosted
+      - generic
     steps:
       - name: Checkout
         uses: actions/checkout@v3

.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Debug Talos Terraform Provider",
+            "type": "go",
+            "request": "launch",
+            "mode": "debug",
+            // this assumes your workspace is the root of the repo
+            "program": "${workspaceFolder}",
+            "env": {},
+            "args": [
+                "-debug",
+            ]
+        }
+    ]
+}

Makefile

@@ -24,6 +24,9 @@ testacc:
 check-dirty: generate ## Verifies that source tree is not dirty
 	@if test -n "`git status --porcelain`"; then echo "Source tree is dirty"; git status; exit 1 ; fi
 
+build-debug:
+	go build -gcflags='all=-N -l'
+
 install:
 	go install .
 

README.md

@@ -1,4 +1,14 @@
 # terraform-provider-talos
 
-TODO: Validate after patching
-TODO: Ability to have variations of the baseline configuration (i.e. needing unique configuration files per machine)
+## Debugging
+
+In a bash shell, build a debug version of this provider binary:
+
+```bash
+make build-debug
+```
+
+In Visual Studio Code, [start the provider in a debug session](https://developer.hashicorp.com/terraform/plugin/debugging#starting-a-provider-in-debug-mode).
+
+In a new bash shell, go into your terraform project directory, and run
+terraform with `TF_REATTACH_PROVIDERS` set to the value printed in the VSCode debug windows.

internal/talos/talos_machine_configuration_data_source.go

@@ -343,7 +343,7 @@ func (d talosMachineConfigurationDataSource) ValidateConfig(ctx context.Context,
 		return
 	}
 
-	if !state.KubernetesVersion.IsUnknown() && !state.KubernetesVersion.IsNull() {
+	if !state.KubernetesVersion.IsUnknown() && !state.KubernetesVersion.IsNull() && !state.TalosVersion.IsUnknown() {
 		k8sVersionCompatibility, err := compatibility.ParseKubernetesVersion(strings.TrimPrefix(state.KubernetesVersion.ValueString(), "v"))
 		if err != nil {
 			resp.Diagnostics.AddError(
@@ -354,18 +354,14 @@ func (d talosMachineConfigurationDataSource) ValidateConfig(ctx context.Context,
 			return
 		}
 
-		var talosVersionInfo *machineapi.VersionInfo
+		talosVersionInfo := &machineapi.VersionInfo{}
 
-		if !state.TalosVersion.IsUnknown() && state.TalosVersion.IsNull() {
-			talosVersionInfo = &machineapi.VersionInfo{
-				Tag: gendata.VersionTag,
-			}
+		if state.TalosVersion.IsNull() {
+			talosVersionInfo.Tag = gendata.VersionTag
 		}
 
-		if !state.TalosVersion.IsUnknown() && !state.TalosVersion.IsNull() {
-			talosVersionInfo = &machineapi.VersionInfo{
-				Tag: state.TalosVersion.ValueString(),
-			}
+		if !state.TalosVersion.IsNull() {
+			talosVersionInfo.Tag = state.TalosVersion.ValueString()
 		}
 
 		talosVersionCompatibility, err := compatibility.ParseTalosVersion(talosVersionInfo)

internal/talos/talos_machine_configuration_data_source_test.go

@@ -207,6 +207,10 @@ func TestAccTalosMachineConfigurationDataSource(t *testing.T) {
 				Config:      testAccTalosMachineConfigurationDataSourceConfig("v1.3", "example-cluster-8", "controlplane", "https://cluster.local", "v1.23.0", true, true, true, true),
 				ExpectError: regexp.MustCompile("unknown keys found during decoding:"),
 			},
+			{ // this is just added so that the plan only test above doesn't fail
+				PlanOnly: true,
+				Config:   testAccTalosMachineConfigurationDataSourceConfig("v1.3", "example-cluster-8", "controlplane", "https://cluster.local", "", false, false, true, true),
+			},
 		},
 	})
 }
@@ -247,16 +251,21 @@ func testAccTalosMachineConfigurationDataSourceConfig(
 	}
 
 	configTemplate := `
+variable "talos_version" {
+  type = string
+  default = "{{ .TalosVersion }}"
+}
+
 resource "talos_machine_secrets" "this" {
-  {{ if .TalosVersion  }}talos_version = "{{ .TalosVersion }}"{{ end }}
+  {{ if .TalosVersion  }}talos_version = var.talos_version{{ end }}
 }
 
 data "talos_machine_configuration" "this" {
   cluster_name               = "{{ .ClusterName }}"
   cluster_endpoint           = "{{ .ClusterEndpoint }}"
   machine_type               = "{{ .MachineType }}"
   machine_secrets            = talos_machine_secrets.this.machine_secrets
-  {{ if .TalosVersion  }}talos_version    = "{{ .TalosVersion }}"{{ end }}
+  {{ if .TalosVersion  }}talos_version    = var.talos_version{{ end }}
   {{ if .ConfigPatches  }}config_patches             = [
     yamlencode({
       machine = {

main.go

@@ -7,6 +7,7 @@ package main
 
 import (
 	"context"
+	"flag"
 	"log"
 
 	"github.com/hashicorp/terraform-plugin-framework/providerserver"
@@ -24,8 +25,14 @@ import (
 //go:generate go run github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs generate --provider-name talos
 
 func main() {
+	var debug bool
+
+	flag.BoolVar(&debug, "debug", false, "set to true to run the provider with support for debuggers like delve")
+	flag.Parse()
+
 	opts := providerserver.ServeOpts{
 		Address: "registry.terraform.io/siderolabs/talos",
+		Debug:   debug,
 	}
 
 	err := providerserver.Serve(context.Background(), talos.New, opts)