Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .setup-scripts/setup_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if [ ! -d $VENV_PATH ]; then
pip install docker==6.1.3
pip install --upgrade pip setuptools
pip install 'cython<3.0.0'
pip install "pyyaml==6.0.1" --no-build-isolation
pip install "pyyaml==6.0.3" --no-build-isolation
pip install --upgrade wheel
source $INTEGRATIONS_DIR_TMP/.setup-scripts/load_deps.sh
else
Expand Down
8 changes: 4 additions & 4 deletions servicenow/tests/test_servicenow.py
Original file line number Diff line number Diff line change
Expand Up @@ -562,15 +562,15 @@ def test_mandatory_instance_values(self):
1 validation error for InstanceInfo
url
Field required [type=missing, input_value={'user': 'name', 'password': 'secret'}, input_type=dict]
For further information visit https://errors.pydantic.dev/2.9/v/missing""")
For further information visit https://errors.pydantic.dev/2.12/v/missing""")
},
{
'instance': {'user': 'name', 'url': "https://website.com"},
'error': textwrap.dedent("""\
1 validation error for InstanceInfo
password
Field required [type=missing, input_value={'user': 'name', 'url': 'https://website.com'}, input_type=dict]
For further information visit https://errors.pydantic.dev/2.9/v/missing""")
For further information visit https://errors.pydantic.dev/2.12/v/missing""")
},
{
'instance': {'password': 'secret', 'url': "https://website.com"},
Expand All @@ -579,7 +579,7 @@ def test_mandatory_instance_values(self):
user
Field required [type=missing, input_value={'password': \
'secret', 'u...: 'https://website.com'}, input_type=dict]
For further information visit https://errors.pydantic.dev/2.9/v/missing""")
For further information visit https://errors.pydantic.dev/2.12/v/missing""")
}
]
for test in tests:
Expand Down Expand Up @@ -696,7 +696,7 @@ def test_batch_size(self):
Input should be less than or equal to 10000 [type=less_than_equal, \
input_value=20000, input_type=int]
For further information visit \
https://errors.pydantic.dev/2.9/v/less_than_equal"""), result[0]['message'])
https://errors.pydantic.dev/2.12/v/less_than_equal"""), result[0]['message'])

@mock.patch('requests.Session.get')
def test_get_json_timeout(self, mock_request_get):
Expand Down
4 changes: 2 additions & 2 deletions splunk_base/tests/test_splunk_instance_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def test_check_audience_param_not_set(self):
authentication.token_auth.audience
Field required [type=missing, input_value={'name': 'admin', 'initia...dx', \
'renewal_days': 10}, input_type=dict]
For further information visit https://errors.pydantic.dev/2.9/v/missing""")
For further information visit https://errors.pydantic.dev/2.12/v/missing""")

def test_check_name_param_not_set(self):
"""
Expand Down Expand Up @@ -152,4 +152,4 @@ def test_check_name_param_not_set(self):
authentication.token_auth.name
Field required [type=missing, input_value={'initial_token': 'dsfdgf...ch', \
'renewal_days': 10}, input_type=dict]
For further information visit https://errors.pydantic.dev/2.9/v/missing""")
For further information visit https://errors.pydantic.dev/2.12/v/missing""")
4 changes: 2 additions & 2 deletions splunk_metric/requirements.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pydantic==2.9.1
pydantic==2.12.5
PyJWT==2.12.0
docker==6.1.3
docker==6.1.3
4 changes: 2 additions & 2 deletions splunk_metric/tests/test_unit.py
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ def test_authentication_token_no_audience_parameter_check(set_authentication_mod
authentication.token_auth.audience
Field required [type=missing, input_value={'name': 'api-admin', 'in... 90, \
'renewal_days': 10}, input_type=dict]
For further information visit https://errors.pydantic.dev/2.9/v/missing"""))
For further information visit https://errors.pydantic.dev/2.12/v/missing"""))


def test_authentication_token_no_name_parameter_check(set_authentication_mode_to_token,
Expand All @@ -576,7 +576,7 @@ def test_authentication_token_no_name_parameter_check(set_authentication_mode_to
authentication.token_auth.name
Field required [type=missing, input_value={'audience': 'search', 'i... 90, \
'renewal_days': 10}, input_type=dict]
For further information visit https://errors.pydantic.dev/2.9/v/missing"""))
For further information visit https://errors.pydantic.dev/2.12/v/missing"""))


def test_authentication_prefer_token_over_basic_check(config_authentication_prefer_token_over_basic_check,
Expand Down
4 changes: 2 additions & 2 deletions stackstate_checks_base/requirements.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kubernetes==33.1.0; python_version > '3.0'
pyyaml==6.0.2; python_version > '3.0'
pyyaml==6.0.3; python_version > '3.0'
prometheus-client==0.19.0; python_version > '3.0'
protobuf==5.29.6; python_version > '3.0'
pywin32==306; sys_platform == 'win32' and python_version > '3.0'
Expand All @@ -12,7 +12,7 @@ boto3==1.34.11; python_version > '3.0'
flatten-dict==0.2.0
Deprecated==1.2.10
enum34==1.1.10; python_version < '3.0'
pydantic==2.9.1
pydantic==2.12.5
orjson==3.11.6; python_version > '3.0'
pytz==2021.1
iso8601==0.1.14
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
boto3==1.34.11; python_version > '3.0'
cm-client==45.0.4
cryptography==46.0.7; python_version > '3.0'
ddtrace==3.12.5; python_version > '3.0'
ddtrace==4.8.4; python_version > '3.0'
deprecated==1.2.10
docker==6.1.3
enum34==1.1.10; python_version < "3.0"
Expand All @@ -14,16 +14,16 @@ pg8000==1.31.5
prometheus-client==0.19.0; python_version > '3.0'
protobuf==5.29.6; python_version > '3.0'
psutil==6.0.0
psycopg2-binary==2.9.9; python_version > '3.0'
psycopg2-binary==2.9.11; python_version > '3.0'
pymysql==1.1.2; python_version > '3.0'
pynag==1.1.2
PyJWT==2.12.0
pytz==2021.1
pywin32==306; sys_platform == 'win32' and python_version > '3.0'
pyyaml==6.0.2; python_version > '3.0'
pyyaml==6.0.3; python_version > '3.0'
requests-ntlm==1.3.0; python_version > '3.0'
requests==2.33.0; python_version > '3.0'
pydantic==2.9.1
pydantic==2.12.5
simplejson==3.20.1
six==1.16.0
urllib3==2.7.0
Expand Down
14 changes: 7 additions & 7 deletions stackstate_checks_base/tests/test_agent_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -1274,15 +1274,15 @@ def test_verify_types(self):
1 validation error for HealthStreamUrn
source
Input should be a valid string [type=string_type, input_value=None, input_type=NoneType]
For further information visit https://errors.pydantic.dev/2.9/v/string_type""")
For further information visit https://errors.pydantic.dev/2.12/v/string_type""")

with pytest.raises(ValidationError) as e2:
HealthStreamUrn("source", None)
assert str(e2.value) == textwrap.dedent("""\
1 validation error for HealthStreamUrn
stream_id
Input should be a valid string [type=string_type, input_value=None, input_type=NoneType]
For further information visit https://errors.pydantic.dev/2.9/v/string_type""")
For further information visit https://errors.pydantic.dev/2.12/v/string_type""")


class TestHealthStream:
Expand All @@ -1293,7 +1293,7 @@ def test_throws_error_when_expiry_on_sub_stream(self):
1 validation error for HealthStream
Value error, Expiry cannot be disabled if a substream is specified \
[type=value_error, input_value={'urn': HealthStreamUrn(s...ne, 'expiry_seconds': 0}, input_type=dict]
For further information visit https://errors.pydantic.dev/2.9/v/value_error""")
For further information visit https://errors.pydantic.dev/2.12/v/value_error""")

def test_verify_types(self):
with pytest.raises(ValidationError) as e:
Expand All @@ -1303,7 +1303,7 @@ def test_verify_types(self):
urn
Input should be a valid dictionary or instance of HealthStreamUrn \
[type=model_type, input_value='str', input_type=str]
For further information visit https://errors.pydantic.dev/2.9/v/model_type""")
For further information visit https://errors.pydantic.dev/2.12/v/model_type""")

with pytest.raises(ValidationError) as e:
HealthStream(HealthStreamUrn("source", "urn"), sub_stream=1)
Expand All @@ -1312,7 +1312,7 @@ def test_verify_types(self):
sub_stream
Input should be a valid string \
[type=string_type, input_value=1, input_type=int]
For further information visit https://errors.pydantic.dev/2.9/v/string_type""")
For further information visit https://errors.pydantic.dev/2.12/v/string_type""")

with pytest.raises(ValidationError) as e:
HealthStream(HealthStreamUrn("source", "urn"), repeat_interval_seconds="")
Expand All @@ -1321,7 +1321,7 @@ def test_verify_types(self):
repeat_interval_seconds
Input should be a valid integer, unable to parse \
string as an integer [type=int_parsing, input_value='', input_type=str]
For further information visit https://errors.pydantic.dev/2.9/v/int_parsing""")
For further information visit https://errors.pydantic.dev/2.12/v/int_parsing""")

with pytest.raises(ValidationError) as e:
HealthStream(HealthStreamUrn("source", "urn"), expiry_seconds="")
Expand All @@ -1330,7 +1330,7 @@ def test_verify_types(self):
expiry_seconds
Input should be a valid integer, unable to parse string \
as an integer [type=int_parsing, input_value='', input_type=str]
For further information visit https://errors.pydantic.dev/2.9/v/int_parsing""")
For further information visit https://errors.pydantic.dev/2.12/v/int_parsing""")


class TestHealth:
Expand Down
16 changes: 8 additions & 8 deletions stackstate_checks_base/tests/test_agent_check_v2.py
Original file line number Diff line number Diff line change
Expand Up @@ -1151,15 +1151,15 @@ def test_verify_types(self):
1 validation error for HealthStreamUrn
source
Input should be a valid string [type=string_type, input_value=None, input_type=NoneType]
For further information visit https://errors.pydantic.dev/2.9/v/string_type""")
For further information visit https://errors.pydantic.dev/2.12/v/string_type""")

with pytest.raises(ValidationError) as e2:
HealthStreamUrn("source", None)
assert str(e2.value) == textwrap.dedent("""\
1 validation error for HealthStreamUrn
stream_id
Input should be a valid string [type=string_type, input_value=None, input_type=NoneType]
For further information visit https://errors.pydantic.dev/2.9/v/string_type""")
For further information visit https://errors.pydantic.dev/2.12/v/string_type""")


class TestHealthStream:
Expand All @@ -1170,7 +1170,7 @@ def test_throws_error_when_expiry_on_sub_stream(self):
1 validation error for HealthStream
Value error, Expiry cannot be disabled if a substream is specified \
[type=value_error, input_value={'urn': HealthStreamUrn(s...ne, 'expiry_seconds': 0}, input_type=dict]
For further information visit https://errors.pydantic.dev/2.9/v/value_error""")
For further information visit https://errors.pydantic.dev/2.12/v/value_error""")

def test_verify_types(self):
with pytest.raises(ValidationError) as e:
Expand All @@ -1180,7 +1180,7 @@ def test_verify_types(self):
urn
Input should be a valid dictionary or instance of HealthStreamUrn \
[type=model_type, input_value='str', input_type=str]
For further information visit https://errors.pydantic.dev/2.9/v/model_type""")
For further information visit https://errors.pydantic.dev/2.12/v/model_type""")

with pytest.raises(ValidationError) as e:
HealthStream(HealthStreamUrn("source", "urn"), sub_stream=1)
Expand All @@ -1189,7 +1189,7 @@ def test_verify_types(self):
sub_stream
Input should be a valid string \
[type=string_type, input_value=1, input_type=int]
For further information visit https://errors.pydantic.dev/2.9/v/string_type""")
For further information visit https://errors.pydantic.dev/2.12/v/string_type""")

with pytest.raises(ValidationError) as e:
HealthStream(HealthStreamUrn("source", "urn"), repeat_interval_seconds="")
Expand All @@ -1198,7 +1198,7 @@ def test_verify_types(self):
repeat_interval_seconds
Input should be a valid integer, unable to parse \
string as an integer [type=int_parsing, input_value='', input_type=str]
For further information visit https://errors.pydantic.dev/2.9/v/int_parsing""")
For further information visit https://errors.pydantic.dev/2.12/v/int_parsing""")

with pytest.raises(ValidationError) as e:
HealthStream(HealthStreamUrn("source", "urn"), expiry_seconds="")
Expand All @@ -1207,7 +1207,7 @@ def test_verify_types(self):
expiry_seconds
Input should be a valid integer, unable to parse string as \
an integer [type=int_parsing, input_value='', input_type=str]
For further information visit https://errors.pydantic.dev/2.9/v/int_parsing""")
For further information visit https://errors.pydantic.dev/2.12/v/int_parsing""")


class TestHealth:
Expand Down Expand Up @@ -1474,7 +1474,7 @@ def test_stateful_check_with_invalid_schema(self, sample_stateful_check_with_sch
1 validation error for State
key_that_is_not_in_schema
Extra inputs are not permitted [type=extra_forbidden, input_value='some_value', input_type=str]
For further information visit https://errors.pydantic.dev/2.9/v/extra_forbidden""")
For further information visit https://errors.pydantic.dev/2.12/v/extra_forbidden""")


class NormalCheck(AgentCheckV2):
Expand Down
2 changes: 1 addition & 1 deletion stackstate_checks_base/tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ def test_exception_state_without_valid_location(self, state_manager):
1 validation error for StateDescriptorSchema
instance_key
String should have at least 1 character [type=string_too_short, input_value='', input_type=str]
For further information visit https://errors.pydantic.dev/2.9/v/string_too_short""")
For further information visit https://errors.pydantic.dev/2.12/v/string_too_short""")

instance = StateDescriptor("test", "this")
# set an invalid file_location for this test
Expand Down
2 changes: 1 addition & 1 deletion stackstate_checks_dev/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
'six==1.16.0',
'Deprecated==1.2.10',
"enum34==1.1.10; python_version < '3.4'",
'pydantic==2.9.1'
'pydantic==2.12.5'
]


Expand Down
2 changes: 1 addition & 1 deletion static_health/tests/test_static_health.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def test_omitted_health_file(self):
Field required [type=missing, input_value={'type': 'csv', \
'delimite...ollection_interval': 15}, input_type=dict]
For further information visit \
https://errors.pydantic.dev/2.9/v/missing""")
https://errors.pydantic.dev/2.12/v/missing""")

def test_empty_health_file(self):
instance = {
Expand Down