fix(Makefile): update config

.gitea/workflows/golang-tests.yaml

@@ -6,17 +6,19 @@ on:
   push:
     branches: [ '**' ]
     tags-ignore: [ '**' ]
-  workflow_dispatch: {}
 
 jobs:
   unittest:
-    runs-on:
+    runs-on: ${{ matrix.os }}
-    - ubuntu-latest
+    strategy:
+      matrix:
+        go: [ stable ]
+        os: [ ubuntu-latest-amd64, ubuntu-latest-arm64 ]
     steps:
     - uses: actions/checkout@v4.2.2
     - 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/golangci-lint.yaml

@@ -0,0 +1,27 @@
+name: Golang CI lint
+
+on:
+  pull_request:
+    types: [ "opened", "reopened", "synchronize" ]
+  push:
+    branches: [ '**' ]
+    tags-ignore: [ '**' ]
+
+permissions:
+  contents: read
+
+jobs:
+  golangci:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        go: [ stable ]
+        os: [ ubuntu-latest-amd64, ubuntu-latest-arm64 ]
+    steps:
+    - uses: actions/checkout@v4.2.2
+    - uses: actions/setup-go@v5.5.0
+      with:
+        go-version: ${{ matrix.go }}
+    - uses: golangci/golangci-lint-action@v8.0.0
+      with:
+        version: v2.1

.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

Makefile

@@ -1,53 +1,114 @@
-# VERSION
+dcmergeEXECUTABLE=dyndns-client
-VERSION ?= $(shell git describe --abbrev=0)+hash.$(shell git rev-parse --short HEAD)
+VERSION?=$(shell git describe --abbrev=0)+hash.$(shell git rev-parse --short HEAD)
 
-DESTDIR ?=
+# Destination directory and prefix to place the compiled binaries, documentaions
-PREFIX ?= /usr/local
+# and other files.
-EXECUTABLE := dyndns-client
+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}
+dyndns-client:
-
-${EXECUTABLE}:
 	CGO_ENABLED=0 \
-	GOPRIVATE=$(shell go env GOPRIVATE) \
 	GOPROXY=$(shell go env GOPROXY) \
-		go build -ldflags "-X main.version=${VERSION:v%=%}" -o ${@}
+		go build -ldflags "-X 'main.version=${VERSION}'" -o ${@} main.go
-
-# TEST
-# ==============================================================================
-PHONY+=test/unit
-test/unit: clean ${EXECUTABLE}
-	go test -v ./pkg/...
 
 # CLEAN
 # ==============================================================================
 PHONY+=clean
 clean:
-	rm --force ${EXECUTABLE} || true
+	rm --force --recursive dyndns-client
-	rm --force --recursive bin || true
 
-# UN/INSTALL
+# TESTS
 # ==============================================================================
-PHONY+=install
+PHONY+=test/unit
-install: ${EXECUTABLE}
+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 --directory ${DESTDIR}${PREFIX}/share/licenses/${EXECUTABLE}
-	install --mode 644 systemd/${EXECUTABLE}.service ${DESTDIR}/usr/lib/systemd/system
+	install --mode 0644 LICENSE ${DESTDIR}${PREFIX}/share/licenses/${EXECUTABLE}/LICENSE
-
-	install --directory ${DESTDIR}/usr/share/licenses/${EXECUTABLE}
-	install --mode 644 LICENSE ${DESTDIR}/usr/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}${PREFIX}/share/licenses/${EXECUTABLE}
-		${DESTDIR}/usr/share/licenses/${EXECUTABLE}/LICENSE
+
+# 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
 # ==============================================================================
+# 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,7 +3,7 @@ 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.1
 )

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"
+      ]
+    }
   ]
 }