fix refresh token bug, set default region in signature when endpoint is not amazon

Author: rlauer6

ChangeLog

@@ -1,3 +1,17 @@
+Mon Jun 23 06:15:12 2025  Rob Lauer  <rlauer6@comcast.net>
+
+	[2.1.4]:
+	* VERSION: bump
+	* README.md: generated
+	* cpan/buildspec.yml: cpan/test_requires, cpan/requires
+	* src/main/perl/lib/Amazon/API.pm.in
+	(get_valid_token):
+	- return if no token
+	- $credentials->can('refresh_token'), not $self
+	* src/main/perl/lib/Amazon/API/Signature4.pm.in
+	(parse_service_url)
+	- set default region when endpoint is not amazon
+
 Tue Feb 25 08:40:57 2025  Rob Lauer  <rlauer6@comcast.net>
 
 	[2.1.3]:

VERSION

@@ -1 +1 @@
-2.1.3
+2.1.4

cpan/buildspec.yml

@@ -6,8 +6,8 @@ project:
 pm_module: Amazon::API
 min-perl-version: 5.010
 dependencies:
-  test_requires: test-requires
-  requires: requires
+  test_requires: cpan/test-requires
+  requires: cpan/requires
 path:
   pm_module: src/main/perl/lib
   tests: src/main/perl/t

src/main/perl/lib/Amazon/API.pm.in

@@ -1650,10 +1650,13 @@ sub get_valid_token {
 
   my $credentials = $self->get_credentials;
 
+  return
+    if !$credentials->get_token;
+
   if ( $credentials->can('is_token_expired') ) {
     if ( $credentials->is_token_expired ) {
 
-      if ( !$self->can('refresh_token') || !$credentials->refresh_token ) {
+      if ( !$credentials->can('refresh_token') || !$credentials->refresh_token ) {
         croak 'token expired';
       }
     }

src/main/perl/lib/Amazon/API/Signature4.pm.in

@@ -7,15 +7,12 @@ use parent qw( Exporter AWS::Signature4 );
 
 our $VERSION = '@PACKAGE_VERSION@';
 
-our @EXPORT_OK = qw{ parse_service_url };
+our @EXPORT_OK = qw( parse_service_url );
 
 our @SERVICE_URL_REGEXP = (
-  qr/(s3)[.]amazonaws[.]com\z/xsm,
-  qr/(s3)[.]([^.]+)[.]amazonaws[.]com\z/xsm,
-  qr/(s3)[.][^.]+[.]([^.]+)[.]amazonaws[.]com\z/xsm,
-  qr/(s3)[-][^.]+.+[.]([^.]+)[.]amazonaws[.]com\z/xsm,
-  qr/^([[:alpha:]-]+)[.]amazonaws[.]com\z/xsm,
-  qr/^([[:alpha:]-]+)[.]([^.]*)[.]amazonaws[.]com/xsm,
+  qr/(s3)[.]amazonaws[.]com\z/xsm,                   qr/(s3)[.]([^.]+)[.]amazonaws[.]com\z/xsm,
+  qr/(s3)[.][^.]+[.]([^.]+)[.]amazonaws[.]com\z/xsm, qr/(s3)[-][^.]+.+[.]([^.]+)[.]amazonaws[.]com\z/xsm,
+  qr/^([[:alpha:]-]+)[.]amazonaws[.]com\z/xsm,       qr/^([[:alpha:]-]+)[.]([^.]*)[.]amazonaws[.]com/xsm,
 );
 
 ########################################################################
@@ -33,7 +30,7 @@ sub new {
   @{$self}{@extra} = @args{@extra};
 
   return $self;
-} ## end sub new
+}
 
 ########################################################################
 sub parse_service_url {
@@ -46,18 +43,17 @@ sub parse_service_url {
   if ( !$service || !$region ) {
     foreach my $regexp (@SERVICE_URL_REGEXP) {
       if ( $host =~ $regexp ) {
-        #        print Dumper [ $host, $regexp ];
-
         $service = $1;
         $region  = $2 || $region || $default_region;
         last;
-      } ## end if ( $host =~ $regexp )
+      }
+    }
+  }
 
-    } ## end foreach my $regexp (@SERVICE_URL_REGEXP)
-  } ## end if ( !$service || !$region)
+  $region ||= $default_region;
 
   return ( $host, $service, $region );
-} ## end sub parse_service_url
+}
 
 ###############################################################
 sub scope {
@@ -84,7 +80,7 @@ sub _scope {
   );
 
   return "$date/$region/$service/aws4_request";
-} ## end sub _scope
+}
 
 1;
 

src/main/perl/lib/README.md

@@ -964,7 +964,7 @@ by passing the `content_type` option to the constructor.
 
 # VERSION
 
-This documentation refers to version 2.1.3  of `Amazon::API`.
+This documentation refers to version 2.1.4  of `Amazon::API`.
 
 # DIAGNOSTICS