Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixtestacc #138

Merged
merged 2 commits into from
Mar 2, 2020
Merged

Fixtestacc #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4a87a7
Don't fail sweeper if OVH_ZONE is not set
Mar 2, 2020
9af96c1
cloud_network_private: fix sweeper
Mar 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 9 additions & 15 deletions ovh/resource_ovh_cloud_network_private_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,43 +90,37 @@ func testSweepCloudNetworkPrivate(region string) error {
return fmt.Errorf("OVH_PUBLIC_CLOUD must be set")
}

networkIds := []string{}
err = client.Get(fmt.Sprintf("/cloud/project/%s/network/private", projectId), &networkIds)
networks := []CloudNetworkPrivateResponse{}
err = client.Get(fmt.Sprintf("/cloud/project/%s/network/private", projectId), &networks)
if err != nil {
return fmt.Errorf("error listing private networks for project %q:\n\t %q", projectId, err)
}

for _, n := range networkIds {
r := &CloudNetworkPrivateResponse{}
err = client.Get(fmt.Sprintf("/cloud/project/%s/network/private/%s", projectId, n), r)
if err != nil {
return fmt.Errorf("error getting private network %q for project %q:\n\t %q", n, projectId, err)
}

if !strings.HasPrefix(r.Name, test_prefix) {
for _, n := range networks {
if !strings.HasPrefix(n.Name, test_prefix) {
continue
}

log.Printf("[DEBUG] found dangling network & subnets for project: %s, id: %s", projectId, n)
log.Printf("[DEBUG] found dangling network & subnets for project: %s, id: %s", projectId, n.Id)
err = resource.Retry(5*time.Minute, func() *resource.RetryError {
subnetIds := []string{}
err = client.Get(fmt.Sprintf("/cloud/project/%s/network/private/%s/subnet", projectId, n), &subnetIds)
err = client.Get(fmt.Sprintf("/cloud/project/%s/network/private/%s/subnet", projectId, n.Id), &subnetIds)
if err != nil {
return resource.RetryableError(fmt.Errorf("error listing private network subnets for project %q:\n\t %q", projectId, err))
}

for _, s := range subnetIds {
if err := client.Delete(fmt.Sprintf("/cloud/project/%s/network/private/%s/subnet/%s", projectId, n, s), nil); err != nil {
if err := client.Delete(fmt.Sprintf("/cloud/project/%s/network/private/%s/subnet/%s", projectId, n.Id, s), nil); err != nil {
return resource.RetryableError(err)
}
}

if err := client.Delete(fmt.Sprintf("/cloud/project/%s/network/private/%s", projectId, n), nil); err != nil {
if err := client.Delete(fmt.Sprintf("/cloud/project/%s/network/private/%s", projectId, n.Id), nil); err != nil {
return resource.RetryableError(err)
}

// Successful cascade delete
log.Printf("[DEBUG] successful cascade delete of network & subnets for project: %s, id: %s", projectId, n)
log.Printf("[DEBUG] successful cascade delete of network & subnets for project: %s, id: %s", projectId, n.Id)
return nil
})

Expand Down
3 changes: 2 additions & 1 deletion ovh/resource_ovh_domain_zone_record_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ func testSweepDomainZoneRecord(region string) error {

zoneName := os.Getenv("OVH_ZONE")
if zoneName == "" {
return fmt.Errorf("OVH_ZONE must be set")
log.Print("[DEBUG] OVH_ZONE is not set. No zone to sweep")
return nil
}

dz := &DomainZone{}
Expand Down
3 changes: 2 additions & 1 deletion ovh/resource_ovh_domain_zone_redirection_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ func testSweepDomainZoneRedirection(region string) error {

zoneName := os.Getenv("OVH_ZONE")
if zoneName == "" {
return fmt.Errorf("OVH_ZONE must be set")
log.Print("[DEBUG] OVH_ZONE is not set. No zone to sweep")
return nil
}

dz := &DomainZone{}
Expand Down