From 604ac689bcb64331a85f2263e033f2a80e340181 Mon Sep 17 00:00:00 2001
From: Chris <stuurmcp@telkomsa.net>
Date: Sat, 30 Mar 2024 02:02:33 +0200
Subject: [PATCH] Fixed dependencies, changed shell caller

---
 Makefile                          |  4 ++--
 deploy/sthome-webhook/Chart.yaml  |  4 ++--
 deploy/sthome-webhook/values.yaml |  2 +-
 sthome/shell.go                   | 21 +++++++++++----------
 sthome/solver_local.go            | 13 +++++++------
 version.txt                       |  6 +++---
 6 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/Makefile b/Makefile
index 2aab649..8c68374 100644
--- a/Makefile
+++ b/Makefile
@@ -18,12 +18,12 @@ dependencies:
 	go mod tidy
 #	go mod vendor
 
-bin/buildversion.exe: cmd/buildversion.go
+bin/buildversion.exe: cmd/buildversion.go 
 	set TMP="C:\Temp\gotemp"
 	go build -o bin/buildversion.exe cmd/buildversion.go
 	set TMP="C:\Users\Chris\AppData\Local\Temp"
 
-version.txt: bin/buildversion.exe
+version.txt: bin/buildversion.exe dependencies
 	bin/buildversion.exe  
 
 test: _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/etcd _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/kube-apiserver _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/kubectl
diff --git a/deploy/sthome-webhook/Chart.yaml b/deploy/sthome-webhook/Chart.yaml
index 626325f..9cb06fd 100644
--- a/deploy/sthome-webhook/Chart.yaml
+++ b/deploy/sthome-webhook/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: v0.0.3-alpha.2.39
+appVersion: v0.0.3-alpha.2.41
 description: Cert-Manager webhook for sthome
 name: sthome-webhook
-version: 0.0.3-alpha.2.39
+version: 0.0.3-alpha.2.41
diff --git a/deploy/sthome-webhook/values.yaml b/deploy/sthome-webhook/values.yaml
index 060662e..f5c38d7 100644
--- a/deploy/sthome-webhook/values.yaml
+++ b/deploy/sthome-webhook/values.yaml
@@ -31,7 +31,7 @@ clusterIssuer:
 image:
   repository: stuurmcp/cert-manager-webhook-sthome
   #repository: wstat.sthome.net:5000/cert-manager-webhook-sthome
-  tag: 0.0.3-alpha.2.39
+  tag: 0.0.3-alpha.2.41
   #pullPolicy should be IfNotPresent. Set to Always for testing purposes
   pullPolicy: IfNotPresent
 
diff --git a/sthome/shell.go b/sthome/shell.go
index c341af2..252e13f 100644
--- a/sthome/shell.go
+++ b/sthome/shell.go
@@ -9,30 +9,31 @@ import (
 	"k8s.io/klog/v2"
 )
 
-func Execute(script string, command []string) (bool, error) {
+func Execute(dir string, script string, command []string) (bool, error) {
 	currentUser, err := user.Current()
 	if err != nil {
 		log.Fatalf("CZ: Unable to get current user: %s", err)
 	}
 	klog.InfoS("CZ: Executing ", "user", currentUser.Name, "script", command)
 	cmd := &exec.Cmd{
+		Dir:    dir,
 		Path:   script,
 		Args:   command,
 		Stdout: os.Stdout,
 		Stderr: os.Stderr,
 	}
 
-	err = cmd.Start()
+	err = cmd.Run()
 	if err != nil {
-		klog.Errorf("CZ: Script Start return error: %s\n", err)
+		klog.Errorf("CZ: Script run return error: %s\n", err)
 		return false, err
 	}
-
-	err = cmd.Wait()
-	if err != nil {
-		klog.Errorf("CZ: Script Wait return error: %s\n", err)
-		return false, err
-	}
-
+	/*
+		err = cmd.Wait()
+		if err != nil {
+			klog.Errorf("CZ: Script Wait return error: %s\n", err)
+			return false, err
+		}
+	*/
 	return true, nil
 }
diff --git a/sthome/solver_local.go b/sthome/solver_local.go
index a8f5c5d..a0a26a0 100644
--- a/sthome/solver_local.go
+++ b/sthome/solver_local.go
@@ -12,8 +12,9 @@ import (
 )
 
 const (
-	providerName     = "sthome"
-	dnsUpdaterScript = "/mnt/stpool1/scripts/acme/updatedns.sh"
+	providerName        = "sthome"
+	dnsUpdaterScriptDir = "/mnt/stpool1/scripts/acme/"
+	dnsUpdaterScriptCmd = "updatedns.sh"
 )
 
 // LocalDNSProviderSolver implements the provider-specific logic needed to
@@ -78,14 +79,14 @@ func (loc *LocalDNSProviderSolver) Present(ch *v1alpha1.ChallengeRequest) error
 
 	// shell command
 	command := []string{
-		dnsUpdaterScript,
+		dnsUpdaterScriptCmd,
 		"arg1=-set",
 		"arg2=.net",
 		fmt.Sprintf("arg3=%s", ch.DNSName),
 		"arg4=TXT",
 		fmt.Sprintf("arg5=%s", ch.Key),
 	}
-	success, _ := Execute(dnsUpdaterScript, command)
+	success, _ := Execute(dnsUpdaterScriptDir, dnsUpdaterScriptCmd, command)
 	klog.InfoS("CZ: Execute set returned", "success", success)
 	return nil
 }
@@ -101,14 +102,14 @@ func (loc *LocalDNSProviderSolver) CleanUp(ch *v1alpha1.ChallengeRequest) error
 
 	// shell command
 	command := []string{
-		dnsUpdaterScript,
+		dnsUpdaterScriptCmd,
 		"arg1=-unset",
 		"arg2=.net",
 		fmt.Sprintf("arg3=%s", ch.DNSName),
 		"arg4=TXT",
 		fmt.Sprintf("arg5=%s", ch.Key),
 	}
-	success, _ := Execute(dnsUpdaterScript, command)
+	success, _ := Execute(dnsUpdaterScriptDir, dnsUpdaterScriptCmd, command)
 	klog.InfoS("CZ: Execute unset returned", "success", success)
 	return nil
 }
diff --git a/version.txt b/version.txt
index 73b701f..0a22bdc 100644
--- a/version.txt
+++ b/version.txt
@@ -1,3 +1,3 @@
-0.0.3-alpha.2.39
-20240330-0131
-39
\ No newline at end of file
+0.0.3-alpha.2.41
+20240330-0159
+41
\ No newline at end of file