Skip to content

Commit

Permalink
feat: reinit test data
Browse files Browse the repository at this point in the history
  • Loading branch information
cowan-macady committed Feb 16, 2023
1 parent f333e47 commit 2c7ab8a
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 24 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ concurrency:
env:
INDYKITE_APPLICATION_CREDENTIALS: ${{ secrets.JARVIS_CREDENTIALS }}
INDYKITE_SERVICE_ACCOUNT_CREDENTIALS: ${{ secrets.JARVIS_ACCOUNT_CREDENTIALS }}
INDYKITE_SDK_URL: ${{ secrets.INDYKITE_SDK_URL }}
EMAIL_URL: ${{ secrets.EMAIL_URL }}
INDYKITE_DEFAULT_FROM: ${{ secrets.INDYKITE_DEFAULT_FROM }}
SENDGRID_KEY: ${{ secrets.SENDGRID_KEY }}
SENDGRID_IP: ${{ secrets.SENDGRID_IP }}
INDYKITE_DEFAULT_TO: ${{ secrets.INDYKITE_DEFAULT_TO }}

jobs:
tests:
Expand Down
17 changes: 9 additions & 8 deletions indykite_sdk/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from datetime import datetime
from uuid import UUID
from google.protobuf.json_format import MessageToJson
import os

from indykite_sdk.utils.hash_methods import encrypt_bcrypt, encrypt_sha256
from indykite_sdk.identity import IdentityClient
Expand Down Expand Up @@ -1083,18 +1084,18 @@ def main():
display_name = args.display_name
description = args.description

default_from_address_address="test+config@indykite.com"
default_from_address_address=os.getenv('INDYKITE_DEFAULT_FROM')
default_from_address_name="Test Config"

sendgrid = SendGridProviderConfig(
api_key="263343b5-983e-4d73-b666-069a98f1ef55",
api_key=os.getenv('SENDGRID_KEY'),
sandbox_mode=True,
ip_pool_name=wrappers.StringValue(value="100.45.21.65.25"),
ip_pool_name=wrappers.StringValue(value=os.getenv('SENDGRID_IP')),
host=wrappers.StringValue(value="https://api.sendgrid.com")
)

