Skip to content

add send_secondary_ip_range_if_empty #2661

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.

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

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/hashicorp/hcl/v2 v2.20.1
github.com/hashicorp/terraform-json v0.22.1
github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240813201407-f2425b4433f6
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240813211423-bff22d1f68ad
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.9.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@ github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0 h1:qHprzXy/As0rxedphECBEQAh
github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0/go.mod h1:H+8tjs9TjV2w57QFVSMBQacf8k/E1XwLXGCARgViC6A=
github.com/hashicorp/terraform-plugin-testing v1.5.1 h1:T4aQh9JAhmWo4+t1A7x+rnxAJHCDIYW9kXyo4sVO92c=
github.com/hashicorp/terraform-plugin-testing v1.5.1/go.mod h1:dg8clO6K59rZ8w9EshBmDp1CxTIPu3yA4iaDpX1h5u0=
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240813201407-f2425b4433f6 h1:SLS0h0Io1bzZmjS0JGG6GRe+7Szi1t8ydbBUZXnG9EE=
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240813201407-f2425b4433f6/go.mod h1:IkI2dOHongwQ2RIUyitBH4rDJvYBuClAoFCheApCTpY=
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240813211423-bff22d1f68ad h1:4v6d8n+4QoS5BoK40yQjbTtL8M9FIaaN1O8Hvpo/Ucw=
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240813211423-bff22d1f68ad/go.mod h1:IkI2dOHongwQ2RIUyitBH4rDJvYBuClAoFCheApCTpY=
github.com/hashicorp/terraform-registry-address v0.2.3 h1:2TAiKJ1A3MAkZlH1YI/aTVcLZRu7JseiXNRHbOAyoTI=
github.com/hashicorp/terraform-registry-address v0.2.3/go.mod h1:lFHA76T8jfQteVfT7caREqguFrW3c4MFSPhZB7HHgUM=
github.com/hashicorp/terraform-svchost v0.1.1 h1:EZZimZ1GxdqFRinZ1tpJwVxxt49xc/S52uzrw4x0jKQ=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package compute
import (
"context"
"fmt"
"log"
"net"
"reflect"

Expand Down Expand Up @@ -48,6 +49,37 @@ func IsShrinkageIpCidr(_ context.Context, old, new, _ interface{}) bool {
return true
}

func sendSecondaryIpRangeIfEmptyDiff(_ context.Context, diff *schema.ResourceDiff, meta interface{}) error {
// on create, return immediately as we don't need to determine if the value is empty or not
if diff.Id() == "" {
return nil
}

sendZero := diff.Get("send_secondary_ip_range_if_empty").(bool)
if !sendZero {
return nil
}

configSecondaryIpRange := diff.GetRawConfig().GetAttr("secondary_ip_range")
if !configSecondaryIpRange.IsKnown() {
return nil
}
configValueIsEmpty := configSecondaryIpRange.IsNull() || configSecondaryIpRange.LengthInt() == 0

stateSecondaryIpRange := diff.GetRawState().GetAttr("secondary_ip_range")
if !stateSecondaryIpRange.IsKnown() {
return nil
}
stateValueIsEmpty := stateSecondaryIpRange.IsNull() || stateSecondaryIpRange.LengthInt() == 0

if configValueIsEmpty && !stateValueIsEmpty {
log.Printf("[DEBUG] setting secondary_ip_range to newly empty")
diff.SetNew("secondary_ip_range", make([]interface{}, 0))
}

return nil
}

const ComputeSubnetworkAssetType string = "compute.googleapis.com/Subnetwork"

func ResourceConverterComputeSubnetwork() cai.ResourceConverter {
Expand Down