Skip to content

refactor unused function #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
setoru merged 2 commits into from
Dec 31, 2025
Merged

refactor unused function #32

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
276c940
fix extractRecordName in function getRecords
setoru Dec 12, 2025
c443dcf
refactor function
setoru Dec 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 13 additions & 21 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"encoding/json"
"fmt"
"os"
"strings"

"github.com/cert-manager/cert-manager/pkg/acme/webhook/apis/acme/v1alpha1"
"github.com/cert-manager/cert-manager/pkg/acme/webhook/cmd"
Expand Down Expand Up @@ -143,7 +142,7 @@ func (h *huaweiDNSProviderSolver) CleanUp(ch *v1alpha1.ChallengeRequest) error {
return err
}

records, err := h.getRecords(zoneId, ch.ResolvedZone, ch.ResolvedFQDN)
records, err := h.getRecords(zoneId, ch.ResolvedFQDN)
if err != nil {
return err
}
Expand All @@ -153,9 +152,10 @@ func (h *huaweiDNSProviderSolver) CleanUp(ch *v1alpha1.ChallengeRequest) error {
if r[0] != ch.Key {
continue
}
req := &dnsMdl.DeleteRecordSetRequest{}
req.ZoneId = zoneId
req.RecordsetId = *record.Id
req := &dnsMdl.DeleteRecordSetRequest{
ZoneId: zoneId,
RecordsetId: *record.Id,
}
resp, err := h.huaweiClient.DeleteRecordSet(req)
if err != nil {
return errors.Wrap(err, "failed to delete record")
Expand Down Expand Up @@ -245,9 +245,10 @@ func (h *huaweiDNSProviderSolver) getHuaweiClient(ch *v1alpha1.ChallengeRequest,
func (h *huaweiDNSProviderSolver) getZoneId(resolvedZone string) (string, error) {
zoneList := make([]dnsMdl.PrivateZoneResp, 0)

req := &dnsMdl.ListPrivateZonesRequest{}
req.Offset = ptr.To[int32](0)
req.Limit = ptr.To[int32](50)
req := &dnsMdl.ListPrivateZonesRequest{
Offset: ptr.To[int32](0),
Limit: ptr.To[int32](50),
}
totalCount := int32(50)

for *req.Offset < totalCount {
Expand Down Expand Up @@ -299,20 +300,11 @@ func (h *huaweiDNSProviderSolver) addTxtRecord(zoneId, fqdn, key string) error {
return nil
}

func extractRecordName(fqdn, zone string) string {
if idx := strings.Index(fqdn, "."+zone); idx != -1 {
return fqdn[:idx]
func (h *huaweiDNSProviderSolver) getRecords(zoneId, fqdn string) ([]dnsMdl.ListRecordSets, error) {
req := &dnsMdl.ListRecordSetsByZoneRequest{
ZoneId: zoneId,
Name: &fqdn,
}

return util.UnFqdn(fqdn)
}

func (h *huaweiDNSProviderSolver) getRecords(zoneId, zone, fqdn string) ([]dnsMdl.ListRecordSets, error) {
recordName := extractRecordName(fqdn, zone)
req := &dnsMdl.ListRecordSetsByZoneRequest{}
req.ZoneId = zoneId
req.Name = &recordName

req.Offset = ptr.To[int32](0)
req.Limit = ptr.To[int32](50)
totalCount := int32(50)
Expand Down