Merge pull request #41 from dchudik/idn_domains

tarry-dvice · web-flow · commit 99c77d256a65 · 2025-04-16T17:20:35.000+03:00
Added supporting IDN domains
diff --git a/.github/workflows/pr-ci-chart.yaml b/.github/workflows/pr-ci-chart.yaml
@@ -22,7 +22,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: 3.13.3
 
       - name: Set up chart-testing
         uses: helm/chart-testing-action@v2.1.0
@@ -47,9 +47,10 @@ jobs:
     strategy:
       matrix:
         k8s:
-          - v1.17.14
-          - v1.19.4
-          - v1.21.6
+          - v1.30.10
+          - v1.31.6
+          - v1.32.2
+
     steps:
       - name: Checkout
         uses: actions/checkout@v1
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,25 +1,38 @@
+version: "2"
 linters:
-  fast: false
-  enable-all: true
+  default: all
   disable:
     - bodyclose
+    - depguard
     - dupl
+    - exhaustruct
+    - funcorder
     - gochecknoglobals
     - gosec
     - lll
-    - wsl
-    - depguard
-    - testpackage
-    - exhaustruct
     - tagliatelle
-    # Disbale deprecated linters
-    - interfacer
-    - ifshort
-    - structcheck
-    - maligned
-    - scopelint 
-    - deadcode
-    - nosnakecase
-    - golint
-    - varcheck
-    - exhaustivestruct
+    - testpackage
+    - wsl
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,9 @@
 sudo: false
 language: go
 install:
-  - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.43.0
+  - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.1.1
 go:
-  - "1.17"
+  - "1.24.2"
 script:
   - make golangci-lint
   - make unit-tests
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20.3-alpine AS build
+FROM golang:1.24.2-alpine3.21 AS build
 RUN apk add --no-cache git
 WORKDIR /workspace
 ENV GO111MODULE=on
@@ -7,7 +7,7 @@ RUN go mod download
 RUN CGO_ENABLED=0 go build -o webhook -ldflags '-w -extldflags "-static"' .
 
 # ------------------------------
-FROM alpine:3.14.2
+FROM alpine:3.21.3
 RUN apk add --no-cache ca-certificates
 COPY --from=build /workspace/webhook /usr/local/bin/webhook
 ENTRYPOINT ["webhook"]
diff --git a/deploy/cert-manager-webhook-selectel/Chart.yaml b/deploy/cert-manager-webhook-selectel/Chart.yaml
@@ -1,10 +1,10 @@
 ---
 apiVersion: v1
 name: cert-manager-webhook-selectel
-appVersion: "1.3.0"
+appVersion: "1.4.0"
 description: Selectel DNS cert-manager ACME webhook
 maintainers:
   - name: andrsp
     email: izotikov@selectel.ru
     url: https://github.com/andrsp
-version: 1.3.0
+version: 1.4.0
diff --git a/deploy/cert-manager-webhook-selectel/values.yaml b/deploy/cert-manager-webhook-selectel/values.yaml
@@ -16,7 +16,7 @@ replicaCount: 1
 
 image:
   repository: ghcr.io/selectel/cert-manager-webhook-selectel
-  tag: v1.3.0
+  tag: v1.4.0
   pullPolicy: Always
 
 nameOverride: ""
diff --git a/go.mod b/go.mod
@@ -1,13 +1,14 @@
 module github.com/selectel/cert-manager-webhook-selectel
 
