Merge pull request 'chore(deps): update goreleaser/goreleaser-action action to v6.4.0' (#105) from renovate/actions into master

.dockerignore

@@ -1 +1 @@
-bin
+dyndns-client

.editorconfig

@@ -1,12 +1,13 @@
+# Editor configuration, see http://editorconfig.org
 root = true
 
 [*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
 charset = utf-8
-trim_trailing_whitespace = true
+end_of_line = lf
+indent_size = 2
+indent_style = space
 insert_final_newline = false
+trim_trailing_whitespace = true
 
-[Makefile]
-indent_style = tab
+[{Makefile,*.go}]
+indent_style = tab

.gitattributes

@@ -1 +0,0 @@
-**/Makefile eol=lf

.gitea/workflows/golang-linters.yaml

@@ -0,0 +1,29 @@
+name: "Lint Golang files"
+
+on:
+  pull_request:
+    types: [ "opened", "reopened", "synchronize" ]
+  push:
+    branches: [ '**' ]
+    tags-ignore: [ '**' ]
+  workflow_dispatch: {}
+
+permissions:
+  contents: read
+
+jobs:
+  golangci:
+    name: "Run golang CI linter"
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        go: [ stable ]
+        os: [ ubuntu-latest-amd64, ubuntu-latest-arm64 ]
+    steps:
+    - uses: actions/checkout@v4.3.0
+    - uses: actions/setup-go@v5.5.0
+      with:
+        go-version: ${{ matrix.go }}
+    - uses: golangci/golangci-lint-action@v8.0.0
+      with:
+        version: v2.4.0 # renovate: datasource=github-releases depName=golangci/golangci-lint

.gitea/workflows/golang-tests.yaml

@@ -1,4 +1,4 @@
-name: Golang Tests
+name: "Run Golang tests"
 
 on:
   pull_request:
@@ -9,14 +9,34 @@ on:
   workflow_dispatch: {}
 
 jobs:
-  unittest:
-    runs-on:
-    - ubuntu-latest
+  # integration-test:
+  #   name: "Run integration tests"
+  #   runs-on: ${{ matrix.os }}
+  #   strategy:
+  #     matrix:
+  #       go: [ stable ]
+  #       os: [ ubuntu-latest-amd64, ubuntu-latest-arm64 ]
+  #   steps:
+  #   - uses: actions/checkout@v4.3.0
+  #   - uses: actions/setup-go@v5.5.0
+  #     with:
+  #       go-version: ${{ matrix.go }}
+  #   - env:
+  #       GOPROXY: ${{ vars.GOPROXY }}
+  #     run: make test/integration
+
+  unit-test:
+    name: "Run unit tests"
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        go: [ stable ]
+        os: [ ubuntu-latest-amd64, ubuntu-latest-arm64 ]
     steps:
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v4.3.0
     - uses: actions/setup-go@v5.5.0
       with:
-        go-version: stable
+        go-version: ${{ matrix.go }}
     - env:
         GOPROXY: ${{ vars.GOPROXY }}
       run: make test/unit

.gitea/workflows/markdown-linters.yaml

@@ -1,19 +1,19 @@
-name: Markdown linter
+name: "Lint Markdown files"
 
 on:
   pull_request:
     types: [ "opened", "reopened", "synchronize" ]
   push:
-    branches: [ '**' ]
-    tags-ignore: [ '**' ]
+    branches: [ '*' ]
+    tags-ignore: [ '*' ]
   workflow_dispatch: {}
 
 jobs:
   markdown-lint:
-    runs-on:
-    - ubuntu-latest
+    name: "Run markdown linter"
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v4.3.0
     - uses: DavidAnson/markdownlint-cli2-action@v20.0.0
       with:
-        globs: '**/*.md'
+        globs: '**/*.md'

.gitea/workflows/release.yaml

@@ -1,4 +1,4 @@
-name: Release
+name: "Release"
 
 on:
   push:
@@ -9,15 +9,15 @@ permissions:
 
 jobs:
   release:
-    runs-on:
-    - ubuntu-latest
+    name: "Release application"
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v4.3.0
     - uses: docker/setup-qemu-action@v3.6.0
     - uses: actions/setup-go@v5.5.0
       with:
         go-version: stable
-    - uses: docker/login-action@v3.4.0
+    - uses: docker/login-action@v3.5.0
       with:
         registry: git.cryptic.systems
         username: ${{ github.repository_owner }}
@@ -26,12 +26,13 @@ jobs:
         GITEA_TOKEN: ${{ secrets.GIT_CRYPTIC_SYSTEMS_PACKAGE_REGISTRY_TOKEN }}
         GONOSUMDB: ${{ vars.GONOSUMDB }}
         GOPROXY: ${{ vars.GOPROXY }}
-      uses: goreleaser/goreleaser-action@v6.3.0
+      uses: goreleaser/goreleaser-action@v6.4.0
       with:
-        version: "~> v2"
+        version: v2.11.2 # renovate: datasource=github-releases depName=goreleaser/goreleaser
         args: release --clean
 
   sync-to-hub-docker-io:
+    name: "Upload Images to docker.io"
     needs:
     - release
     runs-on: ubuntu-latest

.gitea/workflows/update-docker-hub-description.yaml

@@ -11,7 +11,7 @@ jobs:
     runs-on:
     - ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v4.3.0
     - uses: peter-evans/dockerhub-description@v4.0.2
       with:
         username: ${{ secrets.DOCKER_IO_USERNAME }}

.golangci.yaml

@@ -0,0 +1,13 @@
+version: "2"
+linters:
+  default: standard
+  enable:
+  - errname
+  - gosec
+
+  exclusions:
+    rules: []
+    warn-unused: true
+
+run:
+  tests: true

.golangci.yml

@@ -1,28 +0,0 @@
-issues:
-  exclude-dirs:
-  - it
-
-run:
-  timeout: 10m
-  tests: true
-
-linters:
-  disable-all: true
-  enable:
-  # Default
-  - errcheck
-  - gosimple
-  - govet
-  - ineffassign
-  - staticcheck
-  - typecheck
-  - unused
-
-  # Additionally linters
-  - bodyclose
-  - misspell
-  - nilerr
-  - rowserrcheck
-  - sqlclosecheck
-  - unparam
-  - whitespace

.goreleaser.yaml

@@ -30,6 +30,7 @@ builds:
   - amd64
   - arm
   - arm64
+  - riscv64
   goarm:
   - "6"
   - "7"
@@ -139,6 +140,25 @@ dockers:
   skip_push: false
   use: buildx
 
+- build_flag_templates:
+  - --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }}
+  - --label=org.opencontainers.image.description={{ .ProjectName }}
+  - --label=org.opencontainers.image.documentation={{ .ProjectName }}
+  - --label=org.opencontainers.image.revision={{ .FullCommit }}
+  - --label=org.opencontainers.image.source={{ .GitURL }}
+  - --label=org.opencontainers.image.title={{ .ProjectName }}
+  - --label=org.opencontainers.image.url=https://git.cryptic.systems/volker.raschek/{{ .ProjectName }}
+  - --label=org.opencontainers.image.version={{ trimprefix .Tag "v" }}
+  - --platform=linux/riscv64
+  - --pull
+  dockerfile: Dockerfile
+  goarch: riscv64
+  goos: linux
+  image_templates:
+  - 'git.cryptic.systems/volker.raschek/{{ .ProjectName }}:{{ trimprefix .Tag "v" }}-riscv64'
+  skip_push: false
+  use: buildx
+
 docker_manifests:
 - name_template: 'git.cryptic.systems/volker.raschek/{{ .ProjectName }}:{{ trimprefix .Tag "v" }}'
   image_templates:
