Skip to content

Commit

Permalink
Merge pull request #495 from rstudio/api-key-in-server-check
Browse files Browse the repository at this point in the history
Include API key with initial server check
  • Loading branch information
mmarchetti authored Oct 17, 2023
2 parents 21acd6b + 62b41b4 commit ee140e5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- The `https_proxy` environment variable is recognized as a synonym for
`HTTPS_PROXY`.
- When adding a new server, the initial request now includes an
Authorization header containing the API key. This is needed
for Connect installations behind a proxy that only passes
authenticated requests.
- Common environment directories (`env, venv, .env, .venv`) are no longer
excluded by name. Environments are detected by the presence of a python
executable in `bin` or `Scripts` and excluded.
Expand Down
2 changes: 1 addition & 1 deletion rsconnect/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ def _test_server_and_api(server, api_key, insecure, ca_cert):
me = None

with cli_feedback("Checking %s" % server):
real_server, _ = test_server(api.RSConnectServer(server, None, insecure, ca_data))
real_server, _ = test_server(api.RSConnectServer(server, api_key, insecure, ca_data))

real_server.api_key = api_key

Expand Down

0 comments on commit ee140e5

Please sign in to comment.