Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disable windows certificate store setup #271

Merged
merged 7 commits into from
Feb 5, 2024
Merged

Disable windows certificate store setup #271

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b491a29
disable windows certi store key
xiazhvera Feb 2, 2024
1f08386
a quick test for windows modulePath
xiazhvera Feb 2, 2024
3a22130
quick fix to create folder to import windows cert
xiazhvera Feb 2, 2024
22efd78
quick fix to create folder to import windows cert
xiazhvera Feb 2, 2024
9234152
disable windows cert store
xiazhvera Feb 2, 2024
4e15518
removce test function
xiazhvera Feb 2, 2024
4beb71d
Add var to disable windows cert store test
xiazhvera Feb 5, 2024
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
24 changes: 14 additions & 10 deletions builder/actions/setup_cross_ci_crt_environment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,12 +223,14 @@ def _common_setup(self, env):
"s3://aws-crt-test-stuff/unit-test-key-pkcs12.pem")
self._setenv(env, "AWS_TEST_MQTT5_IOT_CORE_PKCS12_KEY_PASSWORD", "PKCS12_KEY_PASSWORD")

# TODO: The windows certificate env var is disabled as it is failing in CI. We will bring it back once
# it is fixed.
# Windows Key Cert
if (self.is_windows == True):
self._setenv_s3(env, "AWS_TEST_MQTT5_IOT_CORE_WINDOWS_PFX_CERT_NO_PASS",
"s3://aws-crt-test-stuff/unit-test-pfx-no-password.pfx")
helpers.create_windows_cert_store(
env, "AWS_TEST_MQTT5_IOT_CORE_WINDOWS_PFX_CERT_NO_PASS", "AWS_TEST_MQTT5_IOT_CORE_WINDOWS_CERT_STORE")
# if (self.is_windows == True):
# self._setenv_s3(env, "AWS_TEST_MQTT5_IOT_CORE_WINDOWS_PFX_CERT_NO_PASS",
# "s3://aws-crt-test-stuff/unit-test-pfx-no-password.pfx")
# helpers.create_windows_cert_store(
# env, "AWS_TEST_MQTT5_IOT_CORE_WINDOWS_PFX_CERT_NO_PASS", "AWS_TEST_MQTT5_IOT_CORE_WINDOWS_CERT_STORE")

# X509
self._setenv_secret(env, "AWS_TEST_MQTT5_IOT_CORE_X509_ENDPOINT", "ci/mqtt5/us/x509/endpoint")
Expand Down Expand Up @@ -311,12 +313,14 @@ def _common_setup(self, env):
"s3://aws-crt-test-stuff/unit-test-key-pkcs12.pem")
self._setenv(env, "AWS_TEST_MQTT311_IOT_CORE_PKCS12_KEY_PASSWORD", "PKCS12_KEY_PASSWORD")

# TODO: The windows certificate env var is disabled as it is failing in CI. We will bring it back once
# it is fixed.
# Windows Key Cert
if (self.is_windows == True):
self._setenv_s3(env, "AWS_TEST_MQTT311_IOT_CORE_WINDOWS_PFX_CERT_NO_PASS",
"s3://aws-crt-test-stuff/unit-test-pfx-no-password.pfx")
helpers.create_windows_cert_store(
env, "AWS_TEST_MQTT311_IOT_CORE_WINDOWS_PFX_CERT_NO_PASS", "AWS_TEST_MQTT311_IOT_CORE_WINDOWS_CERT_STORE")
# if (self.is_windows == True):
# self._setenv_s3(env, "AWS_TEST_MQTT311_IOT_CORE_WINDOWS_PFX_CERT_NO_PASS",
# "s3://aws-crt-test-stuff/unit-test-pfx-no-password.pfx")
# helpers.create_windows_cert_store(
# env, "AWS_TEST_MQTT311_IOT_CORE_WINDOWS_PFX_CERT_NO_PASS", "AWS_TEST_MQTT311_IOT_CORE_WINDOWS_CERT_STORE")

# X509
self._setenv_secret(env, "AWS_TEST_MQTT311_IOT_CORE_X509_ENDPOINT", "ci/mqtt5/us/x509/endpoint")
Expand Down
2 changes: 2 additions & 0 deletions builder/actions/setup_cross_ci_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ def create_windows_cert_store(env, certificate_env, location_env):
return
pfx_cert_path = env.shell.getenv(certificate_env)

env.shell.exec("powershell.exe", new_cert_folder_arguments, check=True)
xiazhvera marked this conversation as resolved.
Show resolved Hide resolved

# Import the PFX into the Windows Certificate Store
# (Passing '$mypwd' is required even though it is empty and our certificate has no password. It fails CI otherwise)
import_pfx_arguments = [
Expand Down
Loading