Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
this allows to deploy a new bundle for the content without exposing
it as a the activated one.

### Fixed

- Command-line options like `--api-key` and associated environment variables
like `CONNECT_API_KEY` take precedence over values in a stored deployment
target. (#684)

## [1.26.0] - 2025-05-28

### Added
Expand Down
15 changes: 7 additions & 8 deletions rsconnect/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -859,14 +859,13 @@ def setup_remote_server(
if header_output:
self.logger.warning("\n")

# TODO: Is this logic backward? Seems like the provided value should override the stored value.
api_key = server_data.api_key or api_key
snowflake_connection_name = server_data.snowflake_connection_name or snowflake_connection_name
insecure = server_data.insecure or insecure
ca_data = server_data.ca_data or ca_data
account_name = server_data.account_name or account_name
token = server_data.token or token
secret = server_data.secret or secret
api_key = api_key or server_data.api_key
snowflake_connection_name = snowflake_connection_name or server_data.snowflake_connection_name
insecure = insecure or server_data.insecure
ca_data = ca_data or server_data.ca_data
account_name = account_name or server_data.account_name
token = token or server_data.token
secret = secret or server_data.secret

self.is_server_from_store = server_data.from_store

Expand Down
Loading