@@ -146,6 +166,7 @@ docker_manifests:
   - 'git.cryptic.systems/volker.raschek/{{ .ProjectName }}:{{ trimprefix .Tag "v" }}-arm-v6'
   - 'git.cryptic.systems/volker.raschek/{{ .ProjectName }}:{{ trimprefix .Tag "v" }}-arm-v7'
   - 'git.cryptic.systems/volker.raschek/{{ .ProjectName }}:{{ trimprefix .Tag "v" }}-arm64'
+  - 'git.cryptic.systems/volker.raschek/{{ .ProjectName }}:{{ trimprefix .Tag "v" }}-riscv64'
 
 gitea_urls:
   api: https://git.cryptic.systems/api/v1

.markdownlint.yaml

@@ -0,0 +1,136 @@
+# markdownlint YAML configuration
+# https://github.com/DavidAnson/markdownlint/blob/main/schema/.markdownlint.yaml
+
+# Default state for all rules
+default: true
+
+# Path to configuration file to extend
+extends: null
+
+# MD003/heading-style/header-style - Heading style
+MD003:
+  # Heading style
+  style: "atx"
+
+# MD004/ul-style - Unordered list style
+MD004:
+  style: "dash"
+
+# MD007/ul-indent - Unordered list indentation
+MD007:
+  # Spaces for indent
+  indent: 2
+  # Whether to indent the first level of the list
+  start_indented: false
+
+# MD009/no-trailing-spaces - Trailing spaces
+MD009:
+  # Spaces for line break
+  br_spaces: 2
+  # Allow spaces for empty lines in list items
+  list_item_empty_lines: false
+  # Include unnecessary breaks
+  strict: false
+
+# MD010/no-hard-tabs - Hard tabs
+MD010:
+  # Include code blocks
+  code_blocks: true
+
+# MD012/no-multiple-blanks - Multiple consecutive blank lines
+MD012:
+  # Consecutive blank lines
+  maximum: 1
+
+# MD013/line-length - Line length
+MD013:
+  # Number of characters
+  line_length: 120
+  # Number of characters for headings
+  heading_line_length: 120
+  # Number of characters for code blocks
+  code_block_line_length: 120
+  # Include code blocks
+  code_blocks: false
+  # Include tables
+  tables: false
+  # Include headings
+  headings: true
+  # Strict length checking
+  strict: false
+  # Stern length checking
+  stern: false
+
+# MD022/blanks-around-headings/blanks-around-headers - Headings should be surrounded by blank lines
+MD022:
+  # Blank lines above heading
+  lines_above: 1
+  # Blank lines below heading
+  lines_below: 1
+
+# MD025/single-title/single-h1 - Multiple top-level headings in the same document
+MD025:
+  # Heading level
+  level: 1
+  # RegExp for matching title in front matter
+  front_matter_title: "^\\s*title\\s*[:=]"
+
+# MD026/no-trailing-punctuation - Trailing punctuation in heading
+MD026:
+  # Punctuation characters
+  punctuation: ".,;:!。，；：！"
+
+# MD029/ol-prefix - Ordered list item prefix
+MD029:
+  # List style
+  style: "one_or_ordered"
+
+# MD030/list-marker-space - Spaces after list markers
+MD030:
+  # Spaces for single-line unordered list items
+  ul_single: 1
+  # Spaces for single-line ordered list items
+  ol_single: 1
+  # Spaces for multi-line unordered list items
+  ul_multi: 1
+  # Spaces for multi-line ordered list items
+  ol_multi: 1
+
+# MD033/no-inline-html - Inline HTML
+MD033:
+  # Allowed elements
+  allowed_elements: []
+
+# MD035/hr-style - Horizontal rule style
+MD035:
+  # Horizontal rule style
+  style: "---"
+
+# MD036/no-emphasis-as-heading/no-emphasis-as-header - Emphasis used instead of a heading
+MD036:
+  # Punctuation characters
+  punctuation: ".,;:!?。，；：！？"
+
+# MD041/first-line-heading/first-line-h1 - First line in a file should be a top-level heading
+MD041:
+  # Heading level
+  level: 1
+  # RegExp for matching title in front matter
+  front_matter_title: "^\\s*title\\s*[:=]"
+
+# MD044/proper-names - Proper names should have the correct capitalization
+MD044:
+  # List of proper names
+  names: []
+  # Include code blocks
+  code_blocks: false
+
+# MD046/code-block-style - Code block style
+MD046:
+  # Block style
+  style: "fenced"
+
+# MD048/code-fence-style - Code fence style
+MD048:
+  # Code fence syle
+  style: "backtick"