message_from = Email(address='test+from@indykite.com', name='Test From')
message_to = [Email(address='test+to@indykite.com', name='Test To')]
message_from = Email(address=os.getenv('INDYKITE_DEFAULT_FROM'), name='Test From')
message_to = [Email(address=os.getenv('INDYKITE_DEFAULT_TO'), name='Test To')]
message_subject = "subject"
message_text_content = "content text"
message_html_content = "<html><body>content html</body></html>"
Expand Down Expand Up @@ -1531,7 +1532,7 @@ def main():
state="DIGITAL_TWIN_STATE_ACTIVE",
password=PasswordCredential(
email=EmailIdentity(
email="test2101@example.com",
email="test2105@example.com",
verified=True
),
value="password"
Expand All @@ -1543,7 +1544,7 @@ def main():
state="DIGITAL_TWIN_STATE_ACTIVE",
password=PasswordCredential(
email=EmailIdentity(
email="test2102@example.com",
email="test2106@example.com",
verified=True
),
value="password"
Expand All @@ -1555,7 +1556,7 @@ def main():
state="DIGITAL_TWIN_STATE_ACTIVE",
password=PasswordCredential(
email=EmailIdentity(
email="test2104@example.com",
email="test2107@example.com",
verified=True
),
value="password"
Expand Down
28 changes: 14 additions & 14 deletions tests/helpers/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
from indykite_sdk.indykite.config.v1beta1.model_pb2 import google_dot_protobuf_dot_wrappers__pb2 as wrappers


URL = "https://jarvis-dev.indykite.com"
EMAIL_URL = "https://super-octo-waffle.indykite.com"
URL = os.getenv('INDYKITE_SDK_URL')
EMAIL_URL = os.getenv('EMAIL_URL')
EMAIL_TOKEN = "MNvLADeDKphk7NoEbczc"
APPLICATION = "gid:AAAABGluZHlraURlgAACDwAAAAA"
TENANT = "gid:AAAAA2CHw7x3Dk68uWSkjl7FoG0"
TENANT_EMAIL = "gid:AAAAA2luZHlraURlgAADDwAAAAI"
DIGITAL_TWIN = "gid:AAAAFf_ZpzyM2UpRuG22DJLLNq0"
DIGITAL_TWIN = "gid:AAAAFZVCTOBCHEPMgdvP44aZLbg"
CODE_VERIFIER = "AAAAAAAAAAEAAAAAAAAAAgAAAAAAAAADAAAAAAAAAAQ"
CODE_CHALLENGE = "cjbADBcANsbeEzqHghDd1YVnqh0GGaD3D2njiub5Fuk"
# this is changes, if test starts failing, check it!!!
Expand All @@ -25,7 +25,7 @@
ACCOUNT_ID= "gid:AAAAEgGym_wUPEZfjV8TIdsImsE"
WRONG_ACCOUNT_ID= "gid:AAAAFJ6iGHyG8Ee8tIvW7DQ1hkE"
SERVICE_ACCOUNT_NAME = "serviceaccount-sdk"
TEST_SERVICE_ACCOUNT = "gid:AAAAEiuyZi3zVE9hvsu0gSqgi-g"
TEST_SERVICE_ACCOUNT = "gid:AAAAEv3GiONu2UdplM9ML9eCrus"
CUSTOMER_NAME = "sdk-customer"
APP_SPACE_NAME = "sdk-appspace"
CUSTOMER_ID = "gid:AAAAAbHLUExsxkqsqRoI93amR30"
Expand All @@ -39,12 +39,12 @@
APPLICATION_AGENT_NAME = "appagent-sdk"
APPLICATION_AGENT_CREDENTIAL_ID = "gid:AAAABhgLSrxgg0_nuVeZppYYSGs"
SERVICE_ACCOUNT_CREDENTIAL_ID = "gid:AAAAE0rMcwG_RUbSjzclsV7bdjg"
EMAIL_SERVICE_CONFIG_NODE = "gid:AAAACMMM3RvRwkbPgJGsM-uJaDs"
AUTH_FLOW_CONFIG_NODE = "gid:AAAAB3csFdhUY0SEvn_vJGKiA0c"
OAUTH2_CLIENT_CONFIG_NODE = "gid:AAAACgrCyXGVWkWBuEXw7aUmnmw"
INGEST_MAPPING_CONFIG_NODE = "gid:AAAAFKF1oNEdmEEArkQjezYRBPE"
OAUTH2_PROVIDER = "gid:AAAAEezCvUQGV0HgotmCoeCJAck"
OAUTH2_APPLICATION = "gid:AAAAC6mMTIwN40frlKWVz788QX8"
EMAIL_SERVICE_CONFIG_NODE = "gid:AAAACPZyR178jEYLj0wizNxtO4Q"
AUTH_FLOW_CONFIG_NODE = "gid:AAAAB0Vg1IohjEV4uDLA_hFawKI"
OAUTH2_CLIENT_CONFIG_NODE = "gid:AAAACtBSbo_Sf0XXpOzuoNfzMk8"
INGEST_MAPPING_CONFIG_NODE = "gid:AAAAFLk0_fECVENquHrfZUTjaic"
OAUTH2_PROVIDER = "gid:AAAAEXX8LPjXo0bmvR1VWQEwrQI"
OAUTH2_APPLICATION = "gid:AAAAC8hPU8pCTEblkvWJ4et0PG4"
PASSWORD = "Password"
NEW_PASSWORD = "Password1"
BCRYPT = "$2y$10$k64jP7oqwYfQpzmoqAN5OuhrtWI2wICn0wXUzYxMp.UA1PopI653G"
Expand Down Expand Up @@ -208,17 +208,17 @@ def get_oauth2_application_id():


def get_email_service():
default_from_address_address = "test+config@indykite.com"
default_from_address_address = os.getenv('INDYKITE_DEFAULT_FROM')
default_from_address_name = "Test Config"

sendgrid = SendGridProviderConfig(
api_key="263343b5-983e-4d73-b666-069a98f1ef55",
api_key=os.getenv('SENDGRID_KEY'),
sandbox_mode=True,
ip_pool_name=wrappers.StringValue(value="100.45.21.65.25"),
ip_pool_name=wrappers.StringValue(value=os.getenv('SENDGRID_IP')),
host=wrappers.StringValue(value="https://api.sendgrid.com")
)

message_to = [Email(address='test+to@indykite.com', name='Test To')]
message_to = [Email(address=os.getenv('INDYKITE_DEFAULT_TO'), name='Test To')]
message_subject = "subject"
message_text_content = "content text"
message_html_content = "<html><body>content html</body></html>"
Expand Down
1 change: 0 additions & 1 deletion tests/test_config_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -596,4 +596,3 @@ def test_update_ingest_mapping_config_node_exception(capsys):

captured = capsys.readouterr()
assert "must be initialized with a dict: indykite.config.v1beta1.UpdateConfigNodeRequest" in captured.err

2 changes: 1 addition & 1 deletion tests/test_consent.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def test_create_consent_already_exists(capsys):
assert client is not None

pii_processor_id = data.get_oauth2_application_id()
pii_principal_id = "gid:AAAAFc-ZvSrJlE8GsTHI1WtxFqY"
pii_principal_id = "gid:AAAAFZVCTOBCHEPMgdvP44aZLbg"
properties = ["property_name"]

response = client.create_consent(pii_processor_id, pii_principal_id, properties)
Expand Down

0 comments on commit 2c7ab8a

Please sign in to comment.