Support the hdbcli client library
#10595
Merged
+251
−60
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
added
ofek
force-pushed
the
ofek/sap-hana
branch
2 times, most recently
from
e12cb70
to
ee92184
Compare
sarah-witt
requested changes
Nov 10, 2021
hithwen
reviewed
Nov 10, 2021
| https://help.sap.com/viewer/f1b440ded6144a54ada97ff95dac7adf/2.10/en-US/ee592e89dcce4480a99571a4ae7a702f.html | ||
| value: | ||
| type: object | ||
| additionalProperties: true |
There was a problem hiding this comment.
Allows for anything https://swagger.io/docs/specification/data-models/dictionaries/#free-form
hithwen
reviewed
Nov 10, 2021
Comment on lines
+587
to
+651
| if USING_HDBCLI: | ||
|
|
||
| def get_connection(self): | ||
| # https://help.sap.com/viewer/f1b440ded6144a54ada97ff95dac7adf/2.10/en-US/ee592e89dcce4480a99571a4ae7a702f.html | ||
| connection_properties = self.instance.get('connection_properties', {}).copy() | ||
|
|
||
| connection_properties.setdefault('address', self._server) | ||
| connection_properties.setdefault('port', self._port) | ||
| connection_properties.setdefault('user', self._username) | ||
| connection_properties.setdefault('password', self._password) | ||
|
|
||
| timeout_milliseconds = int(self._timeout * 1000) | ||
| connection_properties.setdefault('communicationTimeout', timeout_milliseconds) | ||
| connection_properties.setdefault('nodeConnectTimeout', timeout_milliseconds) | ||
|
|
||
| if self._use_tls: | ||
| connection_properties.setdefault('encrypt', True) | ||
| connection_properties.setdefault('sslHostNameInCertificate', self._server) | ||
| connection_properties.setdefault('sslSNIHostname', self._server) | ||
|
|
||
| tls_verify = self.instance.get('tls_verify', True) | ||
| if not tls_verify: | ||
| connection_properties.setdefault('sslValidateCertificate', False) | ||
|
|
||
| tls_cert = self.instance.get('tls_cert') | ||
| if tls_cert: | ||
| connection_properties.setdefault('sslKeyStore', tls_cert) | ||
|
|
||
| tls_ca_cert = self.instance.get('tls_ca_cert') | ||
| if tls_ca_cert: | ||
| connection_properties.setdefault('sslTrustStore', tls_ca_cert) | ||
| elif not connection_properties.get('sslUseDefaultTrustStore', True): | ||
| connection_properties.setdefault('sslTrustStore', certifi.where()) | ||
|
|
||
| try: | ||
| connection = HanaConnection(**connection_properties) | ||
| except Exception as e: | ||
| error = str(e) | ||
| self.log.error('Unable to connect to SAP HANA: %s', error) | ||
| self.service_check(self.SERVICE_CHECK_CONNECT, self.CRITICAL, message=error, tags=self._tags) | ||
| else: | ||
| self.service_check(self.SERVICE_CHECK_CONNECT, self.OK, tags=self._tags) | ||
| return connection | ||
|
|
||
| else: | ||
|
|
||
| def get_connection(self): | ||
| try: | ||
| tls_context = self.get_tls_context() if self._use_tls else None | ||
| connection = HanaConnection( | ||
| host=self._server, | ||
| port=self._port, | ||
| user=self._username, | ||
| password=self._password, | ||
| tls_context=tls_context, | ||
| timeout=self._timeout, | ||
| ) | ||
| connection.connect() | ||
| except Exception as e: | ||
| error = str(e) | ||
| self.log.error('Unable to connect to SAP HANA: %s', error) | ||
| self.service_check(self.SERVICE_CHECK_CONNECT, self.CRITICAL, message=error, tags=self._tags) | ||
| else: | ||
| self.service_check(self.SERVICE_CHECK_CONNECT, self.OK, tags=self._tags) | ||
| return connection |
There was a problem hiding this comment.
Should this be in connection.py?
There was a problem hiding this comment.
No b/c I think it makes more sense for the split in config logic to be closer to the check since it needs attributes of the check
sarah-witt
previously approved these changes
Nov 10, 2021
Co-authored-by: ruthnaebeck <19349244+ruthnaebeck@users.noreply.github.com>
sarah-witt
approved these changes
Nov 12, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
https://github.com/SAP-archive/PyHDB