Dockerfile

@@ -0,0 +1,5 @@
+FROM scratch AS build
+
+COPY dyndns-client-* /usr/bin/app
+
+ENTRYPOINT [ "/usr/bin/dyndns-client" ]

Makefile

@@ -1,53 +1,114 @@
-# VERSION
-VERSION ?= $(shell git describe --abbrev=0)+hash.$(shell git rev-parse --short HEAD)
+dcmergeEXECUTABLE=dyndns-client
+VERSION?=$(shell git describe --abbrev=0)+hash.$(shell git rev-parse --short HEAD)
 
-DESTDIR ?=
-PREFIX ?= /usr/local
-EXECUTABLE := dyndns-client
+# Destination directory and prefix to place the compiled binaries, documentaions
+# and other files.
+DESTDIR?=
+PREFIX?=/usr/local
 
-# BINARIES
+# CONTAINER_RUNTIME
+# The CONTAINER_RUNTIME variable will be used to specified the path to a
+# container runtime. This is needed to start and run a container image.
+CONTAINER_RUNTIME?=$(shell which podman)
+
+# DYNDNS_CLIENT_IMAGE_REGISTRY_NAME
+# Defines the name of the new container to be built using several variables.
+DYNDNS_CLIENT_IMAGE_REGISTRY_NAME:=git.cryptic.systems
+DYNDNS_CLIENT_IMAGE_REGISTRY_USER:=volker.raschek
+
+DYNDNS_CLIENT_IMAGE_NAMESPACE?=${DYNDNS_CLIENT_IMAGE_REGISTRY_USER}
+DYNDNS_CLIENT_IMAGE_NAME:=${EXECUTABLE}
+_IMAGE_VERSION?=latest
+DYNDNS_CLIENT_IMAGE_FULLY_QUALIFIED=${DYNDNS_CLIENT_IMAGE_REGISTRY_NAME}/${DYNDNS_CLIENT_IMAGE_NAMESPACE}/${DYNDNS_CLIENT_IMAGE_NAME}:${DYNDNS_CLIENT_IMAGE_VERSION}
+
+# BIN
 # ==============================================================================
