4.5.1
This commit is contained in:
@@ -32,7 +32,6 @@ import (
|
||||
"strings"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
"golang.org/x/oauth2"
|
||||
decort "repository.basistech.ru/BASIS/decort-golang-sdk"
|
||||
"repository.basistech.ru/BASIS/decort-golang-sdk/config"
|
||||
"repository.basistech.ru/BASIS/decort-golang-sdk/interfaces"
|
||||
@@ -60,7 +59,10 @@ type ControllerCfg struct {
|
||||
bvs_user string // required for bvs mode
|
||||
bvs_password string // required for bvs mode
|
||||
domain string // required for bvs mode
|
||||
token oauth2.Token // obtained from BVS provider on successful login in bvs mode
|
||||
token config.Token // obtained from BVS provider on successful login in bvs mode
|
||||
path_cfg string // the path of the configuration file entry
|
||||
path_token string // the path of the token file entry
|
||||
time_to_refresh int64 // the number of minutes before the expiration of the token, a refresh will be made
|
||||
legacy_user string // required for legacy mode
|
||||
legacy_password string // required for legacy mode
|
||||
legacy_sid string // obtained from DECORT controller on successful login in legacy mode
|
||||
@@ -99,7 +101,10 @@ func ControllerConfigure(d *schema.ResourceData) (*ControllerCfg, error) {
|
||||
app_secret: d.Get("app_secret").(string),
|
||||
oauth2_url: d.Get("oauth2_url").(string),
|
||||
decort_username: "",
|
||||
token: oauth2.Token{},
|
||||
token: config.Token{},
|
||||
path_cfg: d.Get("path_cfg").(string),
|
||||
path_token: d.Get("path_token").(string),
|
||||
time_to_refresh: int64(d.Get("time_to_refresh").(int)),
|
||||
}
|
||||
|
||||
allow_unverified_ssl := d.Get("allow_unverified_ssl").(bool)
|
||||
@@ -231,7 +236,7 @@ func ControllerConfigure(d *schema.ResourceData) (*ControllerCfg, error) {
|
||||
|
||||
ret_config.caller = decort.New(sdkConf)
|
||||
case MODE_BVS:
|
||||
|
||||
|
||||
sdkConf := config.BVSConfig{
|
||||
AppID: ret_config.app_id,
|
||||
AppSecret: ret_config.app_secret,
|
||||
@@ -242,6 +247,9 @@ func ControllerConfigure(d *schema.ResourceData) (*ControllerCfg, error) {
|
||||
Password: ret_config.bvs_password,
|
||||
Domain: ret_config.domain,
|
||||
Token: ret_config.token,
|
||||
PathCfg: ret_config.path_cfg,
|
||||
PathToken: ret_config.path_token,
|
||||
TimeToRefresh: ret_config.time_to_refresh,
|
||||
}
|
||||
|
||||
ret_config.caller = decort.NewBVS(sdkConf)
|
||||
|
||||
Reference in New Issue
Block a user