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

Jump to bottom

[swift v1]: don't fail, when container/object doesn't exist #1535

Merged
merged 1 commit into from
Mar 30, 2023
Merged

[swift v1]: don't fail, when container/object doesn't exist #1535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 0 additions & 7 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,9 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gophercloud/gophercloud v0.20.0/go.mod h1:wRtmUelyIIv3CSSDI47aUwbs075O6i+LY+pXsKCBsb4=
github.com/gophercloud/gophercloud v1.1.1/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM=
github.com/gophercloud/gophercloud v1.2.1-0.20230309142102-36ac4a411ba7 h1:wDr3jLA3vAtpH5DvqdTHtn34Uo15qA7F6EdEIJtm7+s=
github.com/gophercloud/gophercloud v1.2.1-0.20230309142102-36ac4a411ba7/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM=
github.com/gophercloud/utils v0.0.0-20220307143606-8e7800759d16 h1:slt/exMiitZNY+5OrKJ6ZvSogqN+SyzeYzAtyI6db9A=
github.com/gophercloud/utils v0.0.0-20220307143606-8e7800759d16/go.mod h1:qOGlfG6OIJ193/c3Xt/XjOfHataNZdQcVgiu93LxBUM=
github.com/gophercloud/utils v0.0.0-20230324070755-05e9e7f5ea4d h1:AfRlf5NnsYsHIW5nNxhYp+99Bmj/fLeOYwD5Z4CMlzw=
github.com/gophercloud/utils v0.0.0-20230324070755-05e9e7f5ea4d/go.mod h1:z4Dey7xsTUXgcB1C8elMvGRKTjV1ez0eoYQlMrduG1g=
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
Expand All @@ -116,7 +113,6 @@ github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9
github.com/hashicorp/go-plugin v1.4.8 h1:CHGwpxYDOttQOY7HOWgETU9dyVjOXzniXDqJcYJE1zM=
github.com/hashicorp/go-plugin v1.4.8/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s=
github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
Expand Down Expand Up @@ -238,7 +234,6 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
Expand Down Expand Up @@ -289,7 +284,6 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
Expand All @@ -313,7 +307,6 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
Expand Down
3 changes: 1 addition & 2 deletions openstack/resource_openstack_objectstorage_container_v1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,6 @@ func resourceObjectStorageContainerV1Read(ctx context.Context, d *schema.Resourc
}

result := containers.Get(objectStorageClient, d.Id(), nil)

if result.Err != nil {
return diag.FromErr(CheckDeleted(d, result.Err, "container"))
}
Expand Down Expand Up @@ -370,7 +369,7 @@ func resourceObjectStorageContainerV1Delete(ctx context.Context, d *schema.Resou
}
return resourceObjectStorageContainerV1Delete(ctx, d, meta)
}
return diag.Errorf("error deleting objectstorage_container_v1 '%s': %s", d.Id(), err)
return diag.FromErr(CheckDeleted(d, err, fmt.Sprintf("error deleting objectstorage_container_v1 '%s'", d.Id())))
}

d.SetId("")
Expand Down
4 changes: 2 additions & 2 deletions openstack/resource_openstack_objectstorage_object_v1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ func resourceObjectStorageObjectV1Read(ctx context.Context, d *schema.ResourceDa
log.Printf("[DEBUG] Get Options: %#v", getOpts)
result, err := objects.Get(objectStorageClient, cn, name, getOpts).Extract()
if err != nil {
return diag.Errorf("Error getting OpenStack container object: %s", err)
return diag.FromErr(CheckDeleted(d, err, "Error getting OpenStack container object"))
}

log.Printf("[DEBUG] Retrieved OpenStack Object Storage Object: %#v", result)
Expand Down Expand Up @@ -392,7 +392,7 @@ func resourceObjectStorageObjectV1Delete(ctx context.Context, d *schema.Resource

_, err = objects.Delete(objectStorageClient, cn, name, deleteOpts).Extract()
if err != nil {
return diag.Errorf("Error getting OpenStack container object: %s", err)
return diag.FromErr(CheckDeleted(d, err, fmt.Sprintf("Error deleting OpenStack container object: %s", name)))
}
return nil
}
Expand Down
57 changes: 57 additions & 0 deletions openstack/resource_openstack_objectstorage_object_v1_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"

"github.com/gophercloud/gophercloud/openstack/objectstorage/v1/containers"
"github.com/gophercloud/gophercloud/openstack/objectstorage/v1/objects"
)

Expand Down Expand Up @@ -99,6 +100,40 @@ func TestAccObjectStorageV1Object_basic(t *testing.T) {
})
}

func TestAccObjectStorageV1Object_basic_check_destroy(t *testing.T) {
resource.Test(t, resource.TestCase{
PreCheck: func() {
testAccPreCheck(t)
testAccPreCheckSwift(t)
},
ProviderFactories: testAccProviders,
CheckDestroy: func(s *terraform.State) error {
return testAccCheckObjectStorageV1ObjectDestroy(s, "terraform/test/myfile.txt")
},
Steps: []resource.TestStep{
{
Config: testAccObjectStorageV1ObjectBasic(),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(
"openstack_objectstorage_container_v1.container_1", "name", "tf_test_container_1"),
resource.TestCheckResourceAttr(
"openstack_objectstorage_object_v1.myfile", "content_type", "text/plain"),
),
},
{
Config: testAccObjectStorageV1ObjectBasic(),
ExpectNonEmptyPlan: true,
Check: testAccCheckObjectStorageV1DestroyContainer("tf_test_container_1", "terraform/test/myfile.txt"),
},
{
Config: testAccObjectStorageV1ObjectBasic(),
Destroy: true,
PreventPostDestroyRefresh: true,
},
},
})
}

func TestAccObjectStorageV1Object_fromSource(t *testing.T) {
content := []byte("foo")
tmpfile, err := ioutil.TempFile("", "tf_test_objectstorage_object")
Expand Down Expand Up @@ -301,6 +336,28 @@ func testAccCheckObjectStorageV1ObjectDeleteAtMatches(expected string, object *o
}
}

func testAccCheckObjectStorageV1DestroyContainer(container, object string) resource.TestCheckFunc {
return func(s *terraform.State) error {
config := testAccProvider.Meta().(*Config)
objectStorageClient, err := config.ObjectStorageV1Client(osRegionName)
if err != nil {
return fmt.Errorf("Error creating OpenStack object storage client: %s", err)
}

_, err = objects.Delete(objectStorageClient, container, object, nil).Extract()
if err != nil {
return err
}

_, err = containers.Delete(objectStorageClient, container).Extract()
if err != nil {
return err
}

return err
}
}

func testAccObjectStorageV1ObjectBasic() string {
return fmt.Sprintf(`
resource "openstack_objectstorage_container_v1" "container_1" {
Expand Down