Skip to content

Commit

Permalink
chore: remove GCP
Browse files Browse the repository at this point in the history
  • Loading branch information
manhinhang committed Feb 25, 2024
1 parent 42f54c7 commit b3b6d4b
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN apt-get update \
procps \
xterm
RUN apt install -y openjdk-17-jre
RUN pip install ib_insync==$IB_INSYNC_VER google-cloud-secret-manager==2.11.1
RUN pip install ib_insync==$IB_INSYNC_VER

# set environment variables
ENV TWS_INSTALL_LOG=/root/Jts/tws_install.log \
Expand Down
52 changes: 26 additions & 26 deletions src/ib_account.py
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
import os
from distutils.util import strtobool
from google.cloud import secretmanager
# from distutils.util import strtobool
# from google.cloud import secretmanager

class IBAccount(object):
# Create the Secret Manager client.
__client = None

@classmethod
def retrieve_secret(cls, secret_id):
if not cls.__client:
cls.__client = secretmanager.SecretManagerServiceClient()
gcp_project_id = os.environ['GCP_PROJECT_ID']
name = cls.__client.secret_version_path(gcp_project_id, secret_id, 'latest')
response = cls.__client.access_secret_version(name=name)
payload = response.payload.data.decode('UTF-8')
return payload
# @classmethod
# def retrieve_secret(cls, secret_id):
# if not cls.__client:
# cls.__client = secretmanager.SecretManagerServiceClient()
# gcp_project_id = os.environ['GCP_PROJECT_ID']
# name = cls.__client.secret_version_path(gcp_project_id, secret_id, 'latest')
# response = cls.__client.access_secret_version(name=name)
# payload = response.payload.data.decode('UTF-8')
# return payload

@staticmethod
def isEnabledGCPSecret():
try:
return bool(strtobool(os.environ['GCP_SECRET']))
except ValueError:
return False
# @staticmethod
# def isEnabledGCPSecret():
# try:
# return bool(strtobool(os.environ['GCP_SECRET']))
# except ValueError:
# return False

@classmethod
def account(cls):
if not cls.isEnabledGCPSecret():
return os.environ['IB_ACCOUNT']
return cls.retrieve_secret(os.environ['GCP_SECRET_IB_ACCOUNT'])
# if not cls.isEnabledGCPSecret():
return os.environ['IB_ACCOUNT']
# return cls.retrieve_secret(os.environ['GCP_SECRET_IB_ACCOUNT'])

@classmethod
def password(cls):
if not cls.isEnabledGCPSecret():
return os.environ['IB_PASSWORD']
return cls.retrieve_secret(os.environ['GCP_SECRET_IB_PASSWORD'])
# if not cls.isEnabledGCPSecret():
return os.environ['IB_PASSWORD']
# return cls.retrieve_secret(os.environ['GCP_SECRET_IB_PASSWORD'])

@classmethod
def trade_mode(cls):
if not cls.isEnabledGCPSecret():
return os.environ['TRADE_MODE']
return cls.retrieve_secret(os.environ['GCP_SECRET_IB_TRADE_MODE'])
# if not cls.isEnabledGCPSecret():
return os.environ['TRADE_MODE']
# return cls.retrieve_secret(os.environ['GCP_SECRET_IB_TRADE_MODE'])


0 comments on commit b3b6d4b

Please sign in to comment.