Migrate to checker-sdk-go v1.3.0 with new server subpackage
The SDK split the HTTP server scaffolding into the new checker-sdk-go/checker/server subpackage. Update both binary entry points to import server and call server.New.
This commit is contained in:
parent
4366ca9058
commit
6e59eb545d
5 changed files with 10 additions and 10 deletions
|
|
@ -5,7 +5,7 @@ import (
|
|||
"log"
|
||||
|
||||
"git.happydns.org/checker-dav/caldav"
|
||||
sdk "git.happydns.org/checker-sdk-go/checker"
|
||||
"git.happydns.org/checker-sdk-go/checker/server"
|
||||
)
|
||||
|
||||
// Version is injected at link time via -ldflags "-X main.Version=...".
|
||||
|
|
@ -16,8 +16,8 @@ var listenAddr = flag.String("listen", ":8080", "HTTP listen address")
|
|||
func main() {
|
||||
flag.Parse()
|
||||
caldav.Version = Version
|
||||
server := sdk.NewServer(caldav.Provider())
|
||||
if err := server.ListenAndServe(*listenAddr); err != nil {
|
||||
srv := server.New(caldav.Provider())
|
||||
if err := srv.ListenAndServe(*listenAddr); err != nil {
|
||||
log.Fatalf("server error: %v", err)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import (
|
|||
"log"
|
||||
|
||||
"git.happydns.org/checker-dav/carddav"
|
||||
sdk "git.happydns.org/checker-sdk-go/checker"
|
||||
"git.happydns.org/checker-sdk-go/checker/server"
|
||||
)
|
||||
|
||||
// Version is injected at link time via -ldflags "-X main.Version=...".
|
||||
|
|
@ -16,8 +16,8 @@ var listenAddr = flag.String("listen", ":8080", "HTTP listen address")
|
|||
func main() {
|
||||
flag.Parse()
|
||||
carddav.Version = Version
|
||||
server := sdk.NewServer(carddav.Provider())
|
||||
if err := server.ListenAndServe(*listenAddr); err != nil {
|
||||
srv := server.New(carddav.Provider())
|
||||
if err := srv.ListenAndServe(*listenAddr); err != nil {
|
||||
log.Fatalf("server error: %v", err)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
2
go.mod
2
go.mod
|
|
@ -3,7 +3,7 @@ module git.happydns.org/checker-dav
|
|||
go 1.25.0
|
||||
|
||||
require (
|
||||
git.happydns.org/checker-sdk-go v1.2.0
|
||||
git.happydns.org/checker-sdk-go v1.3.0
|
||||
git.happydns.org/checker-tls v0.2.0
|
||||
)
|
||||
|
||||
|
|
|
|||
4
go.sum
4
go.sum
|
|
@ -1,5 +1,5 @@
|
|||
git.happydns.org/checker-sdk-go v1.2.0 h1:v4MpKAz0W3PwP+bxx3pya8w893sVH5xTD1of1cc0TV8=
|
||||
git.happydns.org/checker-sdk-go v1.2.0/go.mod h1:aNAcfYFfbhvH9kJhE0Njp5GX0dQbxdRB0rJ0KvSC5nI=
|
||||
git.happydns.org/checker-sdk-go v1.3.0 h1:FG2kIhlJCzI0m35EhxSgn4UWc9M4ha6aZTeoChu4l7A=
|
||||
git.happydns.org/checker-sdk-go v1.3.0/go.mod h1:aNAcfYFfbhvH9kJhE0Njp5GX0dQbxdRB0rJ0KvSC5nI=
|
||||
git.happydns.org/checker-tls v0.2.0 h1:2dYpcePBylUc3le76fFlLbxraiLpGESmOhx4NfD7REM=
|
||||
git.happydns.org/checker-tls v0.2.0/go.mod h1:0ZSG0CTP007SHBPE7qInESVIOcW+xgucHUhHgj6MeZ8=
|
||||
github.com/emersion/go-ical v0.0.0-20240127095438-fc1c9d8fb2b6 h1:kHoSgklT8weIDl6R6xFpBJ5IioRdBU1v2X2aCZRVCcM=
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ func FindScheduleURLs(ctx context.Context, client *http.Client, principalURL str
|
|||
// ── raw PROPFIND ─────────────────────────────────────────────────────────────
|
||||
|
||||
// multistatus is the subset of the DAV:multistatus XML schema we need to read
|
||||
// principal URLs and scheduling hrefs. It is intentionally permissive; extra
|
||||
// principal URLs and scheduling hrefs. It is intentionally permissive, extra
|
||||
// elements are ignored, which makes us tolerant of server-specific extensions.
|
||||
type multistatus struct {
|
||||
XMLName xml.Name `xml:"DAV: multistatus"`
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue