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

fix: check state for ibm_tg_connection_action correctly #4446

Merged
merged 2 commits into from
Mar 29, 2023
Merged

fix: check state for ibm_tg_connection_action correctly #4446

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02e5973
fix: check state for ibm_tg_connection_action correctly
Mar 28, 2023
52bc102
fix: tg_connection_action read - it doesn't need to perform get call.…
Mar 28, 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
31 changes: 10 additions & 21 deletions ibm/service/transitgateway/resource_ibm_tg_gateway_connection_action.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,19 @@ func ResourceIBMTransitGatewayConnectionAction() *schema.Resource {
CustomizeDiff: customdiff.All(
customdiff.Sequence(
func(_ context.Context, diff *schema.ResourceDiff, v interface{}) error {
// Allow reusing the resource block to approve a new connection
if diff.HasChange(tgConnectionId) {
return nil
}
if diff.HasChange(tgConnectionAction) {
if diff.HasChange(tgGatewayId) || diff.HasChange(tgConnectionId) {
return nil
}
o, n := diff.GetChange(tgConnectionAction)
oldAction := o.(string)
newAction := n.(string)
if oldAction == "" {
// oldAction is empty when performing an action on a connection for the first time
// We are only concerned with checking if the action changes for existing action/connection resource
return nil
}
return fmt.Errorf("The action for the transit gateway connection has already been performed and cannot be changed from %s to %s", oldAction, newAction)
}
return nil
Expand Down Expand Up @@ -113,11 +119,6 @@ func resourceIBMTransitGatewayConnectionActionCreate(d *schema.ResourceData, met
}

func resourceIBMTransitGatewayConnectionActionRead(d *schema.ResourceData, meta interface{}) error {

client, err := transitgatewayClient(meta)
if err != nil {
return err
}
parts, err := flex.IdParts(d.Id())
if err != nil {
return err
Expand All @@ -126,19 +127,7 @@ func resourceIBMTransitGatewayConnectionActionRead(d *schema.ResourceData, meta
gatewayId := parts[0]
ID := parts[1]

getTransitGatewayConnectionOptions := &transitgatewayapisv1.GetTransitGatewayConnectionOptions{}
getTransitGatewayConnectionOptions.SetTransitGatewayID(gatewayId)
getTransitGatewayConnectionOptions.SetID(ID)
instance, response, err := client.GetTransitGatewayConnection(getTransitGatewayConnectionOptions)
if err != nil {
if response != nil && response.StatusCode == 404 {
d.SetId("")
return nil
}
return fmt.Errorf("Error Getting Transit Gateway Connection (%s): %s\n%s", ID, err, response)
}

d.Set(tgConnectionId, *instance.ID)
d.Set(tgConnectionId, ID)
d.Set(tgGatewayId, gatewayId)

return nil
Expand Down