From 789e7a8eafa91a1df6281bd0c6bec9d78b13ac9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Cie=C5=9Blak?= Date: Mon, 2 Oct 2023 17:03:38 +0200 Subject: [PATCH] wip --- pkg/resources/network_policy.go | 17 ++--------------- pkg/sdk/network_policies_gen.go | 1 + pkg/sdk/network_policies_impl_gen.go | 9 +++++++++ 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/pkg/resources/network_policy.go b/pkg/resources/network_policy.go index ebdf0d9d102..5179c32df51 100644 --- a/pkg/resources/network_policy.go +++ b/pkg/resources/network_policy.go @@ -102,21 +102,8 @@ func ReadNetworkPolicy(d *schema.ResourceData, meta interface{}) error { ctx := context.Background() client := sdk.NewClientFromDB(db) - networkPolicies, err := client.NetworkPolicies.Show(ctx, sdk.NewShowNetworkPolicyRequest()) - if err != nil { - return err - } - - var networkPolicy *sdk.NetworkPolicy - for _, np := range networkPolicies { - if np.Name == policyName { - np := np - networkPolicy = &np - break - } - } - - if networkPolicy == nil { + networkPolicy, err := client.NetworkPolicies.ShowByID(ctx, sdk.NewAccountObjectIdentifier(policyName)) + if networkPolicy == nil || err != nil { // If not found, mark resource to be removed from state file during apply or refresh log.Printf("[DEBUG] network policy (%s) not found", d.Id()) d.SetId("") diff --git a/pkg/sdk/network_policies_gen.go b/pkg/sdk/network_policies_gen.go index c2667d02b0e..d1aba59894c 100644 --- a/pkg/sdk/network_policies_gen.go +++ b/pkg/sdk/network_policies_gen.go @@ -7,6 +7,7 @@ type NetworkPolicies interface { Alter(ctx context.Context, request *AlterNetworkPolicyRequest) error Drop(ctx context.Context, request *DropNetworkPolicyRequest) error Show(ctx context.Context, request *ShowNetworkPolicyRequest) ([]NetworkPolicy, error) + ShowByID(ctx context.Context, id AccountObjectIdentifier) (*NetworkPolicy, error) Describe(ctx context.Context, id AccountObjectIdentifier) ([]NetworkPolicyDescription, error) } diff --git a/pkg/sdk/network_policies_impl_gen.go b/pkg/sdk/network_policies_impl_gen.go index f93edd04d39..c1e5b61a408 100644 --- a/pkg/sdk/network_policies_impl_gen.go +++ b/pkg/sdk/network_policies_impl_gen.go @@ -33,6 +33,15 @@ func (v *networkPolicies) Show(ctx context.Context, request *ShowNetworkPolicyRe return resultList, nil } +func (v *networkPolicies) ShowByID(ctx context.Context, id AccountObjectIdentifier) (*NetworkPolicy, error) { + networkPolicies, err := v.Show(ctx, NewShowNetworkPolicyRequest()) + if err != nil { + return nil, err + } + + return findOne(networkPolicies, func(r NetworkPolicy) bool { return r.Name == id.Name() }) +} + func (v *networkPolicies) Describe(ctx context.Context, id AccountObjectIdentifier) ([]NetworkPolicyDescription, error) { opts := &DescribeNetworkPolicyOptions{ name: id,