fix: don't early return in provider.Configure()

Author: asalkeld

pkg/provider/pulumi/aws/aws.go

@@ -176,10 +176,6 @@ func (a *awsProvider) Validate() error {
 }
 
 func (a *awsProvider) Configure(ctx context.Context, autoStack *auto.Stack) error {
-	if a.sc.Region != "" && autoStack != nil {
-		return autoStack.SetConfig(ctx, "aws:region", auto.ConfigValue{Value: a.sc.Region})
-	}
-
 	dc, dok := a.sc.Config["default"]
 
 	for fn, f := range a.proj.Functions {
@@ -210,6 +206,10 @@ func (a *awsProvider) Configure(ctx context.Context, autoStack *auto.Stack) erro
 		a.proj.Functions[fn] = f
 	}
 
+	if a.sc.Region != "" && autoStack != nil {
+		return autoStack.SetConfig(ctx, "aws:region", auto.ConfigValue{Value: a.sc.Region})
+	}
+
 	return nil
 }
 

pkg/provider/pulumi/azure/azure.go

@@ -202,27 +202,6 @@ func (a *azureProvider) Validate() error {
 }
 
 func (a *azureProvider) Configure(ctx context.Context, autoStack *auto.Stack) error {
-	if a.sc.Region != "" {
-		err := autoStack.SetConfig(ctx, "azure:location", auto.ConfigValue{Value: a.sc.Region})
-		if err != nil {
-			return err
-		}
-
-		err = autoStack.SetConfig(ctx, "azure-native:location", auto.ConfigValue{Value: a.sc.Region})
-		if err != nil {
-			return err
-		}
-
-		return nil
-	}
-
-	region, err := autoStack.GetConfig(ctx, "azure-native:location")
-	if err != nil {
-		return err
-	}
-
-	a.sc.Region = region.Value
-
 	dc, dok := a.sc.Config["default"]
 
 	for fn, f := range a.proj.Functions {
@@ -253,7 +232,12 @@ func (a *azureProvider) Configure(ctx context.Context, autoStack *auto.Stack) er
 		a.proj.Functions[fn] = f
 	}
 
-	return nil
+	err := autoStack.SetConfig(ctx, "azure:location", auto.ConfigValue{Value: a.sc.Region})
+	if err != nil {
+		return err
+	}
+
+	return autoStack.SetConfig(ctx, "azure-native:location", auto.ConfigValue{Value: a.sc.Region})
 }
 
 func (a *azureProvider) Deploy(ctx *pulumi.Context) error {