-all: ${EXECUTABLE}
-
-${EXECUTABLE}:
+dyndns-client:
 	CGO_ENABLED=0 \
-	GOPRIVATE=$(shell go env GOPRIVATE) \
 	GOPROXY=$(shell go env GOPROXY) \
-		go build -ldflags "-X main.version=${VERSION:v%=%}" -o ${@}
-
-# TEST
-# ==============================================================================
-PHONY+=test/unit
-test/unit: clean ${EXECUTABLE}
-	go test -v ./pkg/...
+		go build -ldflags "-X 'main.version=${VERSION}'" -o ${@} main.go
 
 # CLEAN
 # ==============================================================================
 PHONY+=clean
 clean:
-	rm --force ${EXECUTABLE} || true
-	rm --force --recursive bin || true
+	rm --force --recursive dyndns-client
 
-# UN/INSTALL
+# TESTS
 # ==============================================================================
-PHONY+=install
-install: ${EXECUTABLE}
+PHONY+=test/unit
+test/unit:
+	CGO_ENABLED=0 \
+	GOPROXY=$(shell go env GOPROXY) \
+		go test -v -p 1 -coverprofile=coverage.txt -covermode=count -timeout 1200s ./pkg/...
+
+PHONY+=test/integration
+test/integration:
+	CGO_ENABLED=0 \
+	GOPROXY=$(shell go env GOPROXY) \
+		go test -v -p 1 -count=1 -timeout 1200s ./it/...
+
+PHONY+=test/coverage
+test/coverage: test/unit
+	CGO_ENABLED=0 \
+	GOPROXY=$(shell go env GOPROXY) \
+		go tool cover -html=coverage.txt
+
+# GOLANGCI-LINT
+# ==============================================================================
+PHONY+=golangci-lint
+golangci-lint:
+	golangci-lint run --concurrency=$(shell nproc)
+
+# INSTALL
+# ==============================================================================
+PHONY+=uninstall
+install: dyndns-client
+	install --directory ${DESTDIR}/etc/bash_completion.d
+	./dyndns-client completion bash > ${DESTDIR}/etc/bash_completion.d/${EXECUTABLE}
+
 	install --directory ${DESTDIR}${PREFIX}/bin
-	install --mode 755 ${EXECUTABLE} ${DESTDIR}${PREFIX}/bin/${EXECUTABLE}
+	install --mode 0755 ${EXECUTABLE} ${DESTDIR}${PREFIX}/bin/${EXECUTABLE}
 
-	install --directory ${DESTDIR}/usr/lib/systemd/system
-	install --mode 644 systemd/${EXECUTABLE}.service ${DESTDIR}/usr/lib/systemd/system
-
-	install --directory ${DESTDIR}/usr/share/licenses/${EXECUTABLE}
-	install --mode 644 LICENSE ${DESTDIR}/usr/share/licenses/${EXECUTABLE}/LICENSE
+	install --directory ${DESTDIR}${PREFIX}/share/licenses/${EXECUTABLE}
+	install --mode 0644 LICENSE ${DESTDIR}${PREFIX}/share/licenses/${EXECUTABLE}/LICENSE
 
