Implement GSP-41 (#681)

* Implement GSP-41 * Modify test file
beyondstorage · Jul 20, 2021 · df6a96a · df6a96a
1 parent 3d8d457
commit df6a96a
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 39 deletions.
diff --git a/cmd/definitions/bindata/bindata.go b/cmd/definitions/bindata/bindata.go
diff --git a/cmd/definitions/tests/connstr_test.go b/cmd/definitions/tests/connstr_test.go
@@ -3,6 +3,7 @@ package tests
 import (
 	"errors"
 	"testing"
+	"time"
 
 	"github.com/beyondstorage/go-storage/v4/pairs"
 	"github.com/beyondstorage/go-storage/v4/services"
@@ -78,7 +79,7 @@ func TestFromString(t *testing.T) {
 				pairs.WithName("abc"),
 				pairs.WithWorkDir("/tmp/tmp1"),
 				pairs.WithSize(200),
-				pairs.WithExpire(100),
+				pairs.WithExpire(time.Duration(100)),
 				WithStorageClass("sc"),
 			},
 			nil,

diff --git a/cmd/definitions/tmpl/pair.tmpl b/cmd/definitions/tmpl/pair.tmpl
@@ -3,6 +3,7 @@ package pairs
 
 import (
     "context"
+    "time"
 
     "github.com/beyondstorage/go-storage/v4/pkg/httpclient"
     . "github.com/beyondstorage/go-storage/v4/types"

diff --git a/cmd/definitions/tmpl/service.tmpl b/cmd/definitions/tmpl/service.tmpl
@@ -4,6 +4,7 @@ package {{ .Name }}
 import (
     "context"
     "io"
+    "time"
 
     "github.com/beyondstorage/go-storage/v4/pkg/httpclient"
     "github.com/beyondstorage/go-storage/v4/services"
@@ -13,6 +14,7 @@ import (
 var _ Storager
 var _ services.ServiceError
 var _ httpclient.Options
+var _ time.Duration
 
 // Type is the type for {{ .Name }}
 const Type = "{{ .Name }}"

diff --git a/definitions/pairs.toml b/definitions/pairs.toml
@@ -17,7 +17,7 @@ type = "string"
 description = "specify how to provide endpoint for service or storage"
 
 [expire]
-type = "int"
+type = "time.Duration"
 description = "specify when the url returned by reach will expire"
 
 [interceptor]

diff --git a/pairs/generated.go b/pairs/generated.go
diff --git a/services/new.go b/services/new.go
@@ -6,6 +6,7 @@ import (
 	"strconv"
 	"strings"
 	"sync"
+	"time"
 
 	"github.com/beyondstorage/go-storage/v4/pairs"
 	"github.com/beyondstorage/go-storage/v4/types"
@@ -204,6 +205,10 @@ func parse(m map[string]string, k string, v string) (pair types.Pair, err error)
 		pair.Value, err = strconv.ParseUint(v, 0, 64)
 	case "[]byte":
 		pair.Value, err = base64.RawStdEncoding.DecodeString(v)
+	case "time.Duration":
+		var i int64
+		i, err = strconv.ParseInt(v, 0, 64)
+		pair.Value = time.Duration(i)
 	default:
 		return types.Pair{}, fmt.Errorf("type not parseable: %v, %v", k, vType)
 	}