Merge pull request #38 from rroller/master

Author: skibish

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.22'
+          go-version: '1.24'
 
       - name: Login to Docker Hub
         uses: docker/login-action@v2

.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.22.x]
+        go-version: [1.24.x]
         platform: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:

.gitignore

@@ -1 +1,3 @@
 dist/
+ddns
+.idea/

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:latest as builder
+FROM alpine:latest AS builder
 
 FROM scratch
 

conf/conf_test.go

@@ -1,7 +1,6 @@
 package conf
 
 import (
-	"io/ioutil"
 	"os"
 	"strings"
 	"testing"
@@ -14,7 +13,7 @@ func createTmpFile(t *testing.T) (string, func()) {
 	is := is.New(t)
 	is.Helper()
 
-	f, err := ioutil.TempFile("", "demo-*.yml")
+	f, err := os.CreateTemp("", "demo-*.yml")
 	is.NoErr(err)
 
 	rm := func() {
@@ -28,7 +27,7 @@ func TestNewConfigurationMultipleDomainsSuccess(t *testing.T) {
 	fname, rm := createTmpFile(t)
 	defer rm()
 
-	err := ioutil.WriteFile(fname, []byte(`token: amazing
+	err := os.WriteFile(fname, []byte(`token: amazing
 domains:
   example.com:
     - type: A
@@ -65,7 +64,7 @@ func TestNewConfigurationParseError(t *testing.T) {
 	fname, rm := createTmpFile(t)
 	defer rm()
 
-	err := ioutil.WriteFile(fname, []byte(`is not yml`), 0644)
+	err := os.WriteFile(fname, []byte(`is not yml`), 0644)
 	is.NoErr(err)
 
 	_, err = NewConfiguration(fname)
@@ -78,7 +77,7 @@ func TestNewConfigurationValid(t *testing.T) {
 	defer rm()
 
 	// check for token
-	err := ioutil.WriteFile(fname, []byte(`token: ""
+	err := os.WriteFile(fname, []byte(`token: ""
 domains:
   example.com:`), 0644)
 	is.NoErr(err)
@@ -87,15 +86,15 @@ domains:
 	is.True(strings.Contains(err.Error(), "token can't be empty"))
 
 	// check for domains
-	err = ioutil.WriteFile(fname, []byte(`token: abc
+	err = os.WriteFile(fname, []byte(`token: abc
 domains:`), 0644)
 	is.NoErr(err)
 
 	_, err = NewConfiguration(fname)
 	is.True(strings.Contains(err.Error(), "domains can't be empty"))
 
 	// check for domain records
-	err = ioutil.WriteFile(fname, []byte(`token: abc
+	err = os.WriteFile(fname, []byte(`token: abc
 domains:
   example.com: []`), 0644)
 	is.NoErr(err)
@@ -110,7 +109,7 @@ func TestEnvVarsAreRead(t *testing.T) {
 	fname, rm := createTmpFile(t)
 	defer rm()
 
-	err := ioutil.WriteFile(fname, []byte(`domains:
+	err := os.WriteFile(fname, []byte(`domains:
   example.com:
     - type: A
       name: www`), 0644)

do/do_test.go

@@ -23,7 +23,7 @@ func httpHelper(t *testing.T, reqMethod, path, res string, resCode int) (string,
 		is.Equal(r.URL.Path, path)
 
 		w.WriteHeader(resCode)
-		w.Write([]byte(res))
+		_, _ = w.Write([]byte(res))
 	}))
 
 	return server.URL, server.Close

go.mod

@@ -1,31 +1,31 @@
 module github.com/skibish/ddns
 
-go 1.22
+go 1.24
 
 require (
-	github.com/matryer/is v1.4.0
+	github.com/matryer/is v1.4.1
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/viper v1.19.0
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 )
 
 require (
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/fsnotify/fsnotify v1.8.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
-	github.com/sagikazarmark/locafero v0.4.0 // indirect
+	github.com/magiconair/properties v1.8.9 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
+	github.com/sagikazarmark/locafero v0.7.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
-	github.com/spf13/afero v1.11.0 // indirect
-	github.com/spf13/cast v1.6.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/afero v1.12.0 // indirect
+	github.com/spf13/cast v1.7.1 // indirect
+	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc // indirect
-	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
+	golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

@@ -3,7 +3,7 @@ package ipprovider
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strings"
 	"time"
@@ -50,7 +50,7 @@ func (i *icanhazip) GetIP(ctx context.Context) (string, error) {
 		return "", fmt.Errorf("status code is not in success range: %d", resp.StatusCode)
 	}
 
-	b, err := ioutil.ReadAll(resp.Body)
+	b, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return "", fmt.Errorf("failed to read the body of the response: %d", resp.StatusCode)
 	}

ipprovider/icanhazip.go

@@ -2,7 +2,7 @@ package ipprovider
 
 import (
 	"context"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -15,7 +15,7 @@ import (
 )
 
 func TestMain(m *testing.M) {
-	log.SetOutput(ioutil.Discard)
+	log.SetOutput(io.Discard)
 	os.Exit(m.Run())
 }
 
@@ -28,7 +28,7 @@ func httpHelper(t *testing.T, response string, headers map[string]string, status
 			w.Header().Add(k, v)
 		}
 		w.WriteHeader(statusCode)
-		w.Write([]byte(response))
+		_, _ = w.Write([]byte(response))
 	}))
 
 	return server.URL, server.Close