style: clean up Dockerfile

.gitea/workflows/codeql.yaml

@@ -1,23 +0,0 @@
-name: CodeQL Analysis
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  codeql-analysis:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
-        with:
-          languages: "go"
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.23-alpine
+FROM golang:1.20-alpine
 
 WORKDIR /app
 

README.md

@@ -38,7 +38,6 @@ domains:
       - www
 check_interval: 0 0 0/6 * * * *
 mode: Scheduled
-log_level: info
 ```
 
 The config file is expected to be in the same directory as the binary and called `config.yaml`. For the OCR image, the root directory is `/app`.

config.example.yaml

@@ -21,4 +21,3 @@ domains:
       - www
 check_interval: 0 0 0/6 * * * *
 mode: Scheduled
-log_level: info

go.mod

@@ -1,6 +1,6 @@
 module realdnydns
 
-go 1.23
+go 1.20
 
 require (
 	github.com/go-co-op/gocron v1.37.0

main.go

@@ -2,9 +2,6 @@ package main
 
 import (
 	"fmt"
-	"log/slog"
-	"os"
-	"strings"
 
 	"realdnydns/pkg/config"
 	"realdnydns/pkg/dnsProvider"
@@ -18,84 +15,48 @@ import (
 )
 
 func main() {
-	logger := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
-		Level: slog.LevelInfo,
-	}))
-
 	configClient := config.Config{}
 	err := configClient.Load("config.yaml")
 	if err != nil {
-		logger.Error("Failed to load config file", slog.String("error", err.Error()))
 		panic(err)
 	}
 
-	if configClient.LogLevel != "" {
-		logger = slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
-			Level: slog.Level(config.LogLevelMap[strings.ToLower(configClient.LogLevel)]),
-		}))
-	}
-
 	var externalIpProvider externalIpProvider.ExternalIpProvider
 	switch configClient.ExternalIPProvider.Type {
 	case "plain":
-		logger.Info("Using plain external IP provider", slog.String("external_ip_provider", "plain"))
-
 		var plainConfig plainExternalIpProvider.PlainExternalIpProviderConfig
 		err := configClient.ExternalIPProvider.ProviderConfig.Decode(&plainConfig)
 		if err != nil {
-			logger.Error("Failed to create config",
-				slog.String("external_ip_provider", "plain"),
-				slog.String("error", err.Error()),
-			)
 			panic(err)
 		}
 
 		externalIpProvider, err = plainExternalIpProvider.New(plainConfig)
 		if err != nil {
-			logger.Error("Failed to create plain external IP provider",
-				slog.String("external_ip_provider", "plain"),
-				slog.String("error", err.Error()),
-			)
 			panic(err)
 		}
 	default:
-		logger.Error("Unknown external IP provider", slog.String("external_ip_provider", configClient.ExternalIPProvider.Type))
 		panic(fmt.Errorf("unknown external IP provider: %s", configClient.ExternalIPProvider.Type))
 	}
 
 	var dnsProvider dnsProvider.DNSProvider
 	switch configClient.DNSProvider.Type {
 	case "ionos":
-		logger.Info("Using IONOS DNS provider", slog.String("dns_provider", "ionos"))
-
 		var ionosConfig ionos.IONOSConfig
 		err := configClient.DNSProvider.ProviderConfig.Decode(&ionosConfig)
 		if err != nil {
-			logger.Error("Failed to create IONOS DNS provider",
-				slog.String("dns_provider", "ionos"),
-				slog.String("error", err.Error()),
-			)
 			panic(err)
 		}
-
 		dnsProvider, err = ionos.NewIonos(&ionosConfig)
 		if err != nil {
-			logger.Error("Failed to create IONOS DNS provider",
-				slog.String("dns_provider", "ionos"),
-				slog.String("error", err.Error()),
-			)
 			panic(err)
 		}
 	default:
-		logger.Error("Unknown DNS provider", slog.String("dns_provider", configClient.DNSProvider.Type))
 		panic(fmt.Errorf("unknown DNS provider: %s", configClient.DNSProvider.Type))
 	}
 
 	var notificationProvider notificationProvider.NotificationProvider
 	switch configClient.NotificationProvider.Type {
 	case "gotify":
-		logger.Info("Using Gotify notification provider", slog.String("notification_provider", "gotify"))
-
 		var gotifyConfig gotify.NotificationProviderImplGotifyConfig
 		err := configClient.NotificationProvider.ProviderConfig.Decode(&gotifyConfig)
 		if err != nil {
@@ -104,39 +65,29 @@ func main() {
 
 		notificationProvider, err = gotify.New(gotifyConfig)
 		if err != nil {
-			logger.Error("Failed to create Gotify notification provider",
-				slog.String("notification_provider", "gotify"),
-				slog.String("error", err.Error()),
-			)
 			panic(err)
 		}
 	default:
-		logger.Info("Using console notification provider", slog.String("notification_provider", "console"))
-
 		notificationProvider = notificationProviderConsole.New()
 	}
 
-	rdd := realDynDns.New(externalIpProvider, dnsProvider, notificationProvider, configClient.Domains, logger.With(slog.String("service", "realDynDns")))
+	rdd := realDynDns.New(externalIpProvider, dnsProvider, notificationProvider, configClient.Domains)
 
 	switch configClient.Mode {
 	case config.ScheduledMode:
-		logger.Info("Running in scheduled mode", slog.String("interval", configClient.CheckInterval))
-
 		schedule, job, err := rdd.RunWithSchedule(configClient.CheckInterval)
 		if err != nil {
-			logger.Error("Failed to create scheduler", slog.String("error", err.Error()))
 			panic(err)
 		}
 
-		logger.Info("Next run:", slog.String("time", job.NextRun().String()))
+		fmt.Println("Starting scheduler")
+		fmt.Println("Next run:", job.NextRun())
 		schedule.StartBlocking()
 	case config.RunOnceMode:
-		logger.Info("Running in run once mode")
-
-		_, err := rdd.RunOnce()
+		numberOfChanges, err := rdd.RunOnce()
 		if err != nil {
-			logger.Error("Failed to run once", slog.String("error", err.Error()))
 			panic(err)
 		}
+		fmt.Println("Number of changes:", numberOfChanges)
 	}
 }

pkg/config/config.go

@@ -3,9 +3,7 @@ package config
 import (
 	"errors"
 	"fmt"
-	"log/slog"
 	"os"
-	"strings"
 
 	"gopkg.in/yaml.v3"
 )
@@ -17,7 +15,6 @@ type Config struct {
 	NotificationProvider NotificationProviderConfig `yaml:"notification_provider,omitempty"`
 	Domains              []DomainConfig             `yaml:"domains"`
 	CheckInterval        string                     `yaml:"check_interval"`
-	LogLevel             string                     `yaml:"log_level"`
 }
 
 const (
@@ -25,18 +22,6 @@ const (
 	ScheduledMode = "Scheduled"
 )
 
-var LogLevelMap = map[string]slog.Level{
-	"debug": slog.LevelDebug,
-	"info":  slog.LevelInfo,
-	"warn":  slog.LevelWarn,
-	"error": slog.LevelError,
-}
-
-func isValidLogLevel(level string) bool {
-	_, ok := LogLevelMap[strings.ToLower(level)]
-	return ok
-}
-
 type DomainConfig struct {
 	TLD        string   `yaml:"tld"`
 	Subdomains []string `yaml:"subdomains"`
@@ -83,9 +68,5 @@ func (c *Config) validate() error {
 		return errors.New("check interval must be set when mode is 'Scheduled'")
 	}
 
-	if c.LogLevel != "" && !isValidLogLevel(c.LogLevel) {
-		return fmt.Errorf("log level must be one of 'debug', 'info', 'warn', 'error', but got %s", c.LogLevel)
-	}
-
 	return nil
 }

pkg/dnsProvider/ionos/api/ionosAPI.go

@@ -7,7 +7,6 @@ import (
 	"io"
 	"net"
 	"net/http"
-	"net/url"
 	"realdnydns/model/common"
 )
 
@@ -19,7 +18,7 @@ type IonosAPI interface {
 	SetARecord(tld string, subdomain string, ip net.IP, ttl int, prio int, disabled bool) (*common.ARecord, error)
 	GetZoneId(tld string) (string, error)
 	GetRecordId(zoneId string, tld string, subdomain string, recordType string) (string, error)
-	HttpCall(method string, url string, body io.Reader, queryParams map[string]string) (*http.Response, error)
+	HttpCall(method string, url string, body io.Reader) (*http.Response, error)
 }
 
 type IonosAPIImpl struct {
@@ -77,16 +76,8 @@ func New(APIKey string, BaseURL string) IonosAPI {
 	}
 }
 
-func (i *IonosAPIImpl) HttpCall(method string, path string, body io.Reader, queryParams map[string]string) (*http.Response, error) {
-	requestUrl, _ := url.Parse(i.BaseURL + path)
-
-	query := requestUrl.Query()
-	for key, value := range queryParams {
-		query.Add(key, value)
-	}
-	requestUrl.RawQuery = query.Encode()
-
-	req, err := http.NewRequest(method, requestUrl.String(), body)
+func (i *IonosAPIImpl) HttpCall(method string, url string, body io.Reader) (*http.Response, error) {
+	req, err := http.NewRequest(method, i.BaseURL+url, body)
 	if err != nil {
 		return nil, err
 	}
@@ -99,7 +90,7 @@ func (i *IonosAPIImpl) HttpCall(method string, path string, body io.Reader, quer
 }
 
 func (i *IonosAPIImpl) GetZoneId(tld string) (string, error) {
-	res, err := i.HttpCall("GET", "/v1/zones", nil, nil)
+	res, err := i.HttpCall("GET", "/v1/zones", nil)
 	if err != nil {
 		return "", err
 	}
@@ -120,14 +111,7 @@ func (i *IonosAPIImpl) GetZoneId(tld string) (string, error) {
 }
 
 func (i *IonosAPIImpl) GetRecordId(zoneId string, tld string, subdomain string, recordType string) (string, error) {
-	var domain string
-	if subdomain == "@" || subdomain == "" {
-		domain = tld
-	} else {
-		domain = subdomain + "." + tld
-	}
-
-	res, err := i.HttpCall("GET", "/v1/zones/"+zoneId, nil, map[string]string{"recordName": domain, "recordType": recordType})
+	res, err := i.HttpCall("GET", "/v1/zones/"+zoneId, nil)
 	if err != nil {
 		return "", err
 	}
@@ -138,6 +122,13 @@ func (i *IonosAPIImpl) GetRecordId(zoneId string, tld string, subdomain string,
 	zone := ZoneResponse{}
 	json.Unmarshal(responseBody, &zone)
 
+	var domain string
+	if subdomain == "@" || subdomain == "" {
+		domain = tld
+	} else {
+		domain = subdomain + "." + tld
+	}
+
 	for _, record := range zone.Records {
 		if record.Type == recordType && record.Name == domain {
 			return record.Id, nil
@@ -168,7 +159,7 @@ func (i *IonosAPIImpl) SetARecord(tld string, subdomain string, ip net.IP, ttl i
 		return nil, err
 	}
 
-	res, err := i.HttpCall("PUT", "/v1/zones/"+zoneId+"/records/"+recordId, bytes.NewReader(changeRecordRequest), nil)
+	res, err := i.HttpCall("PUT", "/v1/zones/"+zoneId+"/records/"+recordId, bytes.NewReader(changeRecordRequest))
 	if err != nil {
 		return nil, err
 	}
@@ -203,7 +194,7 @@ func (ionos *IonosAPIImpl) GetARecord(tld string, subdomain string) (*common.ARe
 		return nil, err
 	}
 
-	res, err := ionos.HttpCall("GET", "/v1/zones/"+zoneId+"/records/"+recordId, nil, nil)
+	res, err := ionos.HttpCall("GET", "/v1/zones/"+zoneId+"/records/"+recordId, nil)
 	if err != nil {
 		return nil, err
 	}

pkg/dnsProvider/ionos/api/ionosAPI_test.go

@@ -76,8 +76,7 @@ func utilMockServerImpl() func(w http.ResponseWriter, r *http.Request) {
 		if r.Method == "GET" {
 			if r.RequestURI == "/v1/zones" {
 				response = zonesResponseJson
-			} else if r.RequestURI == "/v1/zones/1234567890?recordName=example.com&recordType=A" ||
-				r.RequestURI == "/v1/zones/1234567890?recordName=sub.example.com&recordType=A" {
+			} else if r.RequestURI == "/v1/zones/1234567890" {
 				response = zoneResponseJson
 			} else if r.RequestURI == "/v1/zones/1234567890/records/abcdefghij" {
 				response = recordResponseSubJson
@@ -107,7 +106,7 @@ func TestHttpCall(t *testing.T) {
 
 func testHttpCallGet(api IonosAPI) func(t *testing.T) {
 	return func(t *testing.T) {
-		res, err := api.HttpCall("GET", "/v1/zones", nil, nil)
+		res, err := api.HttpCall("GET", "/v1/zones", nil)
 
 		if err != nil {
 			t.Fatalf("HttpCall() returned unexpected error: %v", err)
@@ -121,7 +120,7 @@ func testHttpCallGet(api IonosAPI) func(t *testing.T) {
 
 func testHttpCallPut(api IonosAPI) func(t *testing.T) {
 	return func(t *testing.T) {
-		res, err := api.HttpCall("PUT", "/v1/zones/1234567890/records/abcdefghij", nil, nil)
+		res, err := api.HttpCall("PUT", "/v1/zones/1234567890/records/abcdefghij", nil)
 
 		if err != nil {
 			t.Fatalf("HttpCall() returned unexpected error: %v", err)
@@ -142,7 +141,7 @@ func testHttpCallNonExistingEndpoint() func(t *testing.T) {
 
 		api := New("dummyKey", mockServer.URL)
 
-		res, err := api.HttpCall("GET", "/v1/nonExistingEndpoint", nil, nil)
+		res, err := api.HttpCall("GET", "/v1/nonExistingEndpoint", nil)
 
 		if err != nil {
 			t.Fatalf("HttpCall() returned unexpected error: %v", err)

pkg/dnsProvider/ionos/ionos_test.go

@@ -82,7 +82,7 @@ func (m *MockIonosAPI) GetZoneId(tld string) (string, error) {
 	return m.GetZoneIdFunc(tld)
 }
 
-func (m *MockIonosAPI) HttpCall(method string, url string, body io.Reader, queryParams map[string]string) (*http.Response, error) {
+func (m *MockIonosAPI) HttpCall(method string, url string, body io.Reader) (*http.Response, error) {
 	return m.HttpCallFunc(method, url, body)
 }
 

pkg/realDynDns/realDynDns.go

@@ -2,8 +2,6 @@ package realDynDns
 
 import (
 	"fmt"
-	"log/slog"
-	"sync"
 	"time"
 
 	"realdnydns/pkg/config"
@@ -19,7 +17,6 @@ type ChangeDetector struct {
 	dnsProvider          dnsProvider.DNSProvider
 	notificationProvider notificationProvider.NotificationProvider
 	domains              []config.DomainConfig
-	logger               *slog.Logger
 }
 
 func New(
@@ -27,14 +24,12 @@ func New(
 	dnsProvider dnsProvider.DNSProvider,
 	notificationProvider notificationProvider.NotificationProvider,
 	domains []config.DomainConfig,
-	logger *slog.Logger,
 ) ChangeDetector {
 	return ChangeDetector{
 		externalIpProvider:   externalIpProvider,
 		dnsProvider:          dnsProvider,
 		notificationProvider: notificationProvider,
 		domains:              domains,
-		logger:               logger,
 	}
 }
 
@@ -63,90 +58,37 @@ func (c *ChangeDetector) RunOnce() (int, error) {
 }
 
 func (c *ChangeDetector) detectAndApplyChanges() (int, error) {
-	c.logger.Info("Detecting and applying changes")
-
 	externalIp, err := c.externalIpProvider.GetExternalIp()
 	if err != nil {
-		c.logger.Error("Failed to retrieve external IP", slog.String("error", err.Error()))
 		return 0, err
 	}
 
-	var wg sync.WaitGroup
-
-	numberUpdatedChannel := make(chan int)
+	var numberUpdated int
 
 	for _, domain := range c.domains {
 		for _, subdomain := range domain.Subdomains {
-			wg.Add(1)
-
-			go func(domain config.DomainConfig, subdomain string) {
-				defer wg.Done()
-
-				c.logger.Info("Checking record",
-					slog.String("tld", domain.TLD),
-					slog.String("subdomain", subdomain),
-				)
 			currentRecord, err := c.dnsProvider.GetRecord(domain.TLD, subdomain)
 			if err != nil {
-					c.logger.Error("Failed to retrieve record",
-						slog.String("error", err.Error()),
-						slog.String("tld", domain.TLD),
-						slog.String("subdomain", subdomain),
-					)
-					return
+				return numberUpdated, err
 			}
 
 			if currentRecord.IP != externalIp.String() {
-					c.logger.Info("Record has changed",
-						slog.String("tld", domain.TLD),
-						slog.String("subdomain", subdomain),
-						slog.String("current_ip", currentRecord.IP),
-						slog.String("external_ip", externalIp.String()),
-					)
-
 				err = c.notificationProvider.SendNotification(
 					fmt.Sprintf("Update %s.%s", subdomain, domain.TLD),
 					fmt.Sprintf("The IP of %s has changed from %s to %s", domain.TLD, currentRecord.IP, externalIp.String()),
 				)
 				if err != nil {
-						c.logger.Warn("Failed to send notification",
-							slog.String("error", err.Error()),
-						)
-						return
+					return numberUpdated, err
 				}
 
-					c.logger.Info("Updating record",
-						slog.String("tld", domain.TLD),
-						slog.String("subdomain", subdomain),
-						slog.String("current_ip", currentRecord.IP),
-						slog.String("external_ip", externalIp.String()),
-					)
 				_, err = c.dnsProvider.UpdateRecord(domain.TLD, subdomain, externalIp, currentRecord.TTL, currentRecord.Prio, currentRecord.Disabled)
+				numberUpdated++
 				if err != nil {
-						c.logger.Error("Failed to update record",
-							slog.String("error", err.Error()),
-							slog.String("tld", domain.TLD),
-							slog.String("subdomain", subdomain),
-						)
-						return
+					return numberUpdated, err
 				}
-
-					numberUpdatedChannel <- 1
 			}
-			}(domain, subdomain)
 		}
 	}
 
-	go func() {
-		wg.Wait()
-		close(numberUpdatedChannel)
-	}()
-
-	numberUpdated := 0
-	for v := range numberUpdatedChannel {
-		numberUpdated += v
-	}
-
-	c.logger.Info("Run completed", slog.Int("number_of_changes", numberUpdated))
 	return numberUpdated, nil
 }

pkg/realDynDns/realDynDns_test.go

@@ -1,7 +1,6 @@
 package realDynDns
 
 import (
-	"log/slog"
 	"net"
 	"realdnydns/model/common"
 	"realdnydns/pkg/config"
@@ -73,9 +72,7 @@ func testDetectAndApplyChangesWithChanges() func(t *testing.T) {
 						"@",
 					},
 				},
-			},
-			slog.Default(),
-		)
+			})
 
 		numberUpdated, err := changeDetector.RunOnce()
 		if err != nil {
@@ -104,9 +101,7 @@ func testDetectAndApplyChangesWithoutChanges() func(t *testing.T) {
 						"@",
 					},
 				},
-			},
-			slog.Default(),
-		)
+			})
 
 		numberUpdated, err := changeDetector.RunOnce()
 		if err != nil {