From ce57f9d3e61b7d577e0df6dc3975a8d3d41afd22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bindewald=2C=20Andr=C3=A9=20=28UIT=29?= Date: Mon, 19 Aug 2024 21:51:02 +0200 Subject: [PATCH 1/2] fix(ip_group_cidr): Fixed the pos of the CIDR existence check --- internal/services/network/ip_group_cidr_resource.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/internal/services/network/ip_group_cidr_resource.go b/internal/services/network/ip_group_cidr_resource.go index f24c187194ad..32c7bc6b6d06 100644 --- a/internal/services/network/ip_group_cidr_resource.go +++ b/internal/services/network/ip_group_cidr_resource.go @@ -136,10 +136,11 @@ func resourceIpGroupCidrRead(d *pluginsdk.ResourceData, meta interface{}) error if resp.Model.Properties == nil { return fmt.Errorf("retrieving %s: `properties` was nil", ipGroupId) } - if !utils.SliceContainsValue(*resp.Model.Properties.IPAddresses, cidr) { - d.SetId("") - return nil - } + } + + if !utils.SliceContainsValue(*resp.Model.Properties.IPAddresses, cidr) { + d.SetId("") + return nil } d.Set("ip_group_id", ipGroupId.ID()) From 3be0641d11d34c87987b0f99d4084e7e839fa393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bindewald=2C=20Andr=C3=A9=20=28UIT=29?= Date: Tue, 20 Aug 2024 16:29:20 +0200 Subject: [PATCH 2/2] fix(ip_group_cidr): Prevent nil pointer dereference --- internal/services/network/ip_group_cidr_resource.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/services/network/ip_group_cidr_resource.go b/internal/services/network/ip_group_cidr_resource.go index 32c7bc6b6d06..c7ef55af3b8d 100644 --- a/internal/services/network/ip_group_cidr_resource.go +++ b/internal/services/network/ip_group_cidr_resource.go @@ -8,6 +8,7 @@ import ( "strings" "time" + "github.com/hashicorp/go-azure-helpers/lang/pointer" "github.com/hashicorp/go-azure-helpers/lang/response" "github.com/hashicorp/go-azure-sdk/resource-manager/network/2023-11-01/ipgroups" "github.com/hashicorp/terraform-provider-azurerm/helpers/tf" @@ -138,7 +139,7 @@ func resourceIpGroupCidrRead(d *pluginsdk.ResourceData, meta interface{}) error } } - if !utils.SliceContainsValue(*resp.Model.Properties.IPAddresses, cidr) { + if !utils.SliceContainsValue(pointer.From(resp.Model.Properties.IPAddresses), cidr) { d.SetId("") return nil }