From bc5232d02c5f7adef4f1e699f5649f0a4934083c Mon Sep 17 00:00:00 2001 From: Patrik Cyvoct Date: Mon, 22 Mar 2021 10:42:48 +0100 Subject: [PATCH] fix(scaleway): drop support for organization ID as it's not needed Signed-off-by: Patrik Cyvoct --- provider/scaleway/scaleway.go | 4 ---- provider/scaleway/scaleway_test.go | 14 -------------- 2 files changed, 18 deletions(-) diff --git a/provider/scaleway/scaleway.go b/provider/scaleway/scaleway.go index 12cbf1620..c145d5fe2 100644 --- a/provider/scaleway/scaleway.go +++ b/provider/scaleway/scaleway.go @@ -63,10 +63,6 @@ func NewScalewayProvider(ctx context.Context, domainFilter endpoint.DomainFilter return nil, err } - if _, ok := scwClient.GetDefaultOrganizationID(); !ok { - return nil, fmt.Errorf("default organization is not set") - } - if _, ok := scwClient.GetAccessKey(); !ok { return nil, fmt.Errorf("access key no set") } diff --git a/provider/scaleway/scaleway_test.go b/provider/scaleway/scaleway_test.go index c9ca99112..a6276a309 100644 --- a/provider/scaleway/scaleway_test.go +++ b/provider/scaleway/scaleway_test.go @@ -113,26 +113,12 @@ func (m *mockScalewayDomain) UpdateDNSZoneRecords(req *domain.UpdateDNSZoneRecor func TestScalewayProvider_NewScalewayProvider(t *testing.T) { _ = os.Setenv(scw.ScwAccessKeyEnv, "SCWXXXXXXXXXXXXXXXXX") _ = os.Setenv(scw.ScwSecretKeyEnv, "11111111-1111-1111-1111-111111111111") - _ = os.Setenv(scw.ScwDefaultOrganizationIDEnv, "11111111-1111-1111-1111-111111111111") _, err := NewScalewayProvider(context.TODO(), endpoint.NewDomainFilter([]string{"example.com"}), true) if err != nil { t.Errorf("failed : %s", err) } - _ = os.Unsetenv(scw.ScwDefaultOrganizationIDEnv) - _, err = NewScalewayProvider(context.TODO(), endpoint.NewDomainFilter([]string{"example.com"}), true) - if err == nil { - t.Errorf("expected to fail") - } - - _ = os.Setenv(scw.ScwDefaultOrganizationIDEnv, "dummy") - _, err = NewScalewayProvider(context.TODO(), endpoint.NewDomainFilter([]string{"example.com"}), true) - if err == nil { - t.Errorf("expected to fail") - } - _ = os.Unsetenv(scw.ScwSecretKeyEnv) - _ = os.Setenv(scw.ScwDefaultOrganizationIDEnv, "11111111-1111-1111-1111-111111111111") _, err = NewScalewayProvider(context.TODO(), endpoint.NewDomainFilter([]string{"example.com"}), true) if err == nil { t.Errorf("expected to fail")