Skip to content

Commit 6090dab

Browse files
awmackowiakawmackowiak
committed
Prepare redirection for testing
1 parent a09b5f6 commit 6090dab

File tree

2 files changed

+288
-4
lines changed

2 files changed

+288
-4
lines changed

‎vaas/vaas/resources/dev-data.yaml‎

Lines changed: 286 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,13 @@
227227
fields: {domain: "mydomain.com", mappings_list: '["{one}:6081","{two}:6081"]', type: dynamic, clusters: []}
228228
- model: cluster.domainmapping
229229
pk: 2
230-
fields: {domain: "example.com", mappings_list: '["example.base.com"]', type: static, clusters: [3]}
230+
fields: {domain: "example.com", mappings_list: '["example.base.com"]', type: static, clusters: [1]}
231+
- model: cluster.domainmapping
232+
pk: 3
233+
fields: {domain: "mydomain3.com", mappings_list: '["mydomain3.com"]', type: static, clusters: []}
234+
- model: cluster.domainmapping
235+
pk: 4
236+
fields: {domain: "example3.com", mappings_list: '["example2.base.com"]', type: static, clusters: [1]}
231237
- model: cluster.vcltemplate
232238
pk: 2
233239
fields: {name: vagrant_template_4, content: "<VCL/>", version: '4.0', comment: wefwef}
@@ -802,12 +808,290 @@
802808
- model: router.redirect
803809
pk: 1
804810
fields:
805-
src_domain: 1
811+
src_domain: 3
806812
condition: req.url ~ "/source_url"
807813
destination: http://mydomain.com/destination_url
808814
action: 301
809815
priority: 250
810816
preserve_query_params: false
817+
- model: router.redirect
818+
pk: 10
819+
fields:
820+
src_domain: 3
821+
condition: req.url ~ "/source_url"
822+
destination: http://mydomain.com/destination_url
823+
action: 301
824+
priority: 210
825+
preserve_query_params: false
826+
- model: router.redirect
827+
pk: 11
828+
fields:
829+
src_domain: 3
830+
condition: req.url ~ "/source_url"
831+
destination: http://mydomain.com/destination_url
832+
action: 301
833+
priority: 211
834+
preserve_query_params: false
835+
- model: router.redirect
836+
pk: 12
837+
fields:
838+
src_domain: 1
839+
condition: req.url ~ "/source_url"
840+
destination: http://mydomain.com/destination_url
841+
action: 301
842+
priority: 212
843+
preserve_query_params: false
844+
- model: router.redirect
845+
pk: 13
846+
fields:
847+
src_domain: 1
848+
condition: req.url ~ "/source_url"
849+
destination: http://mydomain.com/destination_url
850+
action: 301
851+
priority: 213
852+
preserve_query_params: false
853+
- model: router.redirect
854+
pk: 14
855+
fields:
856+
src_domain: 1
857+
condition: req.url ~ "/source_url"
858+
destination: http://mydomain.com/destination_url
859+
action: 301
860+
priority: 214
861+
preserve_query_params: false
862+
- model: router.redirect
863+
pk: 15
864+
fields:
865+
src_domain: 1
866+
condition: req.url ~ "/source_url"
867+
destination: http://mydomain.com/destination_url
868+
action: 301
869+
priority: 215
870+
preserve_query_params: false
871+
- model: router.redirect
872+
pk: 16
873+
fields:
874+
src_domain: 1
875+
condition: req.url ~ "/source_url"
876+
destination: http://mydomain.com/destination_url
877+
action: 301
878+
priority: 216
879+
preserve_query_params: false
880+
- model: router.redirect
881+
pk: 17
882+
fields:
883+
src_domain: 1
884+
condition: req.url ~ "/source_url"
885+
destination: http://mydomain.com/destination_url
886+
action: 301
887+
priority: 217
888+
preserve_query_params: false
889+
- model: router.redirect
890+
pk: 18
891+
fields:
892+
src_domain: 1
893+
condition: req.url ~ "/source_url"
894+
destination: http://mydomain.com/destination_url
895+
action: 301
896+
priority: 218
897+
preserve_query_params: false
898+
- model: router.redirect
899+
pk: 19
900+
fields:
901+
src_domain: 1
902+
condition: req.url ~ "/source_url"
903+
destination: http://mydomain.com/destination_url
904+
action: 301
905+
priority: 219
906+
preserve_query_params: false
907+
- model: router.redirect
908+
pk: 20
909+
fields:
910+
src_domain: 1
911+
condition: req.url ~ "/source_url"
912+
destination: http://mydomain.com/destination_url
913+
action: 301
914+
priority: 220
915+
preserve_query_params: false
916+
- model: router.redirect
917+
pk: 21
918+
fields:
919+
src_domain: 1
920+
condition: req.url ~ "/source_url"
921+
destination: http://mydomain.com/destination_url
922+
action: 301
923+
priority: 221
924+
preserve_query_params: false
925+
- model: router.redirect
926+
pk: 22
927+
fields:
928+
src_domain: 1
929+
condition: req.url ~ "/source_url"
930+
destination: http://mydomain.com/destination_url
931+
action: 301
932+
priority: 222
933+
preserve_query_params: false
934+
- model: router.redirect
935+
pk: 23
936+
fields:
937+
src_domain: 2
938+
condition: req.url ~ "/source_url"
939+
destination: http://mydomain.com/destination_url
940+
action: 301
941+
priority: 223
942+
preserve_query_params: false
943+
- model: router.redirect
944+
pk: 24
945+
fields:
946+
src_domain: 2
947+
condition: req.url ~ "/source_url"
948+
destination: http://mydomain.com/destination_url
949+
action: 301
950+
priority: 224
951+
preserve_query_params: false
952+
- model: router.redirect
953+
pk: 25
954+
fields:
955+
src_domain: 2
956+
condition: req.url ~ "/source_url"
957+
destination: http://mydomain.com/destination_url
958+
action: 301
959+
priority: 225
960+
preserve_query_params: false
961+
- model: router.redirect
962+
pk: 26
963+
fields:
964+
src_domain: 2
965+
condition: req.url ~ "/source_url"
966+
destination: http://mydomain.com/destination_url
967+
action: 301
968+
priority: 226
969+
preserve_query_params: false
970+
- model: router.redirect
971+
pk: 27
972+
fields:
973+
src_domain: 2
974+
condition: req.url ~ "/source_url"
975+
destination: http://mydomain.com/destination_url
976+
action: 301
977+
priority: 227
978+
preserve_query_params: false
979+
- model: router.redirect
980+
pk: 28
981+
fields:
982+
src_domain: 2
983+
condition: req.url ~ "/source_url"
984+
destination: http://mydomain.com/destination_url
985+
action: 301
986+
priority: 228
987+
preserve_query_params: false
988+
- model: router.redirect
989+
pk: 29
990+
fields:
991+
src_domain: 2
992+
condition: req.url ~ "/source_url"
993+
destination: http://mydomain.com/destination_url
994+
action: 301
995+
priority: 229
996+
preserve_query_params: false
997+
- model: router.redirect
998+
pk: 30
999+
fields:
1000+
src_domain: 2
1001+
condition: req.url ~ "/source_url"
1002+
destination: http://mydomain.com/destination_url
1003+
action: 301
1004+
priority: 230
1005+
preserve_query_params: false
1006+
- model: router.redirect
1007+
pk: 31
1008+
fields:
1009+
src_domain: 2
1010+
condition: req.url ~ "/source_url"
1011+
destination: http://mydomain.com/destination_url
1012+
action: 301
1013+
priority: 231
1014+
preserve_query_params: false
1015+
- model: router.redirect
1016+
pk: 32
1017+
fields:
1018+
src_domain: 2
1019+
condition: req.url ~ "/source_url"
1020+
destination: http://mydomain.com/destination_url
1021+
action: 301
1022+
priority: 232
1023+
preserve_query_params: false
1024+
- model: router.redirect
1025+
pk: 33
1026+
fields:
1027+
src_domain: 2
1028+
condition: req.url ~ "/source_url"
1029+
destination: http://mydomain.com/destination_url
1030+
action: 301
1031+
priority: 233
1032+
preserve_query_params: false
1033+
- model: router.redirect
1034+
pk: 34
1035+
fields:
1036+
src_domain: 2
1037+
condition: req.url ~ "/source_url"
1038+
destination: http://mydomain.com/destination_url
1039+
action: 301
1040+
priority: 234
1041+
preserve_query_params: false
1042+
- model: router.redirect
1043+
pk: 35
1044+
fields:
1045+
src_domain: 2
1046+
condition: req.url ~ "/source_url"
1047+
destination: http://mydomain.com/destination_url
1048+
action: 301
1049+
priority: 235
1050+
preserve_query_params: false
1051+
- model: router.redirect
1052+
pk: 36
1053+
fields:
1054+
src_domain: 2
1055+
condition: req.url ~ "/source_url"
1056+
destination: http://mydomain.com/destination_url
1057+
action: 301
1058+
priority: 236
1059+
preserve_query_params: false
1060+
- model: router.redirect
1061+
pk: 37
1062+
fields:
1063+
src_domain: 3
1064+
condition: req.url ~ "/source_url"
1065+
destination: http://mydomain.com/destination_url
1066+
action: 301
1067+
priority: 237
1068+
preserve_query_params: false
1069+
- model: router.redirect
1070+
pk: 38
1071+
fields:
1072+
src_domain: 3
1073+
condition: req.url ~ "/source_url"
1074+
destination: http://mydomain.com/destination_url
1075+
action: 301
1076+
priority: 238
1077+
preserve_query_params: false
1078+
- model: router.redirect
1079+
pk: 39
1080+
fields:
1081+
src_domain: 3
1082+
condition: req.url ~ "/source_url"
1083+
destination: http://mydomain.com/destination_url
1084+
action: 301
1085+
priority: 239
1086+
preserve_query_params: false
1087+
- model: router.redirect
1088+
pk: 40
1089+
fields:
1090+
src_domain: 3
1091+
condition: req.url ~ "/source_url"
1092+
destination: http://mydomain.com/destination_url
1093+
action: 301
1094+
priority: 240
8111095
- model: auth.user
8121096
fields:
8131097
password: pbkdf2_sha256$36000$HSNx3yHNXG51$yggojN+90XWiHuGBK7YnrUZMWtMKpck45CsSel0JxUk=

‎vaas/vaas/vcl/renderer.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,9 @@ def __init__(self, varnish, input_data):
189189
@collect_processing
190190
def prepare_redirects(self) -> Dict[str, List[VclRedirect]]:
191191
redirects = {}
192-
related_domains = MappingProvider(DomainMapping.objects.all()).provide_related_domains(self.varnish.cluster)
192+
related_domains = MappingProvider(DomainMapping.objects.all()).provide_related_domains(self.varnish.cluster) # tutaj juz mamy dwa zapytania do bazy
193193
for redirect in self.input.redirects:
194-
destination_domain, destination_mappings = redirect.fetch_all_destinations_mappings(self.varnish.cluster)
194+
destination_domain, destination_mappings = redirect.fetch_all_destinations_mappings(self.varnish.cluster) # tutaj znów sięgamy do bazy po redirecty i liste mappingow
195195
if str(redirect.src_domain) in related_domains:
196196
for mapped_domain in redirect.src_domain.mapped_domains(self.varnish.cluster):
197197
destination = str(redirect.destination)

0 commit comments

Comments
 (0)