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

DeleteVPNServerWithContext failure occurring when attempting to destr… #4758

Merged
merged 2 commits into from
Sep 11, 2023
Merged

DeleteVPNServerWithContext failure occurring when attempting to destr… #4758

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
ae07658
DeleteVPNServerWithContext failure occurring when attempting to destr…
SunithaGudisagarIBM1 Aug 3, 2023
b0b52a9
Removed Verion from Doc
SunithaGudisagarIBM1 Aug 31, 2023
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
1 change: 1 addition & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1931,6 +1931,7 @@ google.golang.org/appengine v1.6.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
Expand Down
30 changes: 15 additions & 15 deletions ibm/service/vpc/resource_ibm_is_vpn_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,11 +313,6 @@ func ResourceIBMIsVPNServer() *schema.Resource {
Description: "The type of resource referenced.",
},

"version": &schema.Schema{
Type: schema.TypeString,
Computed: true,
},

isVPNServerAccessTags: {
Type: schema.TypeSet,
Optional: true,
Expand Down Expand Up @@ -709,10 +704,6 @@ func resourceIBMIsVPNServerRead(context context.Context, d *schema.ResourceData,
return diag.FromErr(fmt.Errorf("[ERROR] Error setting resource_type: %s", err))
}

if err = d.Set("version", response.Headers.Get("Etag")); err != nil {
return diag.FromErr(fmt.Errorf("[ERROR] Error setting version: %s", err))
}

accesstags, err := flex.GetGlobalTagsUsingCRN(meta, *vpnServer.CRN, "", isVPNServerAccessTagType)
if err != nil {
log.Printf(
Expand Down Expand Up @@ -871,8 +862,6 @@ func resourceIBMIsVPNServerUpdate(context context.Context, d *schema.ResourceDat
hasChange = true
}

updateVPNServerOptions.SetIfMatch(d.Get("version").(string))

getVPNServerOptions := &vpcv1.GetVPNServerOptions{}
getVPNServerOptions.SetID(d.Id())
vpnServer, response, err := sess.GetVPNServerWithContext(context, getVPNServerOptions)
Expand Down Expand Up @@ -930,13 +919,24 @@ func resourceIBMIsVPNServerDelete(context context.Context, d *schema.ResourceDat
if err != nil {
return diag.FromErr(err)
}
deleteVPNServerOptions := &vpcv1.DeleteVPNServerOptions{}

getVPNServerOptions := &vpcv1.GetVPNServerOptions{}
getVPNServerOptions.SetID(d.Id())
_, response, err := sess.GetVPNServerWithContext(context, getVPNServerOptions)
if err != nil {
if response != nil && response.StatusCode == 404 {
d.SetId("")
return nil
}
log.Printf("[DEBUG] GetVPNServerWithContext failed %s\n%s", err, response)
return diag.FromErr(fmt.Errorf("[ERROR] GetVPNServerWithContext failed %s\n%s", err, response))
}
etag := response.Headers.Get("Etag")
deleteVPNServerOptions := &vpcv1.DeleteVPNServerOptions{}
deleteVPNServerOptions.SetID(d.Id())
deleteVPNServerOptions.SetIfMatch(etag)

deleteVPNServerOptions.SetIfMatch(d.Get("version").(string))

response, err := sess.DeleteVPNServerWithContext(context, deleteVPNServerOptions)
response, err = sess.DeleteVPNServerWithContext(context, deleteVPNServerOptions)
if err != nil {
log.Printf("[DEBUG] DeleteVPNServerWithContext failed %s\n%s", err, response)
return diag.FromErr(fmt.Errorf("[ERROR] DeleteVPNServerWithContext failed %s\n%s", err, response))
Expand Down
2 changes: 0 additions & 2 deletions website/docs/r/is_vpn_server.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,6 @@ In addition to all argument references listed, you can access the following attr
- `resource_type` - (String) The resource type.

- `resource_type` - (String) The type of resource referenced.
- `version` - Version of the VPNServer.


## Import

Expand Down