Skip to content

Commit 00b3594

Browse files
siegfriedwebersiegfriedweber
committed
Rename allow_list.yml to allowlist.yml
1 parent a45edb7 commit 00b3594

5 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎rust/operator-binary/src/controller/build/role_group_builder.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1652,7 +1652,7 @@ mod tests {
16521652
let expected_data = match security_mode {
16531653
TestSecurityMode::Initializing | TestSecurityMode::Managing => json!({
16541654
"action_groups.yml": "{\"_meta\":{\"config_version\":2,\"type\":\"actiongroups\"}}",
1655-
"allow_list.yml": "{\"_meta\":{\"config_version\":2,\"type\":\"allowlist\"},\"config\":{\"enabled\":false}}",
1655+
"allowlist.yml": "{\"_meta\":{\"config_version\":2,\"type\":\"allowlist\"},\"config\":{\"enabled\":false}}",
16561656
"audit.yml": "{\"_meta\":{\"config_version\":2,\"type\":\"audit\"},\"config\":{\"enabled\":false}}",
16571657
"config.yml": "{\"_meta\":{\"config_version\":2,\"type\":\"config\"},\"config\":{\"dynamic\":{\"authc\":{},\"authz\":{},\"http\":{}}}}",
16581658
"log4j2.properties": null,
@@ -1771,10 +1771,10 @@ mod tests {
17711771
"subPath": "action_groups.yml"
17721772
},
17731773
{
1774-
"mountPath": "/stackable/opensearch/config/opensearch-security/allow_list.yml",
1774+
"mountPath": "/stackable/opensearch/config/opensearch-security/allowlist.yml",
17751775
"name": "security-config-file-allowlist",
17761776
"readOnly": true,
1777-
"subPath": "allow_list.yml"
1777+
"subPath": "allowlist.yml"
17781778
},
17791779
{
17801780
"mountPath": "/stackable/opensearch/config/opensearch-security/audit.yml",
@@ -2298,10 +2298,10 @@ mod tests {
22982298
"subPath": "action_groups.yml",
22992299
},
23002300
{
2301-
"mountPath": "/stackable/opensearch/config/opensearch-security/allow_list.yml",
2301+
"mountPath": "/stackable/opensearch/config/opensearch-security/allowlist.yml",
23022302
"name": "security-config-file-allowlist",
23032303
"readOnly": true,
2304-
"subPath": "allow_list.yml",
2304+
"subPath": "allowlist.yml",
23052305
},
23062306
{
23072307
"mountPath": "/stackable/opensearch/config/opensearch-security/audit.yml",
@@ -2549,9 +2549,9 @@ mod tests {
25492549
"configMap": {
25502550
"items": [
25512551
{
2552-
"key": "allow_list.yml",
2552+
"key": "allowlist.yml",
25532553
"mode": 0o660,
2554-
"path": "allow_list.yml"
2554+
"path": "allowlist.yml"
25552555
}
25562556
],
25572557
"name": "my-opensearch-cluster-nodes-default"
@@ -2759,9 +2759,9 @@ mod tests {
27592759
"configMap": {
27602760
"items": [
27612761
{
2762-
"key": "allow_list.yml",
2762+
"key": "allowlist.yml",
27632763
"mode": 0o660,
2764-
"path": "allow_list.yml"
2764+
"path": "allowlist.yml"
27652765
}
27662766
],
27672767
"name": "my-opensearch-cluster-nodes-default"

‎rust/operator-binary/src/crd/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ impl<'a> IntoIterator for &'a v1alpha1::SecuritySettings {
629629
},
630630
ExtendedSecuritySettingsFileType {
631631
id: "allowlist",
632-
filename: "allow_list.yml",
632+
filename: "allowlist.yml",
633633
managed_by: &self.allow_list.managed_by,
634634
content: &self.allow_list.content,
635635
},

‎tests/templates/kuttl/security-config/11-assert.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ metadata:
3333
name: opensearch-nodes-security-config
3434
data:
3535
action_groups.yml: '{"_meta":{"config_version":2,"type":"actiongroups"}}'
36-
allow_list.yml: '{"_meta":{"config_version":2,"type":"allowlist"},"config":{"enabled":false}}'
36+
allowlist.yml: '{"_meta":{"config_version":2,"type":"allowlist"},"config":{"enabled":false}}'
3737
audit.yml: '{"_meta":{"config_version":2,"type":"audit"},"config":{"enabled":false}}'
3838
config.yml: '{"_meta":{"config_version":2,"type":"config"},"config":{"dynamic":{"authc":{"basic_internal_auth_domain":{"authentication_backend":{"type":"intern"},"description":"Authenticate
3939
via HTTP Basic against internal users database","http_authenticator":{"challenge":true,"type":"basic"},"http_enabled":true,"order":1,"transport_enabled":true}},"authz":{},"http":{"anonymous_auth_enabled":true}}}}'

‎tests/templates/kuttl/security-config/21-assert.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
name: opensearch-nodes-security-config
1010
data:
1111
action_groups.yml: '{"_meta":{"config_version":2,"type":"actiongroups"}}'
12-
allow_list.yml: '{"_meta":{"config_version":2,"type":"allowlist"},"config":{"enabled":false}}'
12+
allowlist.yml: '{"_meta":{"config_version":2,"type":"allowlist"},"config":{"enabled":false}}'
1313
audit.yml: '{"_meta":{"config_version":2,"type":"audit"},"config":{"enabled":false}}'
1414
config.yml: '{"_meta":{"config_version":2,"type":"config"},"config":{"dynamic":{"authc":{"basic_internal_auth_domain":{"authentication_backend":{"type":"intern"},"description":"Authenticate
1515
via HTTP Basic against internal users database","http_authenticator":{"challenge":true,"type":"basic"},"http_enabled":true,"order":1,"transport_enabled":true}},"authz":{},"http":{"anonymous_auth_enabled":false}}}}'

‎tests/templates/kuttl/smoke/10-assert.yaml.j2‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,10 @@ spec:
201201
name: security-config-file-actiongroups
202202
readOnly: true
203203
subPath: action_groups.yml
204-
- mountPath: {{ test_scenario['values']['opensearch_home'] }}/config/opensearch-security/allow_list.yml
204+
- mountPath: {{ test_scenario['values']['opensearch_home'] }}/config/opensearch-security/allowlist.yml
205205
name: security-config-file-allowlist
206206
readOnly: true
207-
subPath: allow_list.yml
207+
subPath: allowlist.yml
208208
- mountPath: {{ test_scenario['values']['opensearch_home'] }}/config/opensearch-security/audit.yml
209209
name: security-config-file-audit
210210
readOnly: true
@@ -360,9 +360,9 @@ spec:
360360
- configMap:
361361
defaultMode: 420
362362
items:
363-
- key: allow_list.yml
363+
- key: allowlist.yml
364364
mode: 432
365-
path: allow_list.yml
365+
path: allowlist.yml
366366
name: opensearch-nodes-cluster-manager
367367
name: security-config-file-allowlist
368368
- configMap:
@@ -674,10 +674,10 @@ spec:
674674
name: security-config-file-actiongroups
675675
readOnly: true
676676
subPath: action_groups.yml
677-
- mountPath: {{ test_scenario['values']['opensearch_home'] }}/config/opensearch-security/allow_list.yml
677+
- mountPath: {{ test_scenario['values']['opensearch_home'] }}/config/opensearch-security/allowlist.yml
678678
name: security-config-file-allowlist
679679
readOnly: true
680-
subPath: allow_list.yml
680+
subPath: allowlist.yml
681681
- mountPath: {{ test_scenario['values']['opensearch_home'] }}/config/opensearch-security/audit.yml
682682
name: security-config-file-audit
683683
readOnly: true
@@ -833,9 +833,9 @@ spec:
833833
- configMap:
834834
defaultMode: 420
835835
items:
836-
- key: allow_list.yml
836+
- key: allowlist.yml
837837
mode: 432
838-
path: allow_list.yml
838+
path: allowlist.yml
839839
name: opensearch-nodes-data
840840
name: security-config-file-allowlist
841841
- configMap:
@@ -951,7 +951,7 @@ metadata:
951951
name: opensearch
952952
data:
953953
action_groups.yml: '{"_meta":{"config_version":2,"type":"actiongroups"}}'
954-
allow_list.yml: '{"_meta":{"config_version":2,"type":"allowlist"},"config":{"enabled":false}}'
954+
allowlist.yml: '{"_meta":{"config_version":2,"type":"allowlist"},"config":{"enabled":false}}'
955955
audit.yml: '{"_meta":{"config_version":2,"type":"audit"},"config":{"enabled":false}}'
956956
config.yml: '{"_meta":{"config_version":2,"type":"config"},"config":{"dynamic":{"authc":{"basic_internal_auth_domain":{"authentication_backend":{"type":"intern"},"description":"Authenticate via HTTP Basic against internal users database","http_authenticator":{"challenge":true,"type":"basic"},"http_enabled":true,"order":1,"transport_enabled":true}},"authz":{}}}}'
957957
internal_users.yml: '{"_meta":{"config_version":2,"type":"internalusers"},"admin":{"backend_roles":["admin"],"description":"OpenSearch admin user","hash":"$2y$10$xRtHZFJ9QhG9GcYhRpAGpufCZYsk//nxsuel5URh0GWEBgmiI4Q/e","reserved":true}}'
@@ -1001,7 +1001,7 @@ metadata:
10011001
name: opensearch
10021002
data:
10031003
action_groups.yml: '{"_meta":{"config_version":2,"type":"actiongroups"}}'
1004-
allow_list.yml: '{"_meta":{"config_version":2,"type":"allowlist"},"config":{"enabled":false}}'
1004+
allowlist.yml: '{"_meta":{"config_version":2,"type":"allowlist"},"config":{"enabled":false}}'
10051005
audit.yml: '{"_meta":{"config_version":2,"type":"audit"},"config":{"enabled":false}}'
10061006
config.yml: '{"_meta":{"config_version":2,"type":"config"},"config":{"dynamic":{"authc":{"basic_internal_auth_domain":{"authentication_backend":{"type":"intern"},"description":"Authenticate via HTTP Basic against internal users database","http_authenticator":{"challenge":true,"type":"basic"},"http_enabled":true,"order":1,"transport_enabled":true}},"authz":{}}}}'
10071007
internal_users.yml: '{"_meta":{"config_version":2,"type":"internalusers"},"admin":{"backend_roles":["admin"],"description":"OpenSearch admin user","hash":"$2y$10$xRtHZFJ9QhG9GcYhRpAGpufCZYsk//nxsuel5URh0GWEBgmiI4Q/e","reserved":true}}'

0 commit comments

Comments
 (0)