+# UNINSTALL
+# ==============================================================================
 PHONY+=uninstall
 uninstall:
-	-rm --recursive --force \
+	-rm --force --recursive \
+		${DESTDIR}/etc/bash_completion.d/${EXECUTABLE} \
 		${DESTDIR}${PREFIX}/bin/${EXECUTABLE} \
-		${DESTDIR}/usr/lib/systemd/system/${EXECUTABLE}.service \
-		${DESTDIR}/usr/share/licenses/${EXECUTABLE}/LICENSE
+		${DESTDIR}${PREFIX}/share/licenses/${EXECUTABLE}
+
+# BUILD CONTAINER IMAGE
+# ==============================================================================
+PHONY+=container-image/build
+container-image/build:
+	${CONTAINER_RUNTIME} build \
+		--build-arg VERSION=${VERSION} \
+		--file Dockerfile \
+		--no-cache \
+		--pull \
+		--tag ${DYNDNS_CLIENT_IMAGE_FULLY_QUALIFIED} \
+		.
+
+# DELETE CONTAINER IMAGE
+# ==============================================================================
+PHONY:=container-image/delete
+container-image/delete:
+	- ${CONTAINER_RUNTIME} image rm ${DYNDNS_CLIENT_IMAGE_FULLY_QUALIFIED}
+
+# PUSH CONTAINER IMAGE
+# ==============================================================================
+PHONY+=container-image/push
+container-image/push:
+	echo ${DYNDNS_CLIENT_IMAGE_REGISTRY_PASSWORD} | ${CONTAINER_RUNTIME} login ${DYNDNS_CLIENT_IMAGE_REGISTRY_NAME} --username ${DYNDNS_CLIENT_IMAGE_REGISTRY_USER} --password-stdin
+	${CONTAINER_RUNTIME} push ${DYNDNS_CLIENT_IMAGE_FULLY_QUALIFIED}
 
 # PHONY
 # ==============================================================================
-.PHONY: ${PHONY}
+# Declare the contents of the PHONY variable as phony.  We keep that information
+# in a variable so we can use it in if_changed.
+.PHONY: ${PHONY}

go.mod

@@ -3,12 +3,12 @@ module git.cryptic.systems/volker.raschek/dyndns-client
 go 1.20
 
 require (
-	github.com/asaskevich/govalidator/v11 v11.0.1
+	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
 	github.com/sirupsen/logrus v1.9.3
-	github.com/vishvananda/netlink v1.3.0
+	github.com/vishvananda/netlink v1.3.1
 )
 
 require (
-	github.com/vishvananda/netns v0.0.4 // indirect
+	github.com/vishvananda/netns v0.0.5 // indirect
 	golang.org/x/sys v0.10.0 // indirect
 )

go.sum

@@ -10,10 +10,10 @@ github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVs
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/vishvananda/netlink v1.3.0 h1:X7l42GfcV4S6E4vHTsw48qbrV+9PVojNfIhZcwQdrZk=
-github.com/vishvananda/netlink v1.3.0/go.mod h1:i6NetklAujEcC6fK0JPjT8qSwWyO0HLn4UKG+hGqeJs=
-github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
-github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
+github.com/vishvananda/netlink v1.3.1 h1:3AEMt62VKqz90r0tmNhog0r/PpWKmrEShJU0wJW6bV0=
+github.com/vishvananda/netlink v1.3.1/go.mod h1:ARtKouGSTGchR8aMwmkzC0qiNPrrWO5JS/XMVl45+b4=
+github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zdEY=
+github.com/vishvananda/netns v0.0.5/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=

pkg/config/config.go

@@ -152,7 +152,7 @@ func getOutboundIP() net.IP {
 	if err != nil {
 		log.Fatal(err)
 	}
-	defer conn.Close()
+	defer func() { _ = conn.Close() }()
 	localAddr := conn.LocalAddr().(*net.UDPAddr)
 	return localAddr.IP
 }

renovate.json

@@ -6,5 +6,16 @@
     "local>volker.raschek/renovate-config:actions#master",
     "local>volker.raschek/renovate-config:golang#master",
     "local>volker.raschek/renovate-config:regexp#master"
+  ],
+  "packageRules": [
+    {
+      "enabled": false,
+      "matchDatasources":[
+        "go"
+      ],
+      "matchPackageNames": [
+        "^github\\.com/asaskevich/govalidator"
+      ]
+    }
   ]
 }