Skip to content

Commit e3cd62e

Browse files
committed
Undid changes to config
Signed-off-by: nithinkdb <nithin.krishnamurthi@databricks.com>
1 parent e93dd29 commit e3cd62e

1 file changed

Lines changed: 38 additions & 45 deletions

File tree

internal/config/config.go

Lines changed: 38 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -82,25 +82,24 @@ func (c *Config) DeepCopy() *Config {
8282

8383
// UserConfig is the set of configurations exposed to users
8484
type UserConfig struct {
85-
Protocol string
86-
Host string // from databricks UI
87-
Port int // from databricks UI
88-
HTTPPath string // from databricks UI
89-
Catalog string
90-
Schema string
91-
Authenticator auth.Authenticator
92-
AccessToken string // from databricks UI
93-
MaxRows int // max rows per page
94-
QueryTimeout time.Duration // Timeout passed to server for query processing
95-
UserAgentEntry string
96-
Location *time.Location
97-
SessionParams map[string]string
98-
RetryWaitMin time.Duration
99-
RetryWaitMax time.Duration
100-
RetryMax int
101-
Transport http.RoundTripper
102-
UseLz4Compression bool
103-
StagingAllowedLocalPath string
85+
Protocol string
86+
Host string // from databricks UI
87+
Port int // from databricks UI
88+
HTTPPath string // from databricks UI
89+
Catalog string
90+
Schema string
91+
Authenticator auth.Authenticator
92+
AccessToken string // from databricks UI
93+
MaxRows int // max rows per page
94+
QueryTimeout time.Duration // Timeout passed to server for query processing
95+
UserAgentEntry string
96+
Location *time.Location
97+
SessionParams map[string]string
98+
RetryWaitMin time.Duration
99+
RetryWaitMax time.Duration
100+
RetryMax int
101+
Transport http.RoundTripper
102+
UseLz4Compression bool
104103
CloudFetchConfig
105104
}
106105

@@ -124,26 +123,25 @@ func (ucfg UserConfig) DeepCopy() UserConfig {
124123
}
125124

126125
return UserConfig{
127-
Protocol: ucfg.Protocol,
128-
Host: ucfg.Host,
129-
Port: ucfg.Port,
130-
HTTPPath: ucfg.HTTPPath,
131-
Catalog: ucfg.Catalog,
132-
Schema: ucfg.Schema,
133-
Authenticator: ucfg.Authenticator,
134-
AccessToken: ucfg.AccessToken,
135-
MaxRows: ucfg.MaxRows,
136-
QueryTimeout: ucfg.QueryTimeout,
137-
UserAgentEntry: ucfg.UserAgentEntry,
138-
Location: loccp,
139-
SessionParams: sessionParams,
140-
RetryWaitMin: ucfg.RetryWaitMin,
141-
RetryWaitMax: ucfg.RetryWaitMax,
142-
RetryMax: ucfg.RetryMax,
143-
Transport: ucfg.Transport,
144-
UseLz4Compression: ucfg.UseLz4Compression,
145-
StagingAllowedLocalPath: ucfg.StagingAllowedLocalPath,
146-
CloudFetchConfig: ucfg.CloudFetchConfig,
126+
Protocol: ucfg.Protocol,
127+
Host: ucfg.Host,
128+
Port: ucfg.Port,
129+
HTTPPath: ucfg.HTTPPath,
130+
Catalog: ucfg.Catalog,
131+
Schema: ucfg.Schema,
132+
Authenticator: ucfg.Authenticator,
133+
AccessToken: ucfg.AccessToken,
134+
MaxRows: ucfg.MaxRows,
135+
QueryTimeout: ucfg.QueryTimeout,
136+
UserAgentEntry: ucfg.UserAgentEntry,
137+
Location: loccp,
138+
SessionParams: sessionParams,
139+
RetryWaitMin: ucfg.RetryWaitMin,
140+
RetryWaitMax: ucfg.RetryWaitMax,
141+
RetryMax: ucfg.RetryMax,
142+
Transport: ucfg.Transport,
143+
UseLz4Compression: ucfg.UseLz4Compression,
144+
CloudFetchConfig: ucfg.CloudFetchConfig,
147145
}
148146
}
149147

@@ -178,7 +176,7 @@ func (ucfg UserConfig) WithDefaults() UserConfig {
178176
}
179177
ucfg.UseLz4Compression = false
180178
ucfg.CloudFetchConfig = CloudFetchConfig{}.WithDefaults()
181-
ucfg.StagingAllowedLocalPath = "staging/"
179+
182180
return ucfg
183181
}
184182

@@ -281,11 +279,6 @@ func ParseDSN(dsn string) (UserConfig, error) {
281279
ucfg.Location, err = time.LoadLocation(timezone)
282280
}
283281

284-
if params.Has("stagingAllowedLocalPath") {
285-
ucfg.StagingAllowedLocalPath = params.Get("stagingAllowedLocalPath")
286-
}
287-
params.Del("stagingAllowedLocalPath")
288-
289282
// any left over params are treated as session params
290283
if len(params.Values) > 0 {
291284
sessionParams := make(map[string]string)

0 commit comments

Comments
 (0)