Merge branch 'master' into ui-dependency-wdio-bump

libs/go/sia/aws/stssession/stssession.go

@@ -26,22 +26,18 @@ import (
 )
 
 func New(useRegionalSTS bool, region string) (*sts.Client, error) {
+	cfg, err := config.LoadDefaultConfig(context.TODO(),
+		config.WithRegion(region),
+	)
+	if err != nil {
+		return nil, fmt.Errorf("unable to create new session: %v", err)
+	}
 	if useRegionalSTS {
-		stsUrl := "sts." + region + ".amazonaws.com"
-		cfg, err := config.LoadDefaultConfig(context.TODO(),
-			config.WithRegion(region),
-		)
-		if err != nil {
-			return nil, fmt.Errorf("unable to create new session: %v", err)
-		}
+		stsUrl := "https://sts." + region + ".amazonaws.com"
 		return sts.NewFromConfig(cfg, func(o *sts.Options) {
 			o.BaseEndpoint = aws.String(stsUrl)
 		}), nil
 	} else {
-		cfg, err := config.LoadDefaultConfig(context.TODO())
-		if err != nil {
-			return nil, fmt.Errorf("unable to create new session: %v", err)
-		}
 		return sts.NewFromConfig(cfg), nil
 	}
 }

provider/aws/sia-ec2/authn.go

@@ -103,7 +103,7 @@ func GetEC2Config(configFile, profileConfigFile, profileRestrictToKey, metaEndpo
 			log.Printf("Unable to process environment settings: %v\n", err)
 			// if we do not have settings in our environment, we're going
 			// to use fallback to <domain>.<service>-service naming structure
-			log.Println("Trying to determine service name security credentials...")
+			log.Println("Trying to determine service name from security credentials...")
 			configAccount, _, err = options.InitCredsConfig("-service", "@", useRegionalSTS, region)
 			if err != nil {
 				log.Printf("Unable to process security credentials: %v\n", err)