Skip to content

Commit 33a5d02

Browse files
samartha-pmsamartha-pm
authored
Merge pull request #161 from OutSystems/RDODCP-321-356
2 parents b0d9411 + 898d41b commit 33a5d02

File tree

5 files changed

+36
-22
lines changed

5 files changed

+36
-22
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Dockerfile
22
FROM alpine
3+
RUN apk update && apk upgrade
34
COPY outsystemscc /app/
45
ENTRYPOINT ["/app/outsystemscc"]

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ After successfully activating the private gateway for a stage in the ODC Portal,
107107

108108
> :information_source: Please note: As of version 2.0.0, there are two different Address URLs: one for newer versions of Cloud Connector, and one for versions before version v2.0.0. Take care to use the correct Address, and if updating to a newer version of Cloud Connector from a version prior to 2.0.0, please change your URL.
109109
110+
> :information_source: Please note: For environments using proxy configurations, use version 2.0.3+ for full backward compatibility with v1.x proxy behavior. Versions 2.0.0-2.0.2 have a known issue with proxy handling that has been resolved in 2.0.3+.
111+
110112
> :information_source: Make sure to copy the Token and save it in a safe location. For security reasons, you won't be able to access it again after you close or refresh the page.
111113
112114
Use the **Token** and **Address** to form the `outsystemscc` command to run. For example:

‎go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/outsystems/cloud-connector
22

33
require (
44
github.com/go-resty/resty/v2 v2.16.5
5-
github.com/jarcoal/httpmock v1.4.0
5+
github.com/jarcoal/httpmock v1.4.1
66
github.com/jpillora/chisel v1.10.1
77
)
88

@@ -12,12 +12,12 @@ require (
1212
github.com/gorilla/websocket v1.5.3 // indirect
1313
github.com/jpillora/backoff v1.0.0 // indirect
1414
github.com/jpillora/sizestr v1.0.0 // indirect
15-
golang.org/x/crypto v0.41.0 // indirect
16-
golang.org/x/net v0.43.0 // indirect
17-
golang.org/x/sync v0.16.0 // indirect
18-
golang.org/x/sys v0.35.0 // indirect
15+
golang.org/x/crypto v0.42.0 // indirect
16+
golang.org/x/net v0.44.0 // indirect
17+
golang.org/x/sync v0.17.0 // indirect
18+
golang.org/x/sys v0.36.0 // indirect
1919
)
2020

21-
replace github.com/jpillora/chisel => github.com/outsystems/chisel v1.10.1-os.8
21+
replace github.com/jpillora/chisel => github.com/outsystems/chisel v1.11.3-os.1
2222

23-
go 1.24.6
23+
go 1.25.1

‎go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,25 @@ github.com/go-resty/resty/v2 v2.16.5 h1:hBKqmWrr7uRc3euHVqmh1HTHcKn99Smr7o5spptd
88
github.com/go-resty/resty/v2 v2.16.5/go.mod h1:hkJtXbA2iKHzJheXYvQ8snQES5ZLGKMwQ07xAwp/fiA=
99
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
1010
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
11-
github.com/jarcoal/httpmock v1.4.0 h1:BvhqnH0JAYbNudL2GMJKgOHe2CtKlzJ/5rWKyp+hc2k=
12-
github.com/jarcoal/httpmock v1.4.0/go.mod h1:ftW1xULwo+j0R0JJkJIIi7UKigZUXCLLanykgjwBXL0=
11+
github.com/jarcoal/httpmock v1.4.1 h1:0Ju+VCFuARfFlhVXFc2HxlcQkfB+Xq12/EotHko+x2A=
12+
github.com/jarcoal/httpmock v1.4.1/go.mod h1:ftW1xULwo+j0R0JJkJIIi7UKigZUXCLLanykgjwBXL0=
1313
github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
1414
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
1515
github.com/jpillora/sizestr v1.0.0 h1:4tr0FLxs1Mtq3TnsLDV+GYUWG7Q26a6s+tV5Zfw2ygw=
1616
github.com/jpillora/sizestr v1.0.0/go.mod h1:bUhLv4ctkknatr6gR42qPxirmd5+ds1u7mzD+MZ33f0=
1717
github.com/maxatome/go-testdeep v1.14.0 h1:rRlLv1+kI8eOI3OaBXZwb3O7xY3exRzdW5QyX48g9wI=
1818
github.com/maxatome/go-testdeep v1.14.0/go.mod h1:lPZc/HAcJMP92l7yI6TRz1aZN5URwUBUAfUNvrclaNM=
19-
github.com/outsystems/chisel v1.10.1-os.8 h1:49AGDE3ZIdBoBsKx2rHBZLwj5Tslpw3awfupsZr3zPo=
20-
github.com/outsystems/chisel v1.10.1-os.8/go.mod h1:LGo6iEF93bXsh81iLbM6sdHSX93JPIgr0XXvHR2ApLE=
21-
golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
22-
golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
23-
golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
24-
golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
25-
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
26-
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
27-
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
28-
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
29-
golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4=
30-
golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw=
19+
github.com/outsystems/chisel v1.11.3-os.1 h1:FMpXdRD2sdXuwLETV1gDk4QIJEt9xD56W9J2t0GnMV4=
20+
github.com/outsystems/chisel v1.11.3-os.1/go.mod h1:9+FFGn/dFxdG6iB3qvrwf1GFqnXbBZR1nDgg2DIgvCg=
21+
golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI=
22+
golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8=
23+
golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I=
24+
golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
25+
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
26+
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
27+
golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
28+
golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
29+
golang.org/x/term v0.35.0 h1:bZBVKBudEyhRcajGcNc3jIfWPqV4y/Kt2XcoigOWtDQ=
30+
golang.org/x/term v0.35.0/go.mod h1:TPGtkTLesOwf2DE8CgVYiZinHAOuy5AYUYT1lENIZnA=
3131
golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
3232
golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=

‎main.go‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ func client(args []string) {
155155
queryParams := generateQueryParameters(localPorts)
156156

157157
//get server URL
158-
serverURL := fetchURL(resty.New(), args[0])
158+
serverURL := fetchURL(createHTTPClient(&config), args[0])
159159

160160
config.Server = fmt.Sprintf("%s%s", serverURL, queryParams)
161161
config.Remotes = args[1:]
@@ -188,6 +188,17 @@ func client(args []string) {
188188
}
189189
}
190190

191+
func createHTTPClient(config *chclient.Config) *resty.Client {
192+
client := resty.New()
193+
194+
// Set proxy if configured
195+
if config.Proxy != "" {
196+
client.SetProxy(config.Proxy)
197+
}
198+
199+
return client
200+
}
201+
191202
func fetchURL(client *resty.Client, requestLocation string) string {
192203

193204
client.SetRedirectPolicy(resty.NoRedirectPolicy())

0 commit comments

Comments
 (0)