v1.7.2

config/config_bvs.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"time"
 
-	"golang.org/x/oauth2"
 	"gopkg.in/yaml.v3"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/serialization"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
@@ -24,7 +24,7 @@ type BVSConfig struct {
 	// Domain name
 	// Required: true
 	// Example: "dynamix"
-	Domain string `json:"domain" yaml:"domain"`
+	Domain string `json:"domain" yaml:"domain" validate:"required"`
 
 	// Application (client) identifier for authorization
 	// in the cloud platform controller in oauth2 mode.
@@ -50,7 +50,7 @@ type BVSConfig struct {
 	// JWT platform token
 	// Required: false
 	// Example: "qwqwdfwv68979we0q9bfv7e9sbvd89798qrwv97ff"
-	Token oauth2.Token `json:"token" yaml:"token"`
+	Token Token `json:"token" yaml:"token"`
 
 	// Amount platform request attempts
 	// Default value: 5
@@ -64,6 +64,40 @@ type BVSConfig struct {
 	// HTTP client timeout, unlimited if left empty
 	// Required: false
 	Timeout Duration `json:"timeout" yaml:"timeout"`
+
+	// The path of the configuration file entry
+	// Required: false
+	PathCfg string `json:"path_cfg" yaml:"path_cfg"`
+
+	// The path of the token file entry
+	// Required: false
+	PathToken string `json:"path_token" yaml:"path_token"`
+
+	// The number of minutes before the expiration of the token, a refresh will be made
+	// Required: false
+	TimeToRefresh int64 `json:"timeToRefresh" yaml:"timeToRefresh"`
+}
+
+type Token struct {
+	// AccessToken is the token that authorizes and authenticates
+	// the requests.
+	// Required: false
+	AccessToken string `json:"access_token" yaml:"access_token"`
+
+	// TokenType is the type of token.
+	// The Type method returns either this or "Bearer", the default.
+	// Required: false
+	TokenType string `json:"token_type" yaml:"token_type"`
+
+	// RefreshToken is a token that's used by the application
+	// (as opposed to the user) to refresh the access token
+	// if it expires.
+	// Required: false
+	RefreshToken string `json:"refresh_token" yaml:"refresh_token"`
+
+	// Expiry is the optional expiration time of the access token.
+	// Required: false
+	Expiry time.Time `json:"expiry" yaml:"expiry"`
 }
 
 // SetTimeout is used to set HTTP client timeout.
@@ -93,6 +127,50 @@ func ParseConfigBVSJSON(path string) (BVSConfig, error) {
 	return config, nil
 }
 
+// ParseConfigJSON parses Token from specified JSON-formatted file.
+func ParseTokenBVSJSON(path string) (Token, error) {
+	file, err := os.ReadFile(path)
+	if err != nil {
+		return Token{}, err
+	}
+
+	var token Token
+
+	err = json.Unmarshal(file, &token)
+	if err != nil {
+		return Token{}, err
+	}
+
+	err = validators.ValidateConfig(token)
+	if err != nil {
+		return Token{}, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	return token, nil
+}
+
+// ParseTokenBVSYAML parses Token from specified YAML-formatted file.
+func ParseTokenBVSYAML(path string) (Token, error) {
+	file, err := os.ReadFile(path)
+	if err != nil {
+		return Token{}, err
+	}
+
+	var token Token
+
+	err = yaml.Unmarshal(file, &token)
+	if err != nil {
+		return Token{}, err
+	}
+
+	err = validators.ValidateConfig(token)
+	if err != nil {
+		return Token{}, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	return token, nil
+}
+
 // ParseConfigYAML parses Config from specified YAML-formatted file.
 func ParseConfigBVSYAML(path string) (BVSConfig, error) {
 	file, err := os.ReadFile(path)
@@ -114,3 +192,25 @@ func ParseConfigBVSYAML(path string) (BVSConfig, error) {
 
 	return config, nil
 }
+
+func (t Token) Serialize(params ...string) (serialization.Serialized, error) {
+	if len(params) > 1 {
+		prefix := params[0]
+		indent := params[1]
+
+		return json.MarshalIndent(t, prefix, indent)
+	}
+
+	return json.Marshal(t)
+}
+
+func (c BVSConfig) Serialize(params ...string) (serialization.Serialized, error) {
+	if len(params) > 1 {
+		prefix := params[0]
+		indent := params[1]
+
+		return json.MarshalIndent(c, prefix, indent)
+	}
+
+	return json.Marshal(c)
+}

config/timeouts.go

@@ -22,6 +22,8 @@ func (d *Duration) UnmarshalYAML(unmarshal func(interface{}) error) error {
 		}
 		*d = Duration(tmp)
 		return nil
+	case float64:
+		return nil
 	default:
 		return fmt.Errorf("invalid duration %v", value)
 	}
@@ -40,6 +42,8 @@ func (d *Duration) UnmarshalJSON(b []byte) error {
 		}
 		*d = Duration(tmp)
 		return nil
+	case float64:
+		return nil
 	default:
 		return fmt.Errorf("invalid duration %v", value)
 	}