-go 1.20
+go 1.24
 
 require (
 	github.com/cert-manager/cert-manager v1.14.1
 	github.com/go-playground/validator/v10 v10.17.0
 	github.com/selectel/domains-go v1.0.2
 	github.com/selectel/go-selvpcclient/v3 v3.1.1
 	github.com/stretchr/testify v1.8.4
+	golang.org/x/net v0.19.0
 	k8s.io/api v0.29.1
 	k8s.io/apiextensions-apiserver v0.29.0
 	k8s.io/apimachinery v0.29.1
@@ -89,7 +90,6 @@ require (
 	golang.org/x/crypto v0.17.0 // indirect
 	golang.org/x/exp v0.0.0-20231226003508-02704c960a9b // indirect
 	golang.org/x/mod v0.14.0 // indirect
-	golang.org/x/net v0.19.0 // indirect
 	golang.org/x/oauth2 v0.15.0 // indirect
 	golang.org/x/sync v0.5.0 // indirect
 	golang.org/x/sys v0.16.0 // indirect
diff --git a/go.sum b/go.sum
diff --git a/main.go b/main.go
@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"os"
 
@@ -28,14 +29,14 @@ const (
 var (
 	// use a single instance of Validate, it caches struct info.
 	validate              *validator.Validate = validator.New(validator.WithRequiredStructEnabled())
-	errSecretNameNotSetup                     = fmt.Errorf("secret name not setup")
-	errConvertToValidator                     = fmt.Errorf("convert to validator")
+	errSecretNameNotSetup                     = errors.New("secret name not setup")
+	errConvertToValidator                     = errors.New("convert to validator")
 )
 
 func main() {
 	groupName := os.Getenv("GROUP_NAME")
 	if groupName == "" {
-		panic(fmt.Sprintf("%s must be specified", groupNameEnvVar))
+		panic(groupNameEnvVar + " must be specified")
 	}
 	// This will register our custom DNS provider with the webhook serving
 	// library, making it available as an API under the provided groupName.
diff --git a/selectel/internal/rrset.go b/selectel/internal/rrset.go
@@ -2,24 +2,31 @@ package internal
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"regexp"
 	"strconv"
 
 	domainsV2 "github.com/selectel/domains-go/pkg/v2"
+	"golang.org/x/net/idna"
 )
 
-var ErrRrsetNotFound = fmt.Errorf("rrset not found")
+var ErrRrsetNotFound = errors.New("rrset not found")
 
 func GetRrsetByNameAndType(ctx context.Context, client domainsV2.DNSClient[domainsV2.Zone, domainsV2.RRSet], zoneID, rrsetName, rrsetType string) (*domainsV2.RRSet, error) {
+	rrsetNameUnicode, err := idna.ToUnicode(rrsetName)
+	if err != nil {
+		return nil, fmt.Errorf("convert rrset name to unicode: %w", err)
+	}
+
 	optsForSearchRrset := map[string]string{
-		"name":        rrsetName,
+		"name":        rrsetNameUnicode,
 		"rrset_types": rrsetType,
 		"limit":       "100",
 		"offset":      "0",
 	}
 
-	regexpRRSetWithDotOrNot, err := regexp.Compile(fmt.Sprintf("^%s.?", rrsetName))
+	regexpRRSetWithDotOrNot, err := regexp.Compile(fmt.Sprintf("^%s.?", rrsetNameUnicode))
 	if err != nil {
 		return nil, fmt.Errorf("compile regexp: %w", err)
 	}
@@ -29,11 +36,13 @@ func GetRrsetByNameAndType(ctx context.Context, client domainsV2.DNSClient[domai
 		if err != nil {
 			return nil, fmt.Errorf("list rrsets: %w", err)
 		}
+
 		for _, rrset := range rrsets.GetItems() {
 			if regexpRRSetWithDotOrNot.MatchString(rrset.Name) && string(rrset.Type) == rrsetType {
 				return rrset, nil
 			}
 		}
+
 		optsForSearchRrset["offset"] = strconv.Itoa(rrsets.GetNextOffset())
 		if rrsets.GetNextOffset() == 0 {
 			break
diff --git a/selectel/internal/rrset_test.go b/selectel/internal/rrset_test.go
@@ -2,21 +2,22 @@ package internal
 
 import (
 	"context"
-	"fmt"
+	"errors"
 	"strconv"
 	"testing"
 
 	domainsV2 "github.com/selectel/domains-go/pkg/v2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
 )
 
 type mockedDNSv2ClientRRSets struct {
 	mock.Mock
 	domainsV2.Client
 }
 
-var errConvertFirstArgInMock = fmt.Errorf("convert first arg")
+var errConvertFirstArgInMock = errors.New("convert first arg")
 
 func (client *mockedDNSv2ClientRRSets) ListRRSets(ctx context.Context, zoneID string, opts *map[string]string) (domainsV2.Listable[domainsV2.RRSet], error) {
 	args := client.Called(ctx, zoneID, opts)
@@ -35,7 +36,7 @@ func TestGetRrsetByNameAndTypeWithoutOffset(t *testing.T) {
 	rrsetTypeForSearch := "A"
 	mockedZoneID := "mocked-zone-id"
 	mDNSClient := new(mockedDNSv2ClientRRSets)
-	ctx := context.Background()
+	ctx := t.Context()
 	opts1 := &map[string]string{
 		"name":        testZoneName,
 		"rrset_types": rrsetTypeForSearch,
@@ -62,8 +63,7 @@ func TestGetRrsetByNameAndTypeWithoutOffset(t *testing.T) {
 	mDNSClient.On("ListRRSets", ctx, mockedZoneID, opts1).Return(rrsetWithoutOffset, nil)
 
 	rrset, err := GetRrsetByNameAndType(ctx, mDNSClient, mockedZoneID, testZoneName, rrsetTypeForSearch)
-
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	assert.NotNil(t, rrset)
 	assert.Equal(t, correctIDForSearch, rrset.ID)
@@ -76,7 +76,7 @@ func TestGetRrsetByNameAndTypeWithOffset(t *testing.T) {
 	rrsetTypeForSearch := "A"
 	mockedZoneID := "mocked-zone-id"
 	mDNSClient := new(mockedDNSv2ClientRRSets)
-	ctx := context.Background()
+	ctx := t.Context()
 	nextOffset := 3
 	opts1 := &map[string]string{
 		"name":        testZoneName,
@@ -117,8 +117,7 @@ func TestGetRrsetByNameAndTypeWithOffset(t *testing.T) {
 	mDNSClient.On("ListRRSets", ctx, mockedZoneID, opts2).Return(rrsetsWithoutNextOffset, nil)
 
 	rrset, err := GetRrsetByNameAndType(ctx, mDNSClient, mockedZoneID, testZoneName, rrsetTypeForSearch)
-
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	assert.NotNil(t, rrset)
 	assert.Equal(t, correctIDForSearch, rrset.ID)
diff --git a/selectel/internal/zone.go b/selectel/internal/zone.go
@@ -2,22 +2,30 @@ package internal
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"regexp"
 	"strconv"
 
 	domainsV2 "github.com/selectel/domains-go/pkg/v2"
+	"golang.org/x/net/idna"
 )
 
-var ErrZoneNotFound = fmt.Errorf("zone not found")
+var ErrZoneNotFound = errors.New("zone not found")
 
 func GetZoneByName(ctx context.Context, client domainsV2.DNSClient[domainsV2.Zone, domainsV2.RRSet], zoneName string) (*domainsV2.Zone, error) {
+	zoneNameUnicode, err := idna.ToUnicode(zoneName)
+	if err != nil {
+		return nil, fmt.Errorf("convert zone name to unicode: %w", err)
+	}
+
 	optsForSearchZone := map[string]string{
-		"filter": zoneName,
+		"filter": zoneNameUnicode,
 		"limit":  "100",
 		"offset": "0",
 	}
-	regexpZoneWithDotOrNot, err := regexp.Compile(fmt.Sprintf("^%s.?", zoneName))
+
+	regexpZoneWithDotOrNot, err := regexp.Compile(fmt.Sprintf("^%s.?", zoneNameUnicode))
 	if err != nil {
 		return nil, fmt.Errorf("compile regexp: %w", err)
 	}
@@ -27,11 +35,13 @@ func GetZoneByName(ctx context.Context, client domainsV2.DNSClient[domainsV2.Zon
 		if err != nil {
 			return nil, fmt.Errorf("list zones: %w", err)
 		}
+
 		for _, zone := range zones.GetItems() {
 			if regexpZoneWithDotOrNot.MatchString(zone.Name) {
 				return zone, nil
 			}
 		}
+
 		optsForSearchZone["offset"] = strconv.Itoa(zones.GetNextOffset())
 		if zones.GetNextOffset() == 0 {
 			break
diff --git a/selectel/internal/zone_test.go b/selectel/internal/zone_test.go
@@ -8,6 +8,7 @@ import (
 	domainsV2 "github.com/selectel/domains-go/pkg/v2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
 )
 
 type mockedDNSv2ClientZones struct {
@@ -36,7 +37,7 @@ const (
 func TestGetZoneByNameWithoutOffset(t *testing.T) {
 	t.Parallel()
 	mDNSClient := new(mockedDNSv2ClientZones)
-	ctx := context.Background()
+	ctx := t.Context()
 	opts1 := &map[string]string{
 		"filter": testZoneName,
 		"limit":  "100",
@@ -60,7 +61,7 @@ func TestGetZoneByNameWithoutOffset(t *testing.T) {
 	mDNSClient.On("ListZones", ctx, opts1).Return(zonesWithoutOffset, nil)
 
 	zone, err := GetZoneByName(ctx, mDNSClient, testZoneName)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	assert.NotNil(t, zone)
 	assert.Equal(t, correctIDForSearch, zone.ID)
@@ -70,7 +71,7 @@ func TestGetZoneByNameWithoutOffset(t *testing.T) {
 func TestGetZoneByNameWithOffset(t *testing.T) {
 	t.Parallel()
 	mDNSClient := new(mockedDNSv2ClientZones)
-	ctx := context.Background()
+	ctx := t.Context()
 	nextOffset := 3
 	opts1 := &map[string]string{
 		"filter": testZoneName,
@@ -107,7 +108,7 @@ func TestGetZoneByNameWithOffset(t *testing.T) {
 	mDNSClient.On("ListZones", ctx, opts2).Return(zonesWithoutNextOffset, nil)
 
 	zone, err := GetZoneByName(ctx, mDNSClient, testZoneName)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	assert.NotNil(t, zone)
 	assert.Equal(t, correctIDForSearch, zone.ID)
diff --git a/selectel/selectel_test.go b/selectel/selectel_test.go
diff --git a/utils/errors.go b/utils/errors.go
