1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
|
From e2c3983c04bb91d0a1367e1f16ebf081e3a00658 Mon Sep 17 00:00:00 2001
From: Tero Saarni <tero.saarni@est.tech>
Date: Wed, 21 Apr 2021 16:40:43 +0300
Subject: [PATCH] Version bump to pyyaml 5.4.1 (#1596)
---
curator/utils.py | 2 +-
test/unit/test_class_index_list.py | 20 ++++++++++----------
test/unit/test_class_snapshot_list.py | 8 ++++----
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/curator/utils.py b/curator/utils.py
index 3af2c78..0309a4f 100644
--- a/curator/utils.py
+++ b/curator/utils.py
@@ -56,7 +56,7 @@ def get_yaml(path):
yaml.add_constructor('!single', single_constructor)
try:
- return yaml.load(read_file(path))
+ return yaml.load(read_file(path), Loader=yaml.FullLoader)
except yaml.scanner.ScannerError as err:
print('Unable to read/parse YAML file: {0}'.format(path))
print(err)
diff --git a/test/unit/test_class_index_list.py b/test/unit/test_class_index_list.py
index 1cf20f4..cfc4621 100644
--- a/test/unit/test_class_index_list.py
+++ b/test/unit/test_class_index_list.py
@@ -800,7 +800,7 @@ class TestIterateFiltersIndex(TestCase):
client.cluster.state.return_value = testvars.clu_state_four
client.indices.stats.return_value = testvars.stats_four
ilo = curator.IndexList(client)
- config = yaml.load(testvars.pattern_ft)['actions'][1]
+ config = yaml.load(testvars.pattern_ft, Loader=yaml.FullLoader)['actions'][1]
ilo.iterate_filters(config)
self.assertEqual(['a-2016.03.03'], ilo.indices)
def test_age_filtertype(self):
@@ -810,7 +810,7 @@ class TestIterateFiltersIndex(TestCase):
client.cluster.state.return_value = testvars.clu_state_two
client.indices.stats.return_value = testvars.stats_two
ilo = curator.IndexList(client)
- config = yaml.load(testvars.age_ft)['actions'][1]
+ config = yaml.load(testvars.age_ft, Loader=yaml.FullLoader)['actions'][1]
ilo.iterate_filters(config)
self.assertEqual(['index-2016.03.03'], ilo.indices)
def test_space_filtertype(self):
@@ -821,7 +821,7 @@ class TestIterateFiltersIndex(TestCase):
client.indices.stats.return_value = testvars.stats_four
client.field_stats.return_value = testvars.fieldstats_four
ilo = curator.IndexList(client)
- config = yaml.load(testvars.space_ft)['actions'][1]
+ config = yaml.load(testvars.space_ft, Loader=yaml.FullLoader)['actions'][1]
ilo.iterate_filters(config)
self.assertEqual(['a-2016.03.03'], ilo.indices)
def test_forcemerge_filtertype(self):
@@ -832,7 +832,7 @@ class TestIterateFiltersIndex(TestCase):
client.indices.stats.return_value = testvars.stats_one
client.indices.segments.return_value = testvars.shards
ilo = curator.IndexList(client)
- config = yaml.load(testvars.forcemerge_ft)['actions'][1]
+ config = yaml.load(testvars.forcemerge_ft, Loader=yaml.FullLoader)['actions'][1]
ilo.iterate_filters(config)
self.assertEqual([testvars.named_index], ilo.indices)
def test_allocated_filtertype(self):
@@ -842,7 +842,7 @@ class TestIterateFiltersIndex(TestCase):
client.cluster.state.return_value = testvars.clu_state_two
client.indices.stats.return_value = testvars.stats_two
ilo = curator.IndexList(client)
- config = yaml.load(testvars.allocated_ft)['actions'][1]
+ config = yaml.load(testvars.allocated_ft, Loader=yaml.FullLoader)['actions'][1]
ilo.iterate_filters(config)
self.assertEqual(['index-2016.03.04'], ilo.indices)
def test_kibana_filtertype(self):
@@ -857,7 +857,7 @@ class TestIterateFiltersIndex(TestCase):
ilo.indices = [
'.kibana', '.kibana-5', '.kibana-6', 'dummy'
]
- config = yaml.load(testvars.kibana_ft)['actions'][1]
+ config = yaml.load(testvars.kibana_ft, Loader=yaml.FullLoader)['actions'][1]
ilo.iterate_filters(config)
self.assertEqual(['dummy'], ilo.indices)
def test_opened_filtertype(self):
@@ -868,7 +868,7 @@ class TestIterateFiltersIndex(TestCase):
client.indices.stats.return_value = testvars.stats_four
client.field_stats.return_value = testvars.fieldstats_four
ilo = curator.IndexList(client)
- config = yaml.load(testvars.opened_ft)['actions'][1]
+ config = yaml.load(testvars.opened_ft, Loader=yaml.FullLoader)['actions'][1]
ilo.iterate_filters(config)
self.assertEqual(['c-2016.03.05'], ilo.indices)
def test_closed_filtertype(self):
@@ -879,7 +879,7 @@ class TestIterateFiltersIndex(TestCase):
client.indices.stats.return_value = testvars.stats_four
client.field_stats.return_value = testvars.fieldstats_four
ilo = curator.IndexList(client)
- config = yaml.load(testvars.closed_ft)['actions'][1]
+ config = yaml.load(testvars.closed_ft, Loader=yaml.FullLoader)['actions'][1]
ilo.iterate_filters(config)
self.assertEqual(
['a-2016.03.03','b-2016.03.04','d-2016.03.06'], sorted(ilo.indices))
@@ -890,7 +890,7 @@ class TestIterateFiltersIndex(TestCase):
client.cluster.state.return_value = testvars.clu_state_two
client.indices.stats.return_value = testvars.stats_two
ilo = curator.IndexList(client)
- config = yaml.load(testvars.none_ft)['actions'][1]
+ config = yaml.load(testvars.none_ft, Loader=yaml.FullLoader)['actions'][1]
ilo.iterate_filters(config)
self.assertEqual(
['index-2016.03.03', 'index-2016.03.04'], sorted(ilo.indices))
@@ -901,7 +901,7 @@ class TestIterateFiltersIndex(TestCase):
client.cluster.state.return_value = testvars.clu_state_two
client.indices.stats.return_value = testvars.stats_two
ilo = curator.IndexList(client)
- config = yaml.load(testvars.invalid_ft)['actions'][1]
+ config = yaml.load(testvars.invalid_ft, Loader=yaml.FullLoader)['actions'][1]
self.assertRaises(
curator.ConfigurationError,
ilo.iterate_filters, config
diff --git a/test/unit/test_class_snapshot_list.py b/test/unit/test_class_snapshot_list.py
index d419faf..d77bccd 100644
--- a/test/unit/test_class_snapshot_list.py
+++ b/test/unit/test_class_snapshot_list.py
@@ -320,7 +320,7 @@ class TestIterateFiltersSnaps(TestCase):
client.snapshot.get.return_value = testvars.snapshots
client.snapshot.get_repository.return_value = testvars.test_repo
slo = curator.SnapshotList(client, repository=testvars.repo_name)
- config = yaml.load(testvars.invalid_ft)['actions'][1]
+ config = yaml.load(testvars.invalid_ft, Loader=yaml.FullLoader)['actions'][1]
self.assertRaises(
curator.ConfigurationError,
slo.iterate_filters, config
@@ -330,7 +330,7 @@ class TestIterateFiltersSnaps(TestCase):
client.snapshot.get.return_value = testvars.snapshots
client.snapshot.get_repository.return_value = testvars.test_repo
slo = curator.SnapshotList(client, repository=testvars.repo_name)
- config = yaml.load(testvars.snap_age_ft)['actions'][1]
+ config = yaml.load(testvars.snap_age_ft, Loader=yaml.FullLoader)['actions'][1]
slo.iterate_filters(config)
self.assertEqual(
['snap_name', 'snapshot-2015.03.01'], sorted(slo.snapshots))
@@ -339,7 +339,7 @@ class TestIterateFiltersSnaps(TestCase):
client.snapshot.get.return_value = testvars.snapshots
client.snapshot.get_repository.return_value = testvars.test_repo
slo = curator.SnapshotList(client, repository=testvars.repo_name)
- config = yaml.load(testvars.snap_pattern_ft)['actions'][1]
+ config = yaml.load(testvars.snap_pattern_ft, Loader=yaml.FullLoader)['actions'][1]
slo.iterate_filters(config)
self.assertEqual(
['snap_name', 'snapshot-2015.03.01'], sorted(slo.snapshots))
@@ -348,7 +348,7 @@ class TestIterateFiltersSnaps(TestCase):
client.snapshot.get.return_value = testvars.snapshots
client.snapshot.get_repository.return_value = testvars.test_repo
slo = curator.SnapshotList(client, repository=testvars.repo_name)
- config = yaml.load(testvars.snap_none_ft)['actions'][1]
+ config = yaml.load(testvars.snap_none_ft, Loader=yaml.FullLoader)['actions'][1]
slo.iterate_filters(config)
self.assertEqual(
['snap_name', 'snapshot-2015.03.01'], sorted(slo.snapshots))
|