saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix publish_signing_algorithm conditional

Browse source
This commit is contained in:
Daniel A. Wozniak 2024-05-29 15:19:49 -07:00 • committed by Daniel Wozniak
parent 63bab25e1c
commit a5787031b0
18 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/pytests/conftest.py
View file

@ -192,7 +192,7 @@ def salt_master_factory(
"pytest-master": {"log": {"level": "DEBUG"}},
"fips_mode": FIPS_TESTRUN,
"publish_signing_algorithm": (
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224"
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
),
}
ext_pillar = []
@ -462,7 +462,7 @@ def temp_salt_master(
config_overrides = {
"fips_mode": FIPS_TESTRUN,
"publish_signing_algorithm": (
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224"
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
),
}
factory = salt_factories.salt_master_daemon(

4
tests/pytests/functional/channel/test_server.py
View file

@ -75,7 +75,7 @@ def master_config(root_dir, transport):
pki_dir=str(root_dir / "pki"),
fips_mode=FIPS_TESTRUN,
publish_signing_algorithm=(
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224"
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
),
)
# master_conf["transport"] = transport
@ -88,7 +88,7 @@ def master_config(root_dir, transport):
# master_conf["pki_dir"] = str(root_dir / "pki")
# "fips_mode": FIPS_TESTRUN,
# "publish_signing_algorithm": (
# "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224"
# "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
# ),
os.makedirs(master_conf["pki_dir"])
salt.crypt.gen_keys(master_conf["pki_dir"], "master", 4096)

4
tests/pytests/integration/minion/test_job_return.py
View file

@ -18,7 +18,7 @@ def salt_master_1(request, salt_factories):
"interface": "127.0.0.1",
"fips_mode": FIPS_TESTRUN,
"publish_signing_algorithm": (
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224"
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
),
}
@ -45,7 +45,7 @@ def salt_master_2(salt_factories, salt_master_1):
"interface": "127.0.0.2",
"fips_mode": FIPS_TESTRUN,
"publish_signing_algorithm": (
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224"
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
),
}

2
tests/pytests/integration/minion/test_reauth.py
View file

@ -29,7 +29,7 @@ def test_reauth(salt_master_factory, event_listener):
"log_level": "info",
"fips_mode": FIPS_TESTRUN,
"publish_signing_algorithm": (
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224"
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
),
},
)

4
tests/pytests/integration/minion/test_return_retries.py
View file

@ -16,7 +16,7 @@ def salt_minion_retry(salt_master, salt_minion_id):
"return_retry_tries": 30,
"fips_mode": FIPS_TESTRUN,
"publish_signing_algorithm": (
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224"
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
),
}
factory = salt_master.salt_minion_daemon(
@ -78,7 +78,7 @@ def test_pillar_timeout(salt_master_factory, tmp_path):
"minion_data_cache": False,
"fips_mode": FIPS_TESTRUN,
"publish_signing_algorithm": (
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224"
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
),
}
minion_overrides = {

2
tests/pytests/integration/pillar/cache/conftest.py vendored
View file

@ -27,7 +27,7 @@ def pillar_salt_master(salt_factories, pillar_state_tree):
config_overrides = {
"fips_mode": FIPS_TESTRUN,
"publish_signing_algorithm": (
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224"
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
),
}
factory = salt_factories.salt_master_daemon(

4
tests/pytests/integration/runners/test_vault.py
View file

@ -52,7 +52,7 @@ def pillar_salt_master(salt_factories, pillar_state_tree):
config_overrides = {
"fips_mode": FIPS_TESTRUN,
"publish_signing_algorithm": (
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224"
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
),
}
factory = salt_factories.salt_master_daemon(
@ -85,7 +85,7 @@ def pillar_caching_salt_master(salt_factories, pillar_state_tree):
config_overrides = {
"fips_mode": FIPS_TESTRUN,
"publish_signing_algorithm": (
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224"
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
),
}
factory = salt_factories.salt_master_daemon(

2
tests/pytests/integration/states/test_x509_v2.py
View file

@ -127,7 +127,7 @@ def x509_salt_master(salt_factories, ca_minion_id, x509_master_config):
config_overrides = {
"fips_mode": FIPS_TESTRUN,
"publish_signing_algorithm": (
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224"
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
),
}
factory = salt_factories.salt_master_daemon(

2
tests/pytests/pkg/conftest.py
View file

@ -299,7 +299,7 @@ def salt_master(salt_factories, install_salt, pkg_tests_account):
},
"fips_mode": FIPS_TESTRUN,
"publish_signing_algorithm": (
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224"
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
),
"open_mode": True,
}

2
tests/pytests/scenarios/blackout/conftest.py
View file

@ -132,7 +132,7 @@ def salt_master(salt_factories, pillar_state_tree):
"interface": "127.0.0.1",
"fips_mode": FIPS_TESTRUN,
"publish_signing_algorithm": (
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224"
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
),
}
factory = salt_factories.salt_master_daemon(

2
tests/pytests/scenarios/compat/conftest.py
View file

@ -138,7 +138,7 @@ def salt_master(
"open_mode": False,
"fips_mode": FIPS_TESTRUN,
"publish_signing_algorithm": (
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224"
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
),
}

2
tests/pytests/scenarios/daemons/conftest.py
View file

@ -14,7 +14,7 @@ def salt_master_factory(request, salt_factories):
"interface": "127.0.0.1",
"fips_mode": FIPS_TESTRUN,
"publish_signing_algorithm": (
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224"
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
),
}

2
tests/pytests/scenarios/dns/conftest.py
View file

@ -57,7 +57,7 @@ def master(request, salt_factories):
"interface": "0.0.0.0",
"fips_mode": FIPS_TESTRUN,
"publish_signing_algorithm": (
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224"
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
),
}
factory = salt_factories.salt_master_daemon(

4
tests/pytests/scenarios/dns/multimaster/conftest.py
View file

@ -24,7 +24,7 @@ def salt_mm_master_1(request, salt_factories):
"master_sign_pubkey": True,
"fips_mode": FIPS_TESTRUN,
"publish_signing_algorithm": (
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224"
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
),
}
factory = salt_factories.salt_master_daemon(
@ -63,7 +63,7 @@ def salt_mm_master_2(salt_factories, salt_mm_master_1):
"master_sign_pubkey": True,
"fips_mode": FIPS_TESTRUN,
"publish_signing_algorithm": (
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224"
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
),
}

4
tests/pytests/scenarios/failover/multimaster/conftest.py
View file

@ -24,7 +24,7 @@ def salt_mm_failover_master_1(request, salt_factories):
"master_sign_pubkey": True,
"fips_mode": FIPS_TESTRUN,
"publish_signing_algorithm": (
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224"
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
),
}
factory = salt_factories.salt_master_daemon(
@ -56,7 +56,7 @@ def salt_mm_failover_master_2(salt_factories, salt_mm_failover_master_1):
"master_sign_pubkey": True,
"fips_mode": FIPS_TESTRUN,
"publish_signing_algorithm": (
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224"
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
),
}

4
tests/pytests/scenarios/multimaster/conftest.py
View file

@ -23,7 +23,7 @@ def salt_mm_master_1(request, salt_factories):
"interface": "127.0.0.1",
"fips_mode": FIPS_TESTRUN,
"publish_signing_algorithm": (
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224"
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
),
}
factory = salt_factories.salt_master_daemon(
@ -54,7 +54,7 @@ def salt_mm_master_2(salt_factories, salt_mm_master_1):
"interface": "127.0.0.2",
"fips_mode": FIPS_TESTRUN,
"publish_signing_algorithm": (
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224"
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
),
}

2
tests/pytests/scenarios/reauth/conftest.py
View file

@ -12,7 +12,7 @@ def salt_master_factory(salt_factories):
overrides={
"fips_mode": FIPS_TESTRUN,
"publish_signing_algorithm": (
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224"
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
),
},
)

2
tests/pytests/scenarios/swarm/conftest.py
View file

@ -12,7 +12,7 @@ def salt_master_factory(salt_factories):
config_overrides = {
"fips_mode": FIPS_TESTRUN,
"publish_signing_algorithm": (
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA224"
"PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
),
}
factory = salt_factories.salt_master_daemon(