fix: do not fail when a record cannot be updated

fix: do not fail when a notification cannot be sent
fix: do not fail when a record can not be retrieved
2024-12-27 19:54:00 +01:00 · 2024-12-27 19:53:46 +01:00 · 2024-12-27 19:53:31 +01:00
9 changed files with 81 additions and 196 deletions
--- a/.gitea/workflows/cd.yaml
+++ b/.gitea/workflows/cd.yaml
@@ -9,27 +9,6 @@ env:
  DOCKER_REGISTRY: gitea.t000-n.de

 jobs:
-  check-changes:
-    name: Check changes
-    runs-on: ubuntu-latest
-    outputs:
-      code: ${{ steps.filter.outputs.code }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Get changes
-        id: filter
-        uses: dorny/paths-filter@v3
-        with:
-          filters: |
-            code:
-              - 'go.mod'
-              - 'go.sum'
-              - '**/*.go'
-              - 'config.example.yaml'
-              - 'Dockerfile'
-              - 'Makefile'
-
  test:
    name: test
    runs-on: ubuntu-latest
@@ -65,70 +44,41 @@ jobs:

  build_and_push:
    name: Build and push
-    strategy:
-      matrix:
-        arch: [amd64, arm64]
    needs:
      - test
-      - check-changes
-    if: ${{ needs.check-changes.outputs.code == 'true' }}
-    runs-on:
-      - ubuntu-latest
-      - linux_${{ matrix.arch }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.DOCKER_REGISTRY }}
-          username: ${{ secrets.REGISTRY_USER }}
-          password: ${{ secrets.REGISTRY_PASSWORD }}
-      - name: Get Metadata
-        id: meta
-        run: |
-          echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | tr '[:upper:]' '[:lower:]') >> $GITHUB_OUTPUT
-          echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/${{ matrix.arch }}
-          push: true
-          provenance: false
-          build-args: GOARCH=${{ matrix.arch }}
-          tags: |
-            ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}-${{ matrix.arch }}
-
-  create_manifest:
-    name: Create manifest
-    needs:
-      - build_and_push
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
        uses: actions/checkout@v4

+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ secrets.REGISTRY_USER }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+
      - name: Get Metadata
        id: meta
        run: |
          echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | tr '[:upper:]' '[:lower:]') >> $GITHUB_OUTPUT
          echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT

-      - name: Login to Registry
-        uses: docker/login-action@v3
+      - name: Build and push
+        uses: docker/build-push-action@v4
        with:
-          registry: ${{ env.DOCKER_REGISTRY }}
-          username: ${{ secrets.REGISTRY_USER }}
-          password: ${{ secrets.REGISTRY_PASSWORD }}
-
-      - name: Create manifest
-        run: |
-          docker manifest create ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:latest \
-            ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}-amd64 \
-            ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}-arm64
-
-          docker manifest push ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:latest
+          context: .
+          file: ./Dockerfile
+          platforms: |
+            linux/amd64
+            linux/arm64
+          push: true
+          tags: |
+            ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}
+            ${{ env.DOCKER_REGISTRY }}/t.behrendt/${{ steps.meta.outputs.REPO_NAME }}:latest
--- a/21
+++ b/21
@@ -1,14 +1,13 @@
-FROM golang:1.24-alpine as build
-
-ARG GOARCH=amd64
+FROM golang:1.23-alpine

 WORKDIR /app
-COPY go.mod go.sum ./
-RUN go mod download
-COPY . .
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=${GOARCH} \
-    go build -trimpath -ldflags="-s -w" -o main .

-FROM gcr.io/distroless/static-debian12
-COPY --from=build /app/main /
-CMD ["/main"]
+COPY go.mod go.sum ./
+
+RUN go mod download
+
+COPY . .
+
+RUN go build -o main .
+
+CMD ["./main"]
--- a/README.md
+++ b/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`.
--- a/config.example.yaml
+++ b/config.example.yaml
@@ -21,4 +21,3 @@ domains:
      - www
 check_interval: 0 0 0/6 * * * *
 mode: Scheduled
-log_level: info
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module realdnydns

-go 1.24.0
+go 1.23

 require (
 	github.com/go-co-op/gocron v1.37.0
@@ -8,11 +8,8 @@ require (
 )

 require (
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/redis/go-redis/v9 v9.7.0 // indirect
 	github.com/robfig/cron/v3 v3.0.1 // indirect
-	github.com/stretchr/testify v1.10.0 // indirect
+	github.com/stretchr/testify v1.8.4 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -1,11 +1,7 @@
-github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
-github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/go-co-op/gocron v1.37.0 h1:ZYDJGtQ4OMhTLKOKMIch+/CY70Brbb1dGdooLEhh7b0=
 github.com/go-co-op/gocron v1.37.0/go.mod h1:3L/n6BkO7ABj+TrfSVXLRzsP26zmikL4ISkLQ0O8iNY=
 github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -22,8 +18,6 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/redis/go-redis/v9 v9.7.0 h1:HhLSs+B6O021gwzl+locl0zEDnyNkxMtf/Z3NNBMa9E=
-github.com/redis/go-redis/v9 v9.7.0/go.mod h1:f6zhXITC7JUJIlPEiBOTXxJgPLdZcA93GewI7inzyWw=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
@@ -36,8 +30,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
 go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
--- a/pkg/dnsProvider/ionos/ionos.go
+++ b/pkg/dnsProvider/ionos/ionos.go
@@ -3,29 +3,18 @@ package ionosDnsProvider
 import (
 	"errors"
 	"net"
-
 	"realdnydns/model/common"
 	"realdnydns/pkg/dnsProvider"
 	ionosAPI "realdnydns/pkg/dnsProvider/ionos/api"
-
-	redis "github.com/redis/go-redis/v9"
 )

 type IONOS struct {
-	API   ionosAPI.IonosAPI
-	Redis *redis.Client
+	API ionosAPI.IonosAPI
 }

 type IONOSConfig struct {
 	APIKey  string `yaml:"api_key"`
 	BaseURL string `yaml:"base_url"`
-	Redis   *IONOSRedisConfig
-}
-
-type IONOSRedisConfig struct {
-	Address  string `yaml:"host"`
-	Password string `yaml:"password"`
-	DB       int    `yaml:"db"`
 }

 func NewIonos(config *IONOSConfig) (dnsProvider.DNSProvider, error) {
@@ -37,18 +26,8 @@ func NewIonos(config *IONOSConfig) (dnsProvider.DNSProvider, error) {
 		return nil, errors.New("base_url is required")
 	}

-	var redisClient *redis.Client = nil
-	if config.Redis != nil {
-		redisClient = redis.NewClient(&redis.Options{
-			Addr:     config.Redis.Address,
-			Password: config.Redis.Password,
-			DB:       config.Redis.DB,
-		})
-	}
-
 	return &IONOS{
 		ionosAPI.New(config.APIKey, config.BaseURL),
-		redisClient,
 	}, nil
 }

--- a/pkg/realDynDns/realDynDns.go
+++ b/pkg/realDynDns/realDynDns.go
@@ -3,7 +3,6 @@ package realDynDns
 import (
 	"fmt"
 	"log/slog"
-	"sync"
 	"time"

 	"realdnydns/pkg/config"
@@ -71,82 +70,63 @@ func (c *ChangeDetector) detectAndApplyChanges() (int, 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",
+			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),
 				)
-				currentRecord, err := c.dnsProvider.GetRecord(domain.TLD, subdomain)
+				continue
+			}
+
+			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.Error("Failed to retrieve record",
+					c.logger.Warn("Failed to send notification",
+						slog.String("error", err.Error()),
+					)
+					continue
+				}
+
+				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)
+				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
+					continue
 				}
-
-				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
-					}
-
-					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)
-					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
-					}
-
-					numberUpdatedChannel <- 1
-				}
-			}(domain, subdomain)
+				numberUpdated++
+			}
 		}
 	}

-	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
 }
--- a/renovate.json
+++ b/renovate.json
@@ -1,12 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "packageRules": [
-    {
-      "matchPackageNames": [
-        "golang",
-        "go"
-      ],
-      "groupName": "go version"
-    }
-  ]
-}
Author	SHA1	Message	Date
Timo Behrendt	0d14d50a9f	fix: do not fail when a record cannot be updated All checks were successful CI / test (pull_request) Successful in 50s Details	2024-12-27 19:54:00 +01:00
Timo Behrendt	381cf9a750	fix: do not fail when a notification cannot be sent	2024-12-27 19:53:46 +01:00
Timo Behrendt	df6c48b875	fix: do not fail when a record can not be retrieved	2024-12-27 19:53:31 +01:00