Skip to content

Commit 252d8b7

Browse files
yashmehrotramoshloop
authored andcommitted
chore: http connection url to string from envvar
1 parent 0ae0a34 commit 252d8b7

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

connection/http.go

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ func (t TLSConfig) IsEmpty() bool {
3636
type HTTPConnection struct {
3737
ConnectionName string `json:"connection,omitempty" yaml:"connection,omitempty"`
3838
types.Authentication `json:",inline"`
39-
URL types.EnvVar `json:"url,omitempty" yaml:"url,omitempty"`
39+
URL string `json:"url,omitempty" yaml:"url,omitempty"`
4040
Bearer types.EnvVar `json:"bearer,omitempty" yaml:"bearer,omitempty"`
4141
OAuth types.OAuth `json:"oauth,omitempty" yaml:"oauth,omitempty"`
4242
TLS TLSConfig `json:"tls,omitempty" yaml:"tls,omitempty"`
4343
}
4444

4545
func (h HTTPConnection) GetEndpoint() string {
46-
return h.URL.String()
46+
return h.URL
4747
}
4848

4949
func (h *HTTPConnection) Hydrate(ctx ConnectionContext, namespace string) (*HTTPConnection, error) {
@@ -62,7 +62,13 @@ func (h *HTTPConnection) Hydrate(ctx ConnectionContext, namespace string) (*HTTP
6262
}
6363
}
6464

65-
h.URL.ValueStatic, err = ctx.GetEnvValueFromCache(h.URL, namespace)
65+
// URL can be an EnvVar string so we
66+
// typecase to EnvVar and scan it first
67+
var url types.EnvVar
68+
if err := url.Scan(h.URL); err != nil {
69+
return h, err
70+
}
71+
h.URL, err = ctx.GetEnvValueFromCache(url, namespace)
6672
if err != nil {
6773
return h, err
6874
}
@@ -142,9 +148,6 @@ func NewHTTPConnection(ctx ConnectionContext, conn models.Connection) (HTTPConne
142148
var httpConn HTTPConnection
143149
switch conn.Type {
144150
case models.ConnectionTypeHTTP:
145-
if err := httpConn.URL.Scan(conn.URL); err != nil {
146-
return httpConn, fmt.Errorf("error scanning url: %w", err)
147-
}
148151
if err := httpConn.Username.Scan(conn.Username); err != nil {
149152
return httpConn, fmt.Errorf("error scanning username: %w", err)
150153
}

connection/zz_generated.deepcopy.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)