diff --git a/charts/eric-oss-hello-world-python-app/templates/deployment/deployment.yaml b/charts/eric-oss-hello-world-python-app/templates/deployment/deployment.yaml index a50b737..5eb87d6 100644 --- a/charts/eric-oss-hello-world-python-app/templates/deployment/deployment.yaml +++ b/charts/eric-oss-hello-world-python-app/templates/deployment/deployment.yaml @@ -111,10 +111,6 @@ spec: mountPath: {{ index .Values "clientCredsMountPath" | default .Values.instantiationDefaults.clientCredsMountPath | quote }} readOnly: true env: - - name: IAM_CLIENT_ID - value: {{ index .Values "clientId" | quote }} - - name: IAM_CLIENT_SECRET - value: {{ index .Values "clientSecret" | quote }} - name: EIC_HOST_URL value: {{ index .Values "eicHostUrl" | quote }} - name: LOG_ENDPOINT diff --git a/eric-oss-hello-world-python-app/config.py b/eric-oss-hello-world-python-app/config.py index 5122923..39a7e9a 100644 --- a/eric-oss-hello-world-python-app/config.py +++ b/eric-oss-hello-world-python-app/config.py @@ -5,8 +5,6 @@ def get_config(): """get env and return config with all env vals required""" - iam_client_id = get_os_env_string("IAM_CLIENT_ID", "") - iam_client_secret = get_os_env_string("IAM_CLIENT_SECRET", "") eic_host_url = get_os_env_string("EIC_HOST_URL", "") ca_cert_file_name = get_os_env_string("CA_CERT_FILE_NAME", "") ca_cert_file_path = get_os_env_string("CA_CERT_FILE_PATH", "") @@ -19,8 +17,6 @@ def get_config(): client_id_file_name = get_os_env_string("CLIENT_ID_FILE_NAME", "") config = { - "iam_client_id": iam_client_id, - "iam_client_secret": iam_client_secret, "eic_host_url": eic_host_url, "ca_cert_file_name": ca_cert_file_name, "ca_cert_file_path": ca_cert_file_path, diff --git a/eric-oss-hello-world-python-app/tests/conftest.py b/eric-oss-hello-world-python-app/tests/conftest.py index 372472a..d0b60bb 100644 --- a/eric-oss-hello-world-python-app/tests/conftest.py +++ b/eric-oss-hello-world-python-app/tests/conftest.py @@ -31,18 +31,7 @@ def match_request_data(request): ] ] ) - uses_legacy = all( - [ - parameter in request.text - for parameter in [ - "grant_type=client_credentials", - "tenant_id=master", - "client_id=IAM_CLIENT_ID", - "client_secret=IAM_CLIENT_SECRET", - ] - ] - ) - return uses_x509 or uses_legacy + return uses_x509 @pytest.fixture(name="mock_login_api") @@ -109,8 +98,6 @@ def no_log_certs(): def populate_environment_variables(): - os.environ["IAM_CLIENT_ID"] = "IAM_CLIENT_ID" - os.environ["IAM_CLIENT_SECRET"] = "IAM_CLIENT_SECRET" os.environ["EIC_HOST_URL"] = "https://www.eic-host-url.com" os.environ["CA_CERT_FILE_NAME"] = "CA_CERT_FILE_NAME" os.environ["CA_CERT_FILE_PATH"] = "CA_CERT_MOUNT_PATH"