fix(scaleway): drop support for organization ID as it's not needed

Signed-off-by: Patrik Cyvoct <patrik@ptrk.io>
This commit is contained in:
Patrik Cyvoct 2021-03-22 10:42:48 +01:00
parent 6ca57a58d3
commit bc5232d02c
No known key found for this signature in database
GPG Key ID: 4334D82B950FB63A
2 changed files with 0 additions and 18 deletions

View File

@ -63,10 +63,6 @@ func NewScalewayProvider(ctx context.Context, domainFilter endpoint.DomainFilter
return nil, err return nil, err
} }
if _, ok := scwClient.GetDefaultOrganizationID(); !ok {
return nil, fmt.Errorf("default organization is not set")
}
if _, ok := scwClient.GetAccessKey(); !ok { if _, ok := scwClient.GetAccessKey(); !ok {
return nil, fmt.Errorf("access key no set") return nil, fmt.Errorf("access key no set")
} }

View File

@ -113,26 +113,12 @@ func (m *mockScalewayDomain) UpdateDNSZoneRecords(req *domain.UpdateDNSZoneRecor
func TestScalewayProvider_NewScalewayProvider(t *testing.T) { func TestScalewayProvider_NewScalewayProvider(t *testing.T) {
_ = os.Setenv(scw.ScwAccessKeyEnv, "SCWXXXXXXXXXXXXXXXXX") _ = os.Setenv(scw.ScwAccessKeyEnv, "SCWXXXXXXXXXXXXXXXXX")
_ = os.Setenv(scw.ScwSecretKeyEnv, "11111111-1111-1111-1111-111111111111") _ = 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) _, err := NewScalewayProvider(context.TODO(), endpoint.NewDomainFilter([]string{"example.com"}), true)
if err != nil { if err != nil {
t.Errorf("failed : %s", err) 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.Unsetenv(scw.ScwSecretKeyEnv)
_ = os.Setenv(scw.ScwDefaultOrganizationIDEnv, "11111111-1111-1111-1111-111111111111")
_, err = NewScalewayProvider(context.TODO(), endpoint.NewDomainFilter([]string{"example.com"}), true) _, err = NewScalewayProvider(context.TODO(), endpoint.NewDomainFilter([]string{"example.com"}), true)
if err == nil { if err == nil {
t.Errorf("expected to fail") t.Errorf("expected to fail")