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
10 changed files with 80 additions and 178 deletions
--- a/.gitea/workflows/cd.yaml
+++ b/.gitea/workflows/cd.yaml
@@ -4,14 +4,6 @@ on:
  push:
    branches:
      - main
-    paths:
-      - "go.mod"
-      - "go.sum"
-      - "**/*.go"
-      - "config.example.yaml"
-      - "Dockerfile"
-      - "Makefile"
-  workflow_dispatch:

 env:
  DOCKER_REGISTRY: gitea.t000-n.de
@@ -22,9 +14,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
      - name: Setup go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
        with:
          go-version-file: go.mod
          check-latest: true
@@ -52,90 +44,41 @@ jobs:

  build_and_push:
    name: Build and push
-    strategy:
-      matrix:
-        arch: [amd64, arm64]
    needs:
      - test
-    runs-on:
-      - ubuntu-latest
-      - linux_${{ matrix.arch }}
+    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
+
      - name: Login to Registry
-        uses: docker/login-action@v3
+        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: Build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v4
        with:
          context: .
          file: ./Dockerfile
-          platforms: linux/${{ matrix.arch }}
+          platforms: |
+            linux/amd64
+            linux/arm64
          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_tag:
-    name: Create tag
-    runs-on: ubuntu-latest
-    outputs:
-      tag: ${{ steps.tag.outputs.new-tag }}
-    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
-        with:
-          fetch-depth: 0
-      - uses: https://gitea.t000-n.de/t.behrendt/conventional-semantic-git-tag-increment@0.1.20
-        id: tag
-        with:
-          token: ${{ secrets.GITEA_TOKEN }}
-          prerelease: ${{ github.event_name == 'workflow_dispatch' }}
-      - run: |
-          git tag ${{ steps.tag.outputs.new-tag }}
-          git push origin ${{ steps.tag.outputs.new-tag }}
-      - name: Set output
-        run: |
-          echo "tag=${{ steps.tag.outputs.new-tag }}" >> $GITHUB_OUTPUT
-
-  create_manifest:
-    name: Create manifest
-    needs:
-      - build_and_push
-      - create_tag
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-
-      - 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
-        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 }}:${{ needs.create_tag.outputs.tag }} \
-            ${{ 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 }}:${{ needs.create_tag.outputs.tag }}
+            ${{ 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/.gitea/workflows/ci.yaml
+++ b/.gitea/workflows/ci.yaml
@@ -13,9 +13,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
      - name: Setup go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
        with:
          go-version-file: go.mod
          check-latest: true
--- a/21
+++ b/21
@@ -1,14 +1,13 @@
-FROM golang:1.25-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,16 +1,15 @@
 module realdnydns

-go 1.25.0
+go 1.23

 require (
 	github.com/go-co-op/gocron v1.37.0
-	github.com/go-co-op/gocron/v2 v2.18.0
 	gopkg.in/yaml.v3 v3.0.1
 )

 require (
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/robfig/cron/v3 v3.0.1 // indirect
-	github.com/stretchr/testify v1.11.1 // indirect
+	github.com/stretchr/testify v1.8.4 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -4,7 +4,6 @@ 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/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/go-co-op/gocron/v2 v2.18.0/go.mod h1:Zii6he+Zfgy5W9B+JKk/KwejFOW0kZTFvHtwIpR4aBI=
 github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -31,9 +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.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+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/externalIpProvider/plain/plain.go
+++ b/pkg/externalIpProvider/plain/plain.go
@@ -2,7 +2,6 @@ package externalIpProvider

 import (
 	"errors"
-	"io"
 	"net"
 	"net/http"
 	"net/url"
@@ -41,15 +40,12 @@ func (p *ExternalIpProviderImplPlain) GetExternalIp() (net.IP, error) {
 	}

 	if res.StatusCode != 200 {
-		res.Body.Close()
 		return nil, errors.New("unexpected status code")
 	}

-	responseBody, err := io.ReadAll(res.Body)
-	res.Body.Close()
-	if err != nil {
-		return nil, err
-	}
+	responseBody := make([]byte, res.ContentLength)
+	res.Body.Read(responseBody)
+	defer res.Body.Close()

 	parsedIp := net.ParseIP(string(responseBody))
 	if parsedIp == 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,11 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["config:base"],
-  "packageRules": [
-    {
-      "matchPackageNames": ["golang", "gomod", "go"],
-      "groupName": "go version",
-      "updateTypes": ["major", "minor", "patch"]
-    }
-  ]
-}
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