Merge pull request #4039 from M0NsTeRRR/master

fix: regression on scaleway provider in 0.14.0
kubernetes-sigs · Nov 21, 2023 · 2cc17d9 · 2cc17d9
2 parents 0e63390 + 37a8010
commit 2cc17d9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/provider/scaleway/scaleway.go b/provider/scaleway/scaleway.go
@@ -65,7 +65,18 @@ func NewScalewayProvider(ctx context.Context, domainFilter endpoint.DomainFilter
 			defaultPageSize = 1000
 		}
 	}
-	p, _ := scw.MustLoadConfig().GetActiveProfile()
+
+	p := &scw.Profile{}
+	c, err := scw.LoadConfig()
+	if err != nil {
+		log.Warnf("Cannot load config: %v", err)
+	} else {
+		p, err = c.GetActiveProfile()
+		if err != nil {
+			log.Warnf("Cannot get active profile: %v", err)
+		}
+	}
+
 	scwClient, err := scw.NewClient(
 		scw.WithProfile(p),
 		scw.WithEnv(),

diff --git a/provider/scaleway/scaleway_test.go b/provider/scaleway/scaleway_test.go
@@ -161,6 +161,14 @@ func TestScalewayProvider_NewScalewayProvider(t *testing.T) {
 	}
 }
 
+func TestScalewayProvider_OptionnalConfigFile(t *testing.T) {
+	_ = os.Setenv(scw.ScwAccessKeyEnv, "SCWXXXXXXXXXXXXXXXXX")
+	_ = os.Setenv(scw.ScwSecretKeyEnv, "11111111-1111-1111-1111-111111111111")
+
+	_, err := NewScalewayProvider(context.TODO(), endpoint.NewDomainFilter([]string{"example.com"}), true)
+	assert.NoError(t, err)
+}
+
 func TestScalewayProvider_AdjustEndpoints(t *testing.T) {
 	provider := &ScalewayProvider{}