Skip to content

Commit 1087aa8

Browse files
jderussejderusse
authored
Improve region deduplication (#1277)
1 parent 9f9458b commit 1087aa8

File tree

1 file changed

+26
-170
lines changed

1 file changed

+26
-170
lines changed

‎src/LambdaClient.php

Lines changed: 26 additions & 170 deletions
Original file line numberDiff line numberDiff line change
@@ -367,144 +367,41 @@ protected function getEndpointMetadata(?string $region): array
367367
}
368368

369369
switch ($region) {
370-
case 'us-iso-east-1':
371-
case 'us-iso-west-1':
372-
return [
373-
'endpoint' => "https://lambda.$region.c2s.ic.gov",
374-
'signRegion' => $region,
375-
'signService' => 'lambda',
376-
'signVersions' => ['v4'],
377-
];
378-
case 'us-isob-east-1':
379-
return [
380-
'endpoint' => 'https://lambda.us-isob-east-1.sc2s.sgov.gov',
381-
'signRegion' => 'us-isob-east-1',
382-
'signService' => 'lambda',
383-
'signVersions' => ['v4'],
384-
];
385370
case 'af-south-1':
386-
return [
387-
'endpoint' => 'https://lambda.af-south-1.amazonaws.com',
388-
'signRegion' => 'af-south-1',
389-
'signService' => 'lambda',
390-
'signVersions' => ['v4'],
391-
];
392371
case 'ap-east-1':
393-
return [
394-
'endpoint' => 'https://lambda.ap-east-1.amazonaws.com',
395-
'signRegion' => 'ap-east-1',
396-
'signService' => 'lambda',
397-
'signVersions' => ['v4'],
398-
];
399372
case 'ap-northeast-1':
400-
return [
401-
'endpoint' => 'https://lambda.ap-northeast-1.amazonaws.com',
402-
'signRegion' => 'ap-northeast-1',
403-
'signService' => 'lambda',
404-
'signVersions' => ['v4'],
405-
];
406373
case 'ap-northeast-2':
407-
return [
408-
'endpoint' => 'https://lambda.ap-northeast-2.amazonaws.com',
409-
'signRegion' => 'ap-northeast-2',
410-
'signService' => 'lambda',
411-
'signVersions' => ['v4'],
412-
];
413374
case 'ap-northeast-3':
414-
return [
415-
'endpoint' => 'https://lambda.ap-northeast-3.amazonaws.com',
416-
'signRegion' => 'ap-northeast-3',
417-
'signService' => 'lambda',
418-
'signVersions' => ['v4'],
419-
];
420375
case 'ap-south-1':
421-
return [
422-
'endpoint' => 'https://lambda.ap-south-1.amazonaws.com',
423-
'signRegion' => 'ap-south-1',
424-
'signService' => 'lambda',
425-
'signVersions' => ['v4'],
426-
];
427376
case 'ap-southeast-1':
428-
return [
429-
'endpoint' => 'https://lambda.ap-southeast-1.amazonaws.com',
430-
'signRegion' => 'ap-southeast-1',
431-
'signService' => 'lambda',
432-
'signVersions' => ['v4'],
433-
];
434377
case 'ap-southeast-2':
435-
return [
436-
'endpoint' => 'https://lambda.ap-southeast-2.amazonaws.com',
437-
'signRegion' => 'ap-southeast-2',
438-
'signService' => 'lambda',
439-
'signVersions' => ['v4'],
440-
];
441378
case 'ap-southeast-3':
442-
return [
443-
'endpoint' => 'https://lambda.ap-southeast-3.amazonaws.com',
444-
'signRegion' => 'ap-southeast-3',
445-
'signService' => 'lambda',
446-
'signVersions' => ['v4'],
447-
];
448379
case 'ca-central-1':
449-
return [
450-
'endpoint' => 'https://lambda.ca-central-1.amazonaws.com',
451-
'signRegion' => 'ca-central-1',
452-
'signService' => 'lambda',
453-
'signVersions' => ['v4'],
454-
];
455-
case 'cn-north-1':
456-
return [
457-
'endpoint' => 'https://lambda.cn-north-1.amazonaws.com.cn',
458-
'signRegion' => 'cn-north-1',
459-
'signService' => 'lambda',
460-
'signVersions' => ['v4'],
461-
];
462-
case 'cn-northwest-1':
463-
return [
464-
'endpoint' => 'https://lambda.cn-northwest-1.amazonaws.com.cn',
465-
'signRegion' => 'cn-northwest-1',
466-
'signService' => 'lambda',
467-
'signVersions' => ['v4'],
468-
];
469380
case 'eu-central-1':
470-
return [
471-
'endpoint' => 'https://lambda.eu-central-1.amazonaws.com',
472-
'signRegion' => 'eu-central-1',
473-
'signService' => 'lambda',
474-
'signVersions' => ['v4'],
475-
];
476381
case 'eu-north-1':
477-
return [
478-
'endpoint' => 'https://lambda.eu-north-1.amazonaws.com',
479-
'signRegion' => 'eu-north-1',
480-
'signService' => 'lambda',
481-
'signVersions' => ['v4'],
482-
];
483382
case 'eu-south-1':
484-
return [
485-
'endpoint' => 'https://lambda.eu-south-1.amazonaws.com',
486-
'signRegion' => 'eu-south-1',
487-
'signService' => 'lambda',
488-
'signVersions' => ['v4'],
489-
];
490383
case 'eu-west-1':
491-
return [
492-
'endpoint' => 'https://lambda.eu-west-1.amazonaws.com',
493-
'signRegion' => 'eu-west-1',
494-
'signService' => 'lambda',
495-
'signVersions' => ['v4'],
496-
];
497384
case 'eu-west-2':
385+
case 'eu-west-3':
386+
case 'me-south-1':
387+
case 'sa-east-1':
388+
case 'us-east-1':
389+
case 'us-east-2':
390+
case 'us-gov-east-1':
391+
case 'us-gov-west-1':
392+
case 'us-west-1':
393+
case 'us-west-2':
498394
return [
499-
'endpoint' => 'https://lambda.eu-west-2.amazonaws.com',
500-
'signRegion' => 'eu-west-2',
395+
'endpoint' => "https://lambda.$region.amazonaws.com",
396+
'signRegion' => $region,
501397
'signService' => 'lambda',
502398
'signVersions' => ['v4'],
503399
];
504-
case 'eu-west-3':
400+
case 'cn-north-1':
401+
case 'cn-northwest-1':
505402
return [
506-
'endpoint' => 'https://lambda.eu-west-3.amazonaws.com',
507-
'signRegion' => 'eu-west-3',
403+
'endpoint' => "https://lambda.$region.amazonaws.com.cn",
404+
'signRegion' => $region,
508405
'signService' => 'lambda',
509406
'signVersions' => ['v4'],
510407
];
@@ -522,20 +419,6 @@ protected function getEndpointMetadata(?string $region): array
522419
'signService' => 'lambda',
523420
'signVersions' => ['v4'],
524421
];
525-
case 'fips-us-gov-east-1':
526-
return [
527-
'endpoint' => 'https://lambda-fips.us-gov-east-1.amazonaws.com',
528-
'signRegion' => 'us-gov-east-1',
529-
'signService' => 'lambda',
530-
'signVersions' => ['v4'],
531-
];
532-
case 'fips-us-gov-west-1':
533-
return [
534-
'endpoint' => 'https://lambda-fips.us-gov-west-1.amazonaws.com',
535-
'signRegion' => 'us-gov-west-1',
536-
'signService' => 'lambda',
537-
'signVersions' => ['v4'],
538-
];
539422
case 'fips-us-west-1':
540423
return [
541424
'endpoint' => 'https://lambda-fips.us-west-1.amazonaws.com',
@@ -550,59 +433,32 @@ protected function getEndpointMetadata(?string $region): array
550433
'signService' => 'lambda',
551434
'signVersions' => ['v4'],
552435
];
553-
case 'me-south-1':
554-
return [
555-
'endpoint' => 'https://lambda.me-south-1.amazonaws.com',
556-
'signRegion' => 'me-south-1',
557-
'signService' => 'lambda',
558-
'signVersions' => ['v4'],
559-
];
560-
case 'sa-east-1':
561-
return [
562-
'endpoint' => 'https://lambda.sa-east-1.amazonaws.com',
563-
'signRegion' => 'sa-east-1',
564-
'signService' => 'lambda',
565-
'signVersions' => ['v4'],
566-
];
567-
case 'us-east-1':
568-
return [
569-
'endpoint' => 'https://lambda.us-east-1.amazonaws.com',
570-
'signRegion' => 'us-east-1',
571-
'signService' => 'lambda',
572-
'signVersions' => ['v4'],
573-
];
574-
case 'us-east-2':
575-
return [
576-
'endpoint' => 'https://lambda.us-east-2.amazonaws.com',
577-
'signRegion' => 'us-east-2',
578-
'signService' => 'lambda',
579-
'signVersions' => ['v4'],
580-
];
581-
case 'us-gov-east-1':
436+
case 'fips-us-gov-east-1':
582437
return [
583-
'endpoint' => 'https://lambda.us-gov-east-1.amazonaws.com',
438+
'endpoint' => 'https://lambda-fips.us-gov-east-1.amazonaws.com',
584439
'signRegion' => 'us-gov-east-1',
585440
'signService' => 'lambda',
586441
'signVersions' => ['v4'],
587442
];
588-
case 'us-gov-west-1':
443+
case 'fips-us-gov-west-1':
589444
return [
590-
'endpoint' => 'https://lambda.us-gov-west-1.amazonaws.com',
445+
'endpoint' => 'https://lambda-fips.us-gov-west-1.amazonaws.com',
591446
'signRegion' => 'us-gov-west-1',
592447
'signService' => 'lambda',
593448
'signVersions' => ['v4'],
594449
];
595-
case 'us-west-1':
450+
case 'us-iso-east-1':
451+
case 'us-iso-west-1':
596452
return [
597-
'endpoint' => 'https://lambda.us-west-1.amazonaws.com',
598-
'signRegion' => 'us-west-1',
453+
'endpoint' => "https://lambda.$region.c2s.ic.gov",
454+
'signRegion' => $region,
599455
'signService' => 'lambda',
600456
'signVersions' => ['v4'],
601457
];
602-
case 'us-west-2':
458+
case 'us-isob-east-1':
603459
return [
604-
'endpoint' => 'https://lambda.us-west-2.amazonaws.com',
605-
'signRegion' => 'us-west-2',
460+
'endpoint' => 'https://lambda.us-isob-east-1.sc2s.sgov.gov',
461+
'signRegion' => 'us-isob-east-1',
606462
'signService' => 'lambda',
607463
'signVersions' => ['v4'],
608464
];

0 commit comments

Comments
 (0)