mirror of
https://github.com/openziti/zrok.git
synced 2025-06-19 17:27:54 +02:00
endpoints/drive/driveServer -> drives/davServer (#511)
This commit is contained in:
parent
34acc81822
commit
999b65fc6c
@ -2,7 +2,7 @@
|
|||||||
// Use of this source code is governed by a BSD-style
|
// Use of this source code is governed by a BSD-style
|
||||||
// license that can be found in the LICENSE file.
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
package driveServer
|
package davServer
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
@ -2,7 +2,7 @@
|
|||||||
// Use of this source code is governed by a BSD-style
|
// Use of this source code is governed by a BSD-style
|
||||||
// license that can be found in the LICENSE file.
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
package driveServer
|
package davServer
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
@ -2,7 +2,7 @@
|
|||||||
// Use of this source code is governed by a BSD-style
|
// Use of this source code is governed by a BSD-style
|
||||||
// license that can be found in the LICENSE file.
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
package driveServer
|
package davServer
|
||||||
|
|
||||||
// The If header is covered by Section 10.4.
|
// The If header is covered by Section 10.4.
|
||||||
// http://www.webdav.org/specs/rfc4918.html#HEADER_If
|
// http://www.webdav.org/specs/rfc4918.html#HEADER_If
|
@ -2,7 +2,7 @@
|
|||||||
// Use of this source code is governed by a BSD-style
|
// Use of this source code is governed by a BSD-style
|
||||||
// license that can be found in the LICENSE file.
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
package driveServer
|
package davServer
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"reflect"
|
"reflect"
|
@ -2,7 +2,7 @@
|
|||||||
// Use of this source code is governed by a BSD-style
|
// Use of this source code is governed by a BSD-style
|
||||||
// license that can be found in the LICENSE file.
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
package driveServer
|
package davServer
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"container/heap"
|
"container/heap"
|
@ -2,7 +2,7 @@
|
|||||||
// Use of this source code is governed by a BSD-style
|
// Use of this source code is governed by a BSD-style
|
||||||
// license that can be found in the LICENSE file.
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
package driveServer
|
package davServer
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
@ -2,7 +2,7 @@
|
|||||||
// Use of this source code is governed by a BSD-style
|
// Use of this source code is governed by a BSD-style
|
||||||
// license that can be found in the LICENSE file.
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
package driveServer
|
package davServer
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
@ -2,7 +2,7 @@
|
|||||||
// Use of this source code is governed by a BSD-style
|
// Use of this source code is governed by a BSD-style
|
||||||
// license that can be found in the LICENSE file.
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
package driveServer
|
package davServer
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
@ -2,8 +2,8 @@
|
|||||||
// Use of this source code is governed by a BSD-style
|
// Use of this source code is governed by a BSD-style
|
||||||
// license that can be found in the LICENSE file.
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
// Package driveServer provides a WebDAV server implementation.
|
// Package davServer provides a WebDAV server implementation.
|
||||||
package driveServer
|
package davServer
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
@ -2,7 +2,7 @@
|
|||||||
// Use of this source code is governed by a BSD-style
|
// Use of this source code is governed by a BSD-style
|
||||||
// license that can be found in the LICENSE file.
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
package driveServer
|
package davServer
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
@ -2,7 +2,7 @@
|
|||||||
// Use of this source code is governed by a BSD-style
|
// Use of this source code is governed by a BSD-style
|
||||||
// license that can be found in the LICENSE file.
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
package driveServer
|
package davServer
|
||||||
|
|
||||||
// The XML encoding is covered by Section 14.
|
// The XML encoding is covered by Section 14.
|
||||||
// http://www.webdav.org/specs/rfc4918.html#xml.element.definitions
|
// http://www.webdav.org/specs/rfc4918.html#xml.element.definitions
|
||||||
@ -32,7 +32,7 @@ import (
|
|||||||
// In the long term, this package should use the standard library's version
|
// In the long term, this package should use the standard library's version
|
||||||
// only, and the internal fork deleted, once
|
// only, and the internal fork deleted, once
|
||||||
// https://github.com/golang/go/issues/13400 is resolved.
|
// https://github.com/golang/go/issues/13400 is resolved.
|
||||||
ixml "github.com/openziti/zrok/endpoints/drive/driveServer/internal/xml"
|
ixml "github.com/openziti/zrok/drives/davServer/internal/xml"
|
||||||
)
|
)
|
||||||
|
|
||||||
// http://www.webdav.org/specs/rfc4918.html#ELEMENT_lockinfo
|
// http://www.webdav.org/specs/rfc4918.html#ELEMENT_lockinfo
|
@ -2,7 +2,7 @@
|
|||||||
// Use of this source code is governed by a BSD-style
|
// Use of this source code is governed by a BSD-style
|
||||||
// license that can be found in the LICENSE file.
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
package driveServer
|
package davServer
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
@ -16,7 +16,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
ixml "github.com/openziti/zrok/endpoints/drive/driveServer/internal/xml"
|
ixml "github.com/openziti/zrok/drives/davServer/internal/xml"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestReadLockInfo(t *testing.T) {
|
func TestReadLockInfo(t *testing.T) {
|
@ -4,8 +4,8 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"github.com/openziti/sdk-golang/ziti"
|
"github.com/openziti/sdk-golang/ziti"
|
||||||
"github.com/openziti/sdk-golang/ziti/edge"
|
"github.com/openziti/sdk-golang/ziti/edge"
|
||||||
|
"github.com/openziti/zrok/drives/davServer"
|
||||||
"github.com/openziti/zrok/endpoints"
|
"github.com/openziti/zrok/endpoints"
|
||||||
"github.com/openziti/zrok/endpoints/drive/driveServer"
|
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"net/http"
|
"net/http"
|
||||||
"time"
|
"time"
|
||||||
@ -43,9 +43,9 @@ func NewBackend(cfg *BackendConfig) (*Backend, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
handler := &driveServer.Handler{
|
handler := &davServer.Handler{
|
||||||
FileSystem: driveServer.Dir(cfg.DriveRoot),
|
FileSystem: davServer.Dir(cfg.DriveRoot),
|
||||||
LockSystem: driveServer.NewMemLS(),
|
LockSystem: davServer.NewMemLS(),
|
||||||
Logger: func(r *http.Request, err error) {
|
Logger: func(r *http.Request, err error) {
|
||||||
if cfg.Requests != nil {
|
if cfg.Requests != nil {
|
||||||
cfg.Requests <- &endpoints.Request{
|
cfg.Requests <- &endpoints.Request{
|
||||||
|
@ -3,7 +3,7 @@ package sync
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/openziti/zrok/endpoints/drive/driveServer"
|
"github.com/openziti/zrok/drives/davServer"
|
||||||
"io"
|
"io"
|
||||||
"io/fs"
|
"io/fs"
|
||||||
"os"
|
"os"
|
||||||
@ -59,7 +59,7 @@ func (t *FilesystemTarget) recurse(path string, d fs.DirEntry, err error) error
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
etag := ""
|
etag := ""
|
||||||
if v, ok := fi.(driveServer.ETager); ok {
|
if v, ok := fi.(davServer.ETager); ok {
|
||||||
etag, err = v.ETag(context.Background())
|
etag, err = v.ETag(context.Background())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
Loading…
x
Reference in New Issue
Block a user