From 0f9864f3f2e5870be4d8e2b1460441ea32c5dce4 Mon Sep 17 00:00:00 2001 From: Prajwal Jarali Date: Tue, 3 Dec 2024 12:01:59 +0530 Subject: [PATCH 1/8] covered plain Fmt.ErrorF with flex.FmtErrorF wrapper --- go.mod | 2 +- go.sum | 6 +-- .../data_source_ibm_app_config_collection.go | 21 ++++----- .../data_source_ibm_app_config_collections.go | 13 +++--- .../data_source_ibm_app_config_environment.go | 15 ++++--- ...data_source_ibm_app_config_environments.go | 20 ++++----- .../data_source_ibm_app_config_feature.go | 29 ++++++------ .../data_source_ibm_app_config_features.go | 19 ++++---- .../data_source_ibm_app_config_properties.go | 13 +++--- .../data_source_ibm_app_config_property.go | 27 ++++++------ .../data_source_ibm_app_config_segment.go | 23 +++++----- .../data_source_ibm_app_config_segments.go | 15 ++++--- .../data_source_ibm_app_config_snapshots.go | 13 +++--- .../resource_ibm_app_config_collection.go | 42 +++++++++--------- .../resource_ibm_app_config_environment.go | 24 +++++----- .../resource_ibm_app_config_feature.go | 38 ++++++++-------- .../resource_ibm_app_config_property.go | 44 +++++++++---------- .../resource_ibm_app_config_segment.go | 30 ++++++------- .../resource_ibm_app_config_snapshot.go | 28 ++++++------ 19 files changed, 215 insertions(+), 207 deletions(-) diff --git a/go.mod b/go.mod index e8b91698961..9b796a2bc6f 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20240725064144-454a2ae23113 github.com/IBM-Cloud/power-go-client v1.8.3 github.com/IBM/apigateway-go-sdk v0.0.0-20210714141226-a5d5d49caaca - github.com/IBM/appconfiguration-go-admin-sdk v0.3.0 + github.com/IBM/appconfiguration-go-admin-sdk v0.4.4 github.com/IBM/appid-management-go-sdk v0.0.0-20210908164609-dd0e0eaf732f github.com/IBM/cloud-databases-go-sdk v0.7.1 github.com/IBM/cloudant-go-sdk v0.8.0 diff --git a/go.sum b/go.sum index 0ffc92f67e0..4ebe59d18fa 100644 --- a/go.sum +++ b/go.sum @@ -124,8 +124,8 @@ github.com/IBM-Cloud/softlayer-go v1.0.5-tf h1:koUAyF9b6X78lLLruGYPSOmrfY2YcGYKO github.com/IBM-Cloud/softlayer-go v1.0.5-tf/go.mod h1:6HepcfAXROz0Rf63krk5hPZyHT6qyx2MNvYyHof7ik4= github.com/IBM/apigateway-go-sdk v0.0.0-20210714141226-a5d5d49caaca h1:crniVcf+YcmgF03NmmfonXwSQ73oJF+IohFYBwknMxs= github.com/IBM/apigateway-go-sdk v0.0.0-20210714141226-a5d5d49caaca/go.mod h1:IjXrnOcTe92Q4pEBHmui3H/GM1hw5Pd0zXA5cw5/iZU= -github.com/IBM/appconfiguration-go-admin-sdk v0.3.0 h1:OqFxnDxro0JiRwHBKytCcseY2YKD4n87JN1UcaOD4Ss= -github.com/IBM/appconfiguration-go-admin-sdk v0.3.0/go.mod h1:xPxAYhr/uywUIDEo/JqWbkUdTryPdzRdYBfUpA5IjoE= +github.com/IBM/appconfiguration-go-admin-sdk v0.4.4 h1:VQ+mVavoo3/xrBaVSyxE+B6Uef+m33RcbropwpTRBy4= +github.com/IBM/appconfiguration-go-admin-sdk v0.4.4/go.mod h1:E9cXu9w0EClhZq+E9wBw8QzNLKZd2bNdMrTXwVSWJ1s= github.com/IBM/appid-management-go-sdk v0.0.0-20210908164609-dd0e0eaf732f h1:4c1kqY4GqmkQ+tO03rneDb74Tv7BhTj8jDiDB1p8mdM= github.com/IBM/appid-management-go-sdk v0.0.0-20210908164609-dd0e0eaf732f/go.mod h1:d22kTYY7RYBWcQlZpqrSdshpB/lJ16viWS5Sbjtlc8s= github.com/IBM/cloud-databases-go-sdk v0.7.1 h1:5kK4/3NUsGxZzmuUe+1ftajpOQbeDVh5VeemrPgROP4= @@ -151,7 +151,6 @@ github.com/IBM/go-sdk-core/v3 v3.2.4/go.mod h1:lk9eOzNbNltPf3CBpcg1Ewkhw4qC3u2QC github.com/IBM/go-sdk-core/v5 v5.0.0/go.mod h1:vyNdbFujJtdTj9HbihtvKwwS3k/GKSKpOx9ZIQ6MWDY= github.com/IBM/go-sdk-core/v5 v5.5.1/go.mod h1:Sn+z+qTDREQvCr+UFa22TqqfXNxx3o723y8GsfLV8e0= github.com/IBM/go-sdk-core/v5 v5.6.3/go.mod h1:tt/B9rxLkRtglE7pvqLuYikgCXaZFL3btdruJaoUeek= -github.com/IBM/go-sdk-core/v5 v5.7.0/go.mod h1:+YbdhrjCHC84ls4MeBp+Hj4NZCni+tDAc0XQUqRO9Jc= github.com/IBM/go-sdk-core/v5 v5.9.5/go.mod h1:YlOwV9LeuclmT/qi/LAK2AsobbAP42veV0j68/rlZsE= github.com/IBM/go-sdk-core/v5 v5.10.2/go.mod h1:WZPFasUzsKab/2mzt29xPcfruSk5js2ywAPwW4VJjdI= github.com/IBM/go-sdk-core/v5 v5.17.4/go.mod h1:KsAAI7eStAWwQa4F96MLy+whYSh39JzNjklZRbN/8ns= @@ -599,7 +598,6 @@ github.com/go-openapi/strfmt v0.19.3/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6 github.com/go-openapi/strfmt v0.19.4/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk0dgdHXr2Qk= github.com/go-openapi/strfmt v0.19.10/go.mod h1:qBBipho+3EoIqn6YDI+4RnQEtj6jT/IdKm+PAlXxSUc= github.com/go-openapi/strfmt v0.20.1/go.mod h1:43urheQI9dNtE5lTZQfuFJvjYJKPrxicATpEfZwHUNk= -github.com/go-openapi/strfmt v0.20.2/go.mod h1:43urheQI9dNtE5lTZQfuFJvjYJKPrxicATpEfZwHUNk= github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= github.com/go-openapi/strfmt v0.21.3/go.mod h1:k+RzNO0Da+k3FrrynSNN8F7n/peCmQQqbbXjtDfvmGg= github.com/go-openapi/strfmt v0.21.7/go.mod h1:adeGTkxE44sPyLk0JV235VQAO/ZXUr8KAzYjclFs3ew= diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_collection.go b/ibm/service/appconfiguration/data_source_ibm_app_config_collection.go index 317d760f1c4..a60bcd48268 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_collection.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_collection.go @@ -5,6 +5,7 @@ package appconfiguration import ( "fmt" + "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" "github.com/IBM/appconfiguration-go-admin-sdk/appconfigurationv1" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) @@ -122,7 +123,7 @@ func dataSourceIbmAppConfigCollectionRead(d *schema.ResourceData, meta interface appconfigClient, err := getAppConfigClient(meta, guid) if err != nil { - return fmt.Errorf("getAppConfigClient failed %s", err) + return flex.FmtErrorf("getAppConfigClient failed %s", err) } options := &appconfigurationv1.GetCollectionOptions{} @@ -142,50 +143,50 @@ func dataSourceIbmAppConfigCollectionRead(d *schema.ResourceData, meta interface result, response, err := appconfigClient.GetCollection(options) if err != nil { - return fmt.Errorf("GetCollection failed %s\n%s", err, response) + return flex.FmtErrorf("GetCollection failed %s\n%s", err, response) } d.SetId(fmt.Sprintf("%s/%s", guid, *result.CollectionID)) if result.Name != nil { if err = d.Set("name", result.Name); err != nil { - return fmt.Errorf("[ERROR] Error setting name: %s", err) + return flex.FmtErrorf("[ERROR] Error setting name: %s", err) } } if result.Description != nil { if err = d.Set("description", result.Description); err != nil { - return fmt.Errorf("[ERROR] Error setting description: %s", err) + return flex.FmtErrorf("[ERROR] Error setting description: %s", err) } } if result.Tags != nil { if err = d.Set("tags", result.Tags); err != nil { - return fmt.Errorf("[ERROR] Error setting tags: %s", err) + return flex.FmtErrorf("[ERROR] Error setting tags: %s", err) } } if result.CreatedTime != nil { if err = d.Set("created_time", result.CreatedTime.String()); err != nil { - return fmt.Errorf("[ERROR] Error setting created_time: %s", err) + return flex.FmtErrorf("[ERROR] Error setting created_time: %s", err) } } if result.UpdatedTime != nil { if err = d.Set("updated_time", result.UpdatedTime.String()); err != nil { - return fmt.Errorf("[ERROR] Error setting updated_time: %s", err) + return flex.FmtErrorf("[ERROR] Error setting updated_time: %s", err) } } if result.Href != nil { if err = d.Set("href", result.Href); err != nil { - return fmt.Errorf("[ERROR] Error setting href: %s", err) + return flex.FmtErrorf("[ERROR] Error setting href: %s", err) } } if result.Features != nil { err = d.Set("features", dataSourceCollectionFlattenFeatures(result.Features)) if err != nil { - return fmt.Errorf("[ERROR] Error setting features %s", err) + return flex.FmtErrorf("[ERROR] Error setting features %s", err) } } if result.Properties != nil { err = d.Set("properties", dataSourceCollectionFlattenProperties(result.Properties)) if err != nil { - return fmt.Errorf("[ERROR] Error setting properties %s", err) + return flex.FmtErrorf("[ERROR] Error setting properties %s", err) } } diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_collections.go b/ibm/service/appconfiguration/data_source_ibm_app_config_collections.go index 707e2adacae..cc9d606591d 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_collections.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_collections.go @@ -8,6 +8,7 @@ import ( "reflect" "strconv" + "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/IBM/appconfiguration-go-admin-sdk/appconfigurationv1" @@ -150,7 +151,7 @@ func dataSourceIbmAppConfigCollectionsRead(d *schema.ResourceData, meta interfac appconfigClient, err := getAppConfigClient(meta, guid) if err != nil { - return fmt.Errorf("getAppConfigClient failed %s", err) + return flex.FmtErrorf("getAppConfigClient failed %s", err) } options := &appconfigurationv1.ListCollectionsOptions{} @@ -205,7 +206,7 @@ func dataSourceIbmAppConfigCollectionsRead(d *schema.ResourceData, meta interfac result, response, err := appconfigClient.ListCollections(options) collectionsList = result if err != nil { - return fmt.Errorf("ListCollections failed %s\n%s", err, response) + return flex.FmtErrorf("ListCollections failed %s\n%s", err, response) } if isLimit { offset = 0 @@ -225,22 +226,22 @@ func dataSourceIbmAppConfigCollectionsRead(d *schema.ResourceData, meta interfac if collectionsList.Collections != nil { err = d.Set("collections", dataSourceCollectionListFlattenCollections(collectionsList.Collections)) if err != nil { - return fmt.Errorf("[ERROR] Error setting collections %s", err) + return flex.FmtErrorf("[ERROR] Error setting collections %s", err) } } if collectionsList.Limit != nil { if err = d.Set("limit", collectionsList.Limit); err != nil { - return fmt.Errorf("[ERROR] Error setting limit: %s", err) + return flex.FmtErrorf("[ERROR] Error setting limit: %s", err) } } if collectionsList.Offset != nil { if err = d.Set("offset", collectionsList.Offset); err != nil { - return fmt.Errorf("[ERROR] Error setting offset: %s", err) + return flex.FmtErrorf("[ERROR] Error setting offset: %s", err) } } if collectionsList.TotalCount != nil { if err = d.Set("total_count", collectionsList.TotalCount); err != nil { - return fmt.Errorf("[ERROR] Error setting total_count: %s", err) + return flex.FmtErrorf("[ERROR] Error setting total_count: %s", err) } } diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_environment.go b/ibm/service/appconfiguration/data_source_ibm_app_config_environment.go index 738f8f278ea..9d198cfcef6 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_environment.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_environment.go @@ -7,6 +7,7 @@ import ( "fmt" "log" + "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/IBM/appconfiguration-go-admin-sdk/appconfigurationv1" @@ -96,37 +97,37 @@ func dataSourceIbmAppConfigEnvironmentRead(d *schema.ResourceData, meta interfac if result.Name != nil { if err = d.Set("name", result.Name); err != nil { - return fmt.Errorf("[ERROR] Error setting name: %s", err) + return flex.FmtErrorf("[ERROR] Error setting name: %s", err) } } if result.Description != nil { if err = d.Set("description", result.Description); err != nil { - return fmt.Errorf("[ERROR] Error setting description: %s", err) + return flex.FmtErrorf("[ERROR] Error setting description: %s", err) } } if result.Tags != nil { if err = d.Set("tags", result.Tags); err != nil { - return fmt.Errorf("[ERROR] Error setting tags: %s", err) + return flex.FmtErrorf("[ERROR] Error setting tags: %s", err) } } if result.ColorCode != nil { if err = d.Set("color_code", result.ColorCode); err != nil { - return fmt.Errorf("[ERROR] Error setting color_code: %s", err) + return flex.FmtErrorf("[ERROR] Error setting color_code: %s", err) } } if result.CreatedTime != nil { if err = d.Set("created_time", result.CreatedTime.String()); err != nil { - return fmt.Errorf("[ERROR] Error setting created_time: %s", err) + return flex.FmtErrorf("[ERROR] Error setting created_time: %s", err) } } if result.UpdatedTime != nil { if err = d.Set("updated_time", result.UpdatedTime.String()); err != nil { - return fmt.Errorf("[ERROR] Error setting updated_time: %s", err) + return flex.FmtErrorf("[ERROR] Error setting updated_time: %s", err) } } if result.Href != nil { if err = d.Set("href", result.Href); err != nil { - return fmt.Errorf("[ERROR] Error setting href: %s", err) + return flex.FmtErrorf("[ERROR] Error setting href: %s", err) } } return nil diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_environments.go b/ibm/service/appconfiguration/data_source_ibm_app_config_environments.go index c9b3e238538..d4595a231bc 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_environments.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_environments.go @@ -4,12 +4,12 @@ package appconfiguration import ( - "fmt" "log" "net/url" "reflect" "strconv" + "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/IBM/appconfiguration-go-admin-sdk/appconfigurationv1" @@ -198,7 +198,7 @@ func dataSourceIbmAppConfigEnvironmentsRead(d *schema.ResourceData, meta interfa result, response, err := appconfigClient.ListEnvironments(options) environmentList = result if err != nil { - log.Printf("[DEBUG] ListEnvironments failed %s\n%s", err, response) + log.Printf("[ERROR] Listing Environments failed %s\n%s", err, response) return err } if isLimit { @@ -219,48 +219,48 @@ func dataSourceIbmAppConfigEnvironmentsRead(d *schema.ResourceData, meta interfa if environmentList.Environments != nil { err = d.Set("environments", dataSourceEnvironmentListFlattenEnvironments(environmentList.Environments)) if err != nil { - return fmt.Errorf("[ERROR] Error setting environments %s", err) + return flex.FmtErrorf("[ERROR] Error setting environments %s", err) } } if environmentList.TotalCount != nil { if err = d.Set("total_count", environmentList.TotalCount); err != nil { - return fmt.Errorf("[ERROR] Error setting total_count: %s", err) + return flex.FmtErrorf("[ERROR] Error setting total_count: %s", err) } } if environmentList.Limit != nil { if err = d.Set("limit", environmentList.Limit); err != nil { - return fmt.Errorf("[ERROR] Error setting limit: %s", err) + return flex.FmtErrorf("[ERROR] Error setting limit: %s", err) } } if environmentList.Offset != nil { if err = d.Set("offset", environmentList.Offset); err != nil { - return fmt.Errorf("[ERROR] Error setting offset: %s", err) + return flex.FmtErrorf("[ERROR] Error setting offset: %s", err) } } if environmentList.First != nil { err = d.Set("first", dataSourceEnvironmentListFlattenPagination(*environmentList.First)) if err != nil { - return fmt.Errorf("[ERROR] Error setting first %s", err) + return flex.FmtErrorf("[ERROR] Error setting first %s", err) } } if environmentList.Previous != nil { err = d.Set("previous", dataSourceEnvironmentListFlattenPagination(*environmentList.Previous)) if err != nil { - return fmt.Errorf("[ERROR] Error setting previous %s", err) + return flex.FmtErrorf("[ERROR] Error setting previous %s", err) } } if environmentList.Last != nil { err = d.Set("last", dataSourceEnvironmentListFlattenPagination(*environmentList.Last)) if err != nil { - return fmt.Errorf("[ERROR] Error setting last %s", err) + return flex.FmtErrorf("[ERROR] Error setting last %s", err) } } if environmentList.Next != nil { err = d.Set("next", dataSourceEnvironmentListFlattenPagination(*environmentList.Next)) if err != nil { - return fmt.Errorf("[ERROR] Error setting next %s", err) + return flex.FmtErrorf("[ERROR] Error setting next %s", err) } } diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_feature.go b/ibm/service/appconfiguration/data_source_ibm_app_config_feature.go index 33b996ecb35..69fb10a44e2 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_feature.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_feature.go @@ -8,6 +8,7 @@ import ( "log" "strconv" + "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/IBM/appconfiguration-go-admin-sdk/appconfigurationv1" @@ -186,64 +187,64 @@ func dataSourceIbmAppConfigFeatureRead(d *schema.ResourceData, meta interface{}) result, response, err := appconfigClient.GetFeature(options) if err != nil { - log.Printf("[DEBUG] GetFeature failed %s\n%s", err, response) + log.Printf("[ERROR] GetFeature failed %s\n%s", err, response) return err } d.SetId(fmt.Sprintf("%s/%s/%s", guid, *options.EnvironmentID, *result.FeatureID)) if result.Name != nil { if err = d.Set("name", result.Name); err != nil { - return fmt.Errorf("[ERROR] Error setting name: %s", err) + return flex.FmtErrorf("[ERROR] Error setting name: %s", err) } } if result.Description != nil { if err = d.Set("description", result.Description); err != nil { - return fmt.Errorf("[ERROR] Error setting description: %s", err) + return flex.FmtErrorf("[ERROR] Error setting description: %s", err) } } if result.Type != nil { if err = d.Set("type", result.Type); err != nil { - return fmt.Errorf("[ERROR] Error setting type: %s", err) + return flex.FmtErrorf("[ERROR] Error setting type: %s", err) } } if result.Enabled != nil { if err = d.Set("enabled", result.Enabled); err != nil { - return fmt.Errorf("[ERROR] Error setting enabled: %s", err) + return flex.FmtErrorf("[ERROR] Error setting enabled: %s", err) } } if result.Tags != nil { if err = d.Set("tags", result.Tags); err != nil { - return fmt.Errorf("[ERROR] Error setting tags: %s", err) + return flex.FmtErrorf("[ERROR] Error setting tags: %s", err) } } if result.RolloutPercentage != nil { if err = d.Set("rollout_percentage", result.RolloutPercentage); err != nil { - return fmt.Errorf("[ERROR] Error setting rollout_percentage: %s", err) + return flex.FmtErrorf("[ERROR] Error setting rollout_percentage: %s", err) } } if result.Format != nil { if err = d.Set("format", result.Format); err != nil { - return fmt.Errorf("[ERROR] Error setting format: %s", err) + return flex.FmtErrorf("[ERROR] Error setting format: %s", err) } } if result.SegmentExists != nil { if err = d.Set("segment_exists", result.SegmentExists); err != nil { - return fmt.Errorf("[ERROR] Error setting segment_exists: %s", err) + return flex.FmtErrorf("[ERROR] Error setting segment_exists: %s", err) } } if result.CreatedTime != nil { if err = d.Set("created_time", result.CreatedTime.String()); err != nil { - return fmt.Errorf("[ERROR] Error setting created_time: %s", err) + return flex.FmtErrorf("[ERROR] Error setting created_time: %s", err) } } if result.UpdatedTime != nil { if err = d.Set("updated_time", result.UpdatedTime.String()); err != nil { - return fmt.Errorf("[ERROR] Error setting updated_time: %s", err) + return flex.FmtErrorf("[ERROR] Error setting updated_time: %s", err) } } if result.Href != nil { if err = d.Set("href", result.Href); err != nil { - return fmt.Errorf("[ERROR] Error setting href: %s", err) + return flex.FmtErrorf("[ERROR] Error setting href: %s", err) } } @@ -276,14 +277,14 @@ func dataSourceIbmAppConfigFeatureRead(d *schema.ResourceData, meta interface{}) if result.SegmentRules != nil { err = d.Set("segment_rules", dataSourceFeatureFlattenSegmentRules(result.SegmentRules)) if err != nil { - return fmt.Errorf("[ERROR] Error setting segment_rules %s", err) + return flex.FmtErrorf("[ERROR] Error setting segment_rules %s", err) } } if result.Collections != nil { err = d.Set("collections", dataSourceFeatureFlattenCollections(result.Collections)) if err != nil { - return fmt.Errorf("[ERROR] Error setting collections %s", err) + return flex.FmtErrorf("[ERROR] Error setting collections %s", err) } } return nil diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_features.go b/ibm/service/appconfiguration/data_source_ibm_app_config_features.go index c2894ae7358..b74ad5ba7d4 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_features.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_features.go @@ -10,6 +10,7 @@ import ( "reflect" "strconv" + "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/IBM/appconfiguration-go-admin-sdk/appconfigurationv1" @@ -334,7 +335,7 @@ func dataSourceIbmAppConfigFeaturesRead(d *schema.ResourceData, meta interface{} result, response, err := appconfigClient.ListFeatures(options) featuresList = result if err != nil { - log.Printf("[DEBUG] ListFeatures failed %s\n%s", err, response) + log.Printf("[ERROR] Listing Features failed %s\n%s", err, response) return err } if isLimit { @@ -355,48 +356,48 @@ func dataSourceIbmAppConfigFeaturesRead(d *schema.ResourceData, meta interface{} if featuresList.Features != nil { err = d.Set("features", dataSourceFeaturesListFlattenFeatures(featuresList.Features)) if err != nil { - return fmt.Errorf("[ERROR] Error setting features %s", err) + return flex.FmtErrorf("[ERROR] Error setting features %s", err) } } if featuresList.TotalCount != nil { if err = d.Set("total_count", featuresList.TotalCount); err != nil { - return fmt.Errorf("[ERROR] Error setting total_count: %s", err) + return flex.FmtErrorf("[ERROR] Error setting total_count: %s", err) } } if featuresList.Limit != nil { if err = d.Set("limit", featuresList.Limit); err != nil { - return fmt.Errorf("[ERROR] Error setting limit: %s", err) + return flex.FmtErrorf("[ERROR] Error setting limit: %s", err) } } if featuresList.Offset != nil { if err = d.Set("offset", featuresList.Offset); err != nil { - return fmt.Errorf("[ERROR] Error setting offset: %s", err) + return flex.FmtErrorf("[ERROR] Error setting offset: %s", err) } } if featuresList.First != nil { err = d.Set("first", dataSourceFeatureListFlattenPagination(*featuresList.First)) if err != nil { - return fmt.Errorf("[ERROR] Error setting first %s", err) + return flex.FmtErrorf("[ERROR] Error setting first %s", err) } } if featuresList.Previous != nil { err = d.Set("previous", dataSourceFeatureListFlattenPagination(*featuresList.Previous)) if err != nil { - return fmt.Errorf("[ERROR] Error setting previous %s", err) + return flex.FmtErrorf("[ERROR] Error setting previous %s", err) } } if featuresList.Last != nil { err = d.Set("last", dataSourceFeatureListFlattenPagination(*featuresList.Last)) if err != nil { - return fmt.Errorf("[ERROR] Error setting last %s", err) + return flex.FmtErrorf("[ERROR] Error setting last %s", err) } } if featuresList.Next != nil { err = d.Set("next", dataSourceFeatureListFlattenPagination(*featuresList.Next)) if err != nil { - return fmt.Errorf("[ERROR] Error setting next %s", err) + return flex.FmtErrorf("[ERROR] Error setting next %s", err) } } diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_properties.go b/ibm/service/appconfiguration/data_source_ibm_app_config_properties.go index 3b6a4eede75..d10cdc45cbe 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_properties.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_properties.go @@ -8,6 +8,7 @@ import ( "reflect" "strconv" + "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/IBM/appconfiguration-go-admin-sdk/appconfigurationv1" @@ -204,7 +205,7 @@ func dataSourceIbmAppConfigPropertiesRead(d *schema.ResourceData, meta interface appconfigClient, err := getAppConfigClient(meta, guid) if err != nil { - return fmt.Errorf("getAppConfigClient failed %s", err) + return flex.FmtErrorf("getAppConfigClient failed %s", err) } options := &appconfigurationv1.ListPropertiesOptions{} @@ -261,7 +262,7 @@ func dataSourceIbmAppConfigPropertiesRead(d *schema.ResourceData, meta interface result, response, err := appconfigClient.ListProperties(options) propertiesList = result if err != nil { - return fmt.Errorf("ListProperties failed %s\n%s", err, response) + return flex.FmtErrorf("ListProperties failed %s\n%s", err, response) } if isLimit { offset = 0 @@ -281,22 +282,22 @@ func dataSourceIbmAppConfigPropertiesRead(d *schema.ResourceData, meta interface if propertiesList.Properties != nil { err = d.Set("properties", dataSourcePropertiesListFlattenProperties(propertiesList.Properties)) if err != nil { - return fmt.Errorf("error setting properties %s", err) + return flex.FmtErrorf("error setting properties %s", err) } } if propertiesList.TotalCount != nil { if err = d.Set("total_count", propertiesList.TotalCount); err != nil { - return fmt.Errorf("error setting total_count: %s", err) + return flex.FmtErrorf("error setting total_count: %s", err) } } if propertiesList.Limit != nil { if err = d.Set("limit", propertiesList.Limit); err != nil { - return fmt.Errorf("error setting limit: %s", err) + return flex.FmtErrorf("error setting limit: %s", err) } } if propertiesList.Offset != nil { if err = d.Set("offset", propertiesList.Offset); err != nil { - return fmt.Errorf("error setting offset: %s", err) + return flex.FmtErrorf("error setting offset: %s", err) } } diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_property.go b/ibm/service/appconfiguration/data_source_ibm_app_config_property.go index 00a82d3f95d..5ee2bc82152 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_property.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_property.go @@ -4,6 +4,7 @@ import ( "fmt" "strconv" + "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/IBM/appconfiguration-go-admin-sdk/appconfigurationv1" @@ -148,7 +149,7 @@ func dataSourceIbmAppConfigPropertyRead(d *schema.ResourceData, meta interface{} appconfigClient, err := getAppConfigClient(meta, guid) if err != nil { - return fmt.Errorf("getAppConfigClient failed %s", err) + return flex.FmtErrorf("getAppConfigClient failed %s", err) } options := &appconfigurationv1.GetPropertyOptions{} @@ -163,24 +164,24 @@ func dataSourceIbmAppConfigPropertyRead(d *schema.ResourceData, meta interface{} property, response, err := appconfigClient.GetProperty(options) if err != nil { - return fmt.Errorf("GetProperty failed %s\n%s", err, response) + return flex.FmtErrorf("GetProperty failed %s\n%s", err, response) } d.SetId(fmt.Sprintf("%s/%s/%s", guid, *options.EnvironmentID, *property.PropertyID)) if property.Name != nil { if err = d.Set("name", property.Name); err != nil { - return fmt.Errorf("error setting name: %s", err) + return flex.FmtErrorf("error setting name: %s", err) } } if property.Description != nil { if err = d.Set("description", property.Description); err != nil { - return fmt.Errorf("error setting description: %s", err) + return flex.FmtErrorf("error setting description: %s", err) } } if property.Type != nil { if err = d.Set("type", property.Type); err != nil { - return fmt.Errorf("error setting type: %s", err) + return flex.FmtErrorf("error setting type: %s", err) } } if property.Value != nil { @@ -196,44 +197,44 @@ func dataSourceIbmAppConfigPropertyRead(d *schema.ResourceData, meta interface{} } if property.Tags != nil { if err = d.Set("tags", property.Tags); err != nil { - return fmt.Errorf("error setting tags: %s", err) + return flex.FmtErrorf("error setting tags: %s", err) } } if property.Format != nil { if err = d.Set("format", property.Format); err != nil { - return fmt.Errorf("error setting format: %s", err) + return flex.FmtErrorf("error setting format: %s", err) } } if property.SegmentRules != nil { err = d.Set("segment_rules", dataSourcePropertyFlattenSegmentRules(property.SegmentRules)) if err != nil { - return fmt.Errorf("error setting segment_rules %s", err) + return flex.FmtErrorf("error setting segment_rules %s", err) } } if property.SegmentExists != nil { if err = d.Set("segment_exists", property.SegmentExists); err != nil { - return fmt.Errorf("error setting segment_exists: %s", err) + return flex.FmtErrorf("error setting segment_exists: %s", err) } } if property.Collections != nil { err = d.Set("collections", dataSourcePropertyFlattenCollections(property.Collections)) if err != nil { - return fmt.Errorf("error setting collections %s", err) + return flex.FmtErrorf("error setting collections %s", err) } } if property.CreatedTime != nil { if err = d.Set("created_time", property.CreatedTime.String()); err != nil { - return fmt.Errorf("error setting created_time: %s", err) + return flex.FmtErrorf("error setting created_time: %s", err) } } if property.UpdatedTime != nil { if err = d.Set("updated_time", property.UpdatedTime.String()); err != nil { - return fmt.Errorf("error setting updated_time: %s", err) + return flex.FmtErrorf("error setting updated_time: %s", err) } } if property.Href != nil { if err = d.Set("href", property.Href); err != nil { - return fmt.Errorf("error setting href: %s", err) + return flex.FmtErrorf("error setting href: %s", err) } } return nil diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_segment.go b/ibm/service/appconfiguration/data_source_ibm_app_config_segment.go index 4fec35d5b4d..463a79ed479 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_segment.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_segment.go @@ -4,6 +4,7 @@ import ( "fmt" "log" + "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" "github.com/IBM/appconfiguration-go-admin-sdk/appconfigurationv1" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) @@ -149,7 +150,7 @@ func dataSourceIbmAppConfigSegmentRead(d *schema.ResourceData, meta interface{}) result, response, err := appconfigClient.GetSegment(options) if err != nil { - log.Printf("[DEBUG] GetSegment failed %s\n%s", err, response) + log.Printf("[ERROR] GetSegment failed %s\n%s", err, response) return err } @@ -157,37 +158,37 @@ func dataSourceIbmAppConfigSegmentRead(d *schema.ResourceData, meta interface{}) if result.Name != nil { if err = d.Set("name", result.Name); err != nil { - return fmt.Errorf("[ERROR] Error setting name: %s", err) + return flex.FmtErrorf("[ERROR] Error setting name: %s", err) } } if result.SegmentID != nil { if err = d.Set("segment_id", result.SegmentID); err != nil { - return fmt.Errorf("[ERROR] Error setting segment_id: %s", err) + return flex.FmtErrorf("[ERROR] Error setting segment_id: %s", err) } } if result.Description != nil { if err = d.Set("description", result.Description); err != nil { - return fmt.Errorf("[ERROR] Error setting description: %s", err) + return flex.FmtErrorf("[ERROR] Error setting description: %s", err) } } if result.Tags != nil { if err = d.Set("tags", result.Tags); err != nil { - return fmt.Errorf("[ERROR] Error setting tags: %s", err) + return flex.FmtErrorf("[ERROR] Error setting tags: %s", err) } } if result.CreatedTime != nil { if err = d.Set("created_time", result.CreatedTime.String()); err != nil { - return fmt.Errorf("[ERROR] Error setting created_time: %s", err) + return flex.FmtErrorf("[ERROR] Error setting created_time: %s", err) } } if result.UpdatedTime != nil { if err = d.Set("updated_time", result.UpdatedTime.String()); err != nil { - return fmt.Errorf("[ERROR] Error setting updated_time: %s", err) + return flex.FmtErrorf("[ERROR] Error setting updated_time: %s", err) } } if result.Href != nil { if err = d.Set("href", result.Href); err != nil { - return fmt.Errorf("[ERROR] Error setting href: %s", err) + return flex.FmtErrorf("[ERROR] Error setting href: %s", err) } } if result.Rules != nil { @@ -195,20 +196,20 @@ func dataSourceIbmAppConfigSegmentRead(d *schema.ResourceData, meta interface{}) for _, ruleItem := range result.Rules { rulesList = append(rulesList, dataSourceSegmentListSegmentRulesToMap(ruleItem)) if err = d.Set("rules", rulesList); err != nil { - return fmt.Errorf("[ERROR] Error setting rules %s", err) + return flex.FmtErrorf("[ERROR] Error setting rules %s", err) } } } if result.Features != nil { err = d.Set("features", dataSourceSegmentFlattenFeatures(result.Features)) if err != nil { - return fmt.Errorf("[ERROR] Error setting features %s", err) + return flex.FmtErrorf("[ERROR] Error setting features %s", err) } } if result.Properties != nil { err = d.Set("properties", dataSourceSegmentFlattenProperties(result.Properties)) if err != nil { - return fmt.Errorf("[ERROR] Error setting properties %s", err) + return flex.FmtErrorf("[ERROR] Error setting properties %s", err) } } return nil diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_segments.go b/ibm/service/appconfiguration/data_source_ibm_app_config_segments.go index 0841109389b..35756185fa8 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_segments.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_segments.go @@ -7,6 +7,7 @@ import ( "reflect" "strconv" + "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/IBM/appconfiguration-go-admin-sdk/appconfigurationv1" @@ -175,7 +176,7 @@ func dataSourceIbmAppConfigSegmentsRead(d *schema.ResourceData, meta interface{} appconfigClient, err := getAppConfigClient(meta, guid) if err != nil { - return fmt.Errorf("getAppConfigClient failed %s", err) + return flex.FmtErrorf("getAppConfigClient failed %s", err) } options := &appconfigurationv1.ListSegmentsOptions{} @@ -214,8 +215,8 @@ func dataSourceIbmAppConfigSegmentsRead(d *schema.ResourceData, meta interface{} result, response, err := appconfigClient.ListSegments(options) segmentsList = result if err != nil { - log.Printf("[DEBUG] ListSegments failed %s\n%s", err, response) - return fmt.Errorf("ListSegments failed %s\n%s", err, response) + log.Printf("[ERROR] ListSegments failed %s\n%s", err, response) + return flex.FmtErrorf("ListSegments failed %s\n%s", err, response) } if isLimit { offset = 0 @@ -235,22 +236,22 @@ func dataSourceIbmAppConfigSegmentsRead(d *schema.ResourceData, meta interface{} if segmentsList.Segments != nil { err = d.Set("segments", dataSourceSegmentsListFlattenSegments(segmentsList.Segments)) if err != nil { - return fmt.Errorf("[ERROR] Error setting segments %s", err) + return flex.FmtErrorf("[ERROR] Error setting segments %s", err) } } if segmentsList.Limit != nil { if err = d.Set("limit", segmentsList.Limit); err != nil { - return fmt.Errorf("[ERROR] Error setting limit: %s", err) + return flex.FmtErrorf("[ERROR] Error setting limit: %s", err) } } if segmentsList.Offset != nil { if err = d.Set("offset", segmentsList.Offset); err != nil { - return fmt.Errorf("[ERROR] Error setting offset: %s", err) + return flex.FmtErrorf("[ERROR] Error setting offset: %s", err) } } if segmentsList.TotalCount != nil { if err = d.Set("total_count", segmentsList.TotalCount); err != nil { - return fmt.Errorf("[ERROR] Error setting total_count: %s", err) + return flex.FmtErrorf("[ERROR] Error setting total_count: %s", err) } } return nil diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_snapshots.go b/ibm/service/appconfiguration/data_source_ibm_app_config_snapshots.go index 68c5941df6c..3e402058c3c 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_snapshots.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_snapshots.go @@ -6,6 +6,7 @@ import ( "reflect" "strconv" + "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/IBM/appconfiguration-go-admin-sdk/appconfigurationv1" @@ -152,7 +153,7 @@ func dataSourceIbmAppConfigSnapshotsRead(d *schema.ResourceData, meta interface{ appconfigClient, err := getAppConfigClient(meta, guid) if err != nil { - return fmt.Errorf("getAppConfigClient failed %s", err) + return flex.FmtErrorf("getAppConfigClient failed %s", err) } options := &appconfigurationv1.ListSnapshotsOptions{} @@ -191,7 +192,7 @@ func dataSourceIbmAppConfigSnapshotsRead(d *schema.ResourceData, meta interface{ result, response, err := appconfigClient.ListSnapshots(options) shapshotsList = result if err != nil { - return fmt.Errorf("ListSnapshots failed %s\n%s", err, response) + return flex.FmtErrorf("ListSnapshots failed %s\n%s", err, response) } if isLimit { offset = 0 @@ -211,22 +212,22 @@ func dataSourceIbmAppConfigSnapshotsRead(d *schema.ResourceData, meta interface{ if shapshotsList.Snapshot != nil { err = d.Set("git_config", dataSourceFeaturesListFlattenSnapshots(shapshotsList.Snapshot)) if err != nil { - return fmt.Errorf("[ERROR] Error setting git_config %s", err) + return flex.FmtErrorf("[ERROR] Error setting git_config %s", err) } } if shapshotsList.TotalCount != nil { if err = d.Set("total_count", shapshotsList.TotalCount); err != nil { - return fmt.Errorf("[ERROR] Error setting total_count: %s", err) + return flex.FmtErrorf("[ERROR] Error setting total_count: %s", err) } } if shapshotsList.Limit != nil { if err = d.Set("limit", shapshotsList.Limit); err != nil { - return fmt.Errorf("[ERROR] Error setting limit: %s", err) + return flex.FmtErrorf("[ERROR] Error setting limit: %s", err) } } if shapshotsList.Offset != nil { if err = d.Set("offset", shapshotsList.Offset); err != nil { - return fmt.Errorf("[ERROR] Error setting offset: %s", err) + return flex.FmtErrorf("[ERROR] Error setting offset: %s", err) } } diff --git a/ibm/service/appconfiguration/resource_ibm_app_config_collection.go b/ibm/service/appconfiguration/resource_ibm_app_config_collection.go index e80601edbc1..a967fe44f99 100644 --- a/ibm/service/appconfiguration/resource_ibm_app_config_collection.go +++ b/ibm/service/appconfiguration/resource_ibm_app_config_collection.go @@ -77,7 +77,7 @@ func resourceIbmIbmAppConfigCollectiontCreate(d *schema.ResourceData, meta inter guid := d.Get("guid").(string) appconfigClient, err := getAppConfigClient(meta, guid) if err != nil { - return fmt.Errorf("getAppConfigClient failed %s", err) + return flex.FmtErrorf("getAppConfigClient failed %s", err) } options := &appconfigurationv1.CreateCollectionOptions{} options.SetName(d.Get("name").(string)) @@ -93,7 +93,7 @@ func resourceIbmIbmAppConfigCollectiontCreate(d *schema.ResourceData, meta inter collection, response, err := appconfigClient.CreateCollection(options) if err != nil { - return fmt.Errorf("CreateCollection failed %s\n%s", err, response) + return flex.FmtErrorf("CreateCollection failed %s\n%s", err, response) } d.SetId(fmt.Sprintf("%s/%s", guid, *collection.CollectionID)) @@ -106,12 +106,12 @@ func resourceIbmIbmAppConfigCollectiontRead(d *schema.ResourceData, meta interfa return nil } if len(parts) != 2 { - return fmt.Errorf("Kindly check the id") + return flex.FmtErrorf("Kindly check the id") } appconfigClient, err := getAppConfigClient(meta, parts[0]) if err != nil { - return fmt.Errorf("getAppConfigClient failed %s", err) + return flex.FmtErrorf("getAppConfigClient failed %s", err) } options := &appconfigurationv1.GetCollectionOptions{} @@ -122,71 +122,71 @@ func resourceIbmIbmAppConfigCollectiontRead(d *schema.ResourceData, meta interfa if response != nil && response.StatusCode == 404 { d.SetId("") } - return fmt.Errorf("[DEBUG] GetCollection failed %s\n%s", err, response) + return flex.FmtErrorf("[ERROR] GetCollection failed %s\n%s", err, response) } d.Set("guid", parts[0]) if result.Name != nil { if err = d.Set("name", result.Name); err != nil { - return fmt.Errorf("[ERROR] Error setting name: %s", err) + return flex.FmtErrorf("[ERROR] Error setting name: %s", err) } } if result.CollectionID != nil { if err = d.Set("collection_id", result.CollectionID); err != nil { - return fmt.Errorf("[ERROR] Error setting collection_id: %s", err) + return flex.FmtErrorf("[ERROR] Error setting collection_id: %s", err) } } if result.Description != nil { if err = d.Set("description", result.Description); err != nil { - return fmt.Errorf("[ERROR] Error setting description: %s", err) + return flex.FmtErrorf("[ERROR] Error setting description: %s", err) } } if result.Tags != nil { if err = d.Set("tags", result.Tags); err != nil { - return fmt.Errorf("[ERROR] Error setting tags: %s", err) + return flex.FmtErrorf("[ERROR] Error setting tags: %s", err) } } if result.CreatedTime != nil { if err = d.Set("created_time", result.CreatedTime.String()); err != nil { - return fmt.Errorf("[ERROR] Error setting createdTime: %s", err) + return flex.FmtErrorf("[ERROR] Error setting createdTime: %s", err) } } if result.UpdatedTime != nil { if err = d.Set("updated_time", result.UpdatedTime.String()); err != nil { - return fmt.Errorf("[ERROR] Error setting updatedTime: %s", err) + return flex.FmtErrorf("[ERROR] Error setting updatedTime: %s", err) } } if result.Href != nil { if err = d.Set("href", result.Href); err != nil { - return fmt.Errorf("[ERROR] Error setting href: %s", err) + return flex.FmtErrorf("[ERROR] Error setting href: %s", err) } } if result.FeaturesCount != nil { if err = d.Set("features_count", result.FeaturesCount); err != nil { - return fmt.Errorf("[ERROR] Error setting features_count: %s", err) + return flex.FmtErrorf("[ERROR] Error setting features_count: %s", err) } } if result.FeaturesCount != nil { if err = d.Set("features_count", result.FeaturesCount); err != nil { - return fmt.Errorf("[ERROR] Error setting features_count: %s", err) + return flex.FmtErrorf("[ERROR] Error setting features_count: %s", err) } } if result.PropertiesCount != nil { if err = d.Set("properties_count", result.PropertiesCount); err != nil { - return fmt.Errorf("[ERROR] Error setting properties_count: %s", err) + return flex.FmtErrorf("[ERROR] Error setting properties_count: %s", err) } } if result.Features != nil { err = d.Set("features", resourceIbmAppConfigCollectionFeatureToMap(result.Features)) if err != nil { - return fmt.Errorf("[ERROR] Error setting features %s", err) + return flex.FmtErrorf("[ERROR] Error setting features %s", err) } } if result.Properties != nil { err = d.Set("properties", resourceIbmAppConfigCollectionPropertiesToMap(result.Properties)) if err != nil { - return fmt.Errorf("[ERROR] Error setting properties %s", err) + return flex.FmtErrorf("[ERROR] Error setting properties %s", err) } } @@ -238,7 +238,7 @@ func resourceIbmIbmAppConfigCollectionUpdate(d *schema.ResourceData, meta interf } appconfigClient, err := getAppConfigClient(meta, parts[0]) if err != nil { - return fmt.Errorf("getAppConfigClient failed %s", err) + return flex.FmtErrorf("getAppConfigClient failed %s", err) } options := &appconfigurationv1.UpdateCollectionOptions{} @@ -258,7 +258,7 @@ func resourceIbmIbmAppConfigCollectionUpdate(d *schema.ResourceData, meta interf _, response, err := appconfigClient.UpdateCollection(options) if err != nil { - return fmt.Errorf("UpdateCollection failed %s\n%s", err, response) + return flex.FmtErrorf("UpdateCollection failed %s\n%s", err, response) } return resourceIbmIbmAppConfigCollectiontRead(d, meta) } @@ -272,7 +272,7 @@ func resourceIbmIbmAppConfigCollectionDelete(d *schema.ResourceData, meta interf } appconfigClient, err := getAppConfigClient(meta, parts[0]) if err != nil { - return fmt.Errorf("getAppConfigClient failed %s", err) + return flex.FmtErrorf("getAppConfigClient failed %s", err) } options := &appconfigurationv1.DeleteCollectionOptions{} @@ -284,7 +284,7 @@ func resourceIbmIbmAppConfigCollectionDelete(d *schema.ResourceData, meta interf d.SetId("") return nil } - return fmt.Errorf("[DEBUG] DeleteCollection failed %s\n%s", err, response) + return flex.FmtErrorf("[ERROR] DeleteCollection failed %s\n%s", err, response) } d.SetId("") diff --git a/ibm/service/appconfiguration/resource_ibm_app_config_environment.go b/ibm/service/appconfiguration/resource_ibm_app_config_environment.go index 5ca709a6ec0..98e9d4e619d 100644 --- a/ibm/service/appconfiguration/resource_ibm_app_config_environment.go +++ b/ibm/service/appconfiguration/resource_ibm_app_config_environment.go @@ -108,7 +108,7 @@ func resourceEnvironmentCreate(d *schema.ResourceData, meta interface{}) error { _, response, err := appconfigClient.CreateEnvironment(options) if err != nil { - return fmt.Errorf("[DEBUG] CreateEnvironment failed %s\n%s", err, response) + return flex.FmtErrorf("[ERROR] CreateEnvironment failed %s\n%s", err, response) } d.SetId(fmt.Sprintf("%s/%s", guid, *options.EnvironmentID)) @@ -142,7 +142,7 @@ func resourceEnvironmentUpdate(d *schema.ResourceData, meta interface{}) error { _, response, err := appconfigClient.UpdateEnvironment(options) if err != nil { - return fmt.Errorf("[DEBUG] UpdateEnvironment failed %s\n%s", err, response) + return flex.FmtErrorf("[ERROR] UpdateEnvironment failed %s\n%s", err, response) } return resourceEnvironmentRead(d, meta) } @@ -167,47 +167,47 @@ func resourceEnvironmentRead(d *schema.ResourceData, meta interface{}) error { result, response, err := appconfigClient.GetEnvironment(options) if err != nil { - return fmt.Errorf("[DEBUG] GetEnvironment failed %s\n%s", err, response) + return flex.FmtErrorf("[ERROR] GetEnvironment failed %s\n%s", err, response) } d.Set("guid", parts[0]) if result.Name != nil { if err = d.Set("name", result.Name); err != nil { - return fmt.Errorf("[ERROR] Error setting name: %s", err) + return flex.FmtErrorf("[ERROR] Error setting name: %s", err) } } if result.EnvironmentID != nil { if err = d.Set("environment_id", result.EnvironmentID); err != nil { - return fmt.Errorf("[ERROR] Error setting environment_id: %s", err) + return flex.FmtErrorf("[ERROR] Error setting environment_id: %s", err) } } if result.Description != nil { if err = d.Set("description", result.Description); err != nil { - return fmt.Errorf("[ERROR] Error setting description: %s", err) + return flex.FmtErrorf("[ERROR] Error setting description: %s", err) } } if result.Tags != nil { if err = d.Set("tags", result.Tags); err != nil { - return fmt.Errorf("[ERROR] Error setting tags: %s", err) + return flex.FmtErrorf("[ERROR] Error setting tags: %s", err) } } if result.ColorCode != nil { if err = d.Set("color_code", result.ColorCode); err != nil { - return fmt.Errorf("[ERROR] Error setting color_code: %s", err) + return flex.FmtErrorf("[ERROR] Error setting color_code: %s", err) } } if result.CreatedTime != nil { if err = d.Set("created_time", result.CreatedTime.String()); err != nil { - return fmt.Errorf("[ERROR] Error setting created_time: %s", err) + return flex.FmtErrorf("[ERROR] Error setting created_time: %s", err) } } if result.UpdatedTime != nil { if err = d.Set("updated_time", result.UpdatedTime.String()); err != nil { - return fmt.Errorf("[ERROR] Error setting updated_time: %s", err) + return flex.FmtErrorf("[ERROR] Error setting updated_time: %s", err) } } if result.Href != nil { if err = d.Set("href", result.Href); err != nil { - return fmt.Errorf("[ERROR] Error setting href: %s", err) + return flex.FmtErrorf("[ERROR] Error setting href: %s", err) } } return nil @@ -234,7 +234,7 @@ func resourceEnvironmentDelete(d *schema.ResourceData, meta interface{}) error { d.SetId("") return nil } - return fmt.Errorf("[DEBUG] DeleteEnvironment failed %s\n%s", err, response) + return flex.FmtErrorf("[ERROR] DeleteEnvironment failed %s\n%s", err, response) } d.SetId("") return nil diff --git a/ibm/service/appconfiguration/resource_ibm_app_config_feature.go b/ibm/service/appconfiguration/resource_ibm_app_config_feature.go index 67e93c1a190..f4edc90c948 100644 --- a/ibm/service/appconfiguration/resource_ibm_app_config_feature.go +++ b/ibm/service/appconfiguration/resource_ibm_app_config_feature.go @@ -273,7 +273,7 @@ func resourceIbmIbmAppConfigFeatureUpdate(d *schema.ResourceData, meta interface _, response, err := appconfigClient.UpdateFeature(options) if err != nil { - log.Printf("[DEBUG] UpdateFeature %s\n%s", err, response) + log.Printf("[ERROR] UpdateFeature %s\n%s", err, response) return err } return resourceIbmIbmAppConfigFeatureRead(d, meta) @@ -297,45 +297,45 @@ func resourceIbmIbmAppConfigFeatureRead(d *schema.ResourceData, meta interface{} result, response, err := appconfigClient.GetFeature(options) if err != nil { - return fmt.Errorf("[DEBUG] GetFeature failed %s\n%s", err, response) + return flex.FmtErrorf("[ERROR] GetFeature failed %s\n%s", err, response) } d.Set("guid", parts[0]) d.Set("environment_id", parts[1]) if result.Name != nil { if err = d.Set("name", result.Name); err != nil { - return fmt.Errorf("[ERROR] Error setting name: %s", err) + return flex.FmtErrorf("[ERROR] Error setting name: %s", err) } } if result.FeatureID != nil { if err = d.Set("feature_id", result.FeatureID); err != nil { - return fmt.Errorf("[ERROR] Error setting feature_id: %s", err) + return flex.FmtErrorf("[ERROR] Error setting feature_id: %s", err) } } if result.Type != nil { if err = d.Set("type", result.Type); err != nil { - return fmt.Errorf("[ERROR] Error setting type: %s", err) + return flex.FmtErrorf("[ERROR] Error setting type: %s", err) } } if result.Description != nil { if err = d.Set("description", result.Description); err != nil { - return fmt.Errorf("[ERROR] Error setting description: %s", err) + return flex.FmtErrorf("[ERROR] Error setting description: %s", err) } } if result.RolloutPercentage != nil { if err = d.Set("rollout_percentage", result.RolloutPercentage); err != nil { - return fmt.Errorf("[ERROR] Error setting rollout_percentage: %s", err) + return flex.FmtErrorf("[ERROR] Error setting rollout_percentage: %s", err) } } if result.Format != nil { if err = d.Set("format", result.Format); err != nil { - return fmt.Errorf("[ERROR] Error setting format: %s", err) + return flex.FmtErrorf("[ERROR] Error setting format: %s", err) } } if result.Tags != nil { if err = d.Set("tags", result.Tags); err != nil { - return fmt.Errorf("[ERROR] Error setting tags: %s", err) + return flex.FmtErrorf("[ERROR] Error setting tags: %s", err) } } @@ -346,7 +346,7 @@ func resourceIbmIbmAppConfigFeatureRead(d *schema.ResourceData, meta interface{} segmentRules = append(segmentRules, segmentRulesItemMap) } if err = d.Set("segment_rules", segmentRules); err != nil { - return fmt.Errorf("[ERROR] Error setting segment_rules: %s", err) + return flex.FmtErrorf("[ERROR] Error setting segment_rules: %s", err) } } if result.Collections != nil { @@ -356,32 +356,32 @@ func resourceIbmIbmAppConfigFeatureRead(d *schema.ResourceData, meta interface{} collections = append(collections, collectionsItemMap) } if err = d.Set("collections", collections); err != nil { - return fmt.Errorf("[ERROR] Error setting collections: %s", err) + return flex.FmtErrorf("[ERROR] Error setting collections: %s", err) } } if result.SegmentExists != nil { if err = d.Set("segment_exists", result.SegmentExists); err != nil { - return fmt.Errorf("[ERROR] Error setting segment_exists: %s", err) + return flex.FmtErrorf("[ERROR] Error setting segment_exists: %s", err) } } if result.CreatedTime != nil { if err = d.Set("created_time", result.CreatedTime.String()); err != nil { - return fmt.Errorf("[ERROR] Error setting created_time: %s", err) + return flex.FmtErrorf("[ERROR] Error setting created_time: %s", err) } } if result.UpdatedTime != nil { if err = d.Set("updated_time", result.UpdatedTime.String()); err != nil { - return fmt.Errorf("[ERROR] Error setting updated_time: %s", err) + return flex.FmtErrorf("[ERROR] Error setting updated_time: %s", err) } } if result.Href != nil { if err = d.Set("href", result.Href); err != nil { - return fmt.Errorf("[ERROR] Error setting href: %s", err) + return flex.FmtErrorf("[ERROR] Error setting href: %s", err) } } if result.Enabled != nil { if err = d.Set("enabled", result.Enabled); err != nil { - return fmt.Errorf("[ERROR] Error setting enabled: %s", err) + return flex.FmtErrorf("[ERROR] Error setting enabled: %s", err) } } @@ -433,7 +433,7 @@ func resourceIbmIbmAppConfigFeatureDelete(d *schema.ResourceData, meta interface d.SetId("") return nil } - return fmt.Errorf("[DEBUG] DeleteFeature failed %s\n%s", err, response) + return flex.FmtErrorf("[ERROR] DeleteFeature failed %s\n%s", err, response) } d.SetId("") @@ -519,7 +519,7 @@ func resourceIbmAppConfigFeatureMapToSegmentRule(d *schema.ResourceData, segment case "NUMERIC": v, err := strconv.ParseFloat(ruleValue, 64) if err != nil { - return segmentRule, fmt.Errorf("'value' parameter in 'segment_rules' has wrong value: %s", err) + return segmentRule, flex.FmtErrorf("'value' parameter in 'segment_rules' has wrong value: %s", err) } segmentRule.Value = v case "BOOLEAN": @@ -528,7 +528,7 @@ func resourceIbmAppConfigFeatureMapToSegmentRule(d *schema.ResourceData, segment } else if ruleValue == "true" { segmentRule.Value = true } else { - return segmentRule, fmt.Errorf("'value' parameter in 'segment_rules' has wrong value") + return segmentRule, flex.FmtErrorf("'value' parameter in 'segment_rules' has wrong value") } } diff --git a/ibm/service/appconfiguration/resource_ibm_app_config_property.go b/ibm/service/appconfiguration/resource_ibm_app_config_property.go index 9b36cbbd198..5d6c5c11823 100644 --- a/ibm/service/appconfiguration/resource_ibm_app_config_property.go +++ b/ibm/service/appconfiguration/resource_ibm_app_config_property.go @@ -150,7 +150,7 @@ func resourceIbmIbmAppConfigPropertyCreate(d *schema.ResourceData, meta interfac guid := d.Get("guid").(string) appconfigClient, err := getAppConfigClient(meta, guid) if err != nil { - return fmt.Errorf("getAppConfigClient failed %s", err) + return flex.FmtErrorf("getAppConfigClient failed %s", err) } options := &appconfigurationv1.CreatePropertyOptions{} @@ -194,7 +194,7 @@ func resourceIbmIbmAppConfigPropertyCreate(d *schema.ResourceData, meta interfac result, response, err := appconfigClient.CreateProperty(options) if err != nil { - return fmt.Errorf("CreateProperty failed %s\n%s", err, response) + return flex.FmtErrorf("CreateProperty failed %s\n%s", err, response) } d.SetId(fmt.Sprintf("%s/%s/%s", guid, *options.EnvironmentID, *result.PropertyID)) @@ -208,12 +208,12 @@ func resourceIbmIbmAppConfigPropertyRead(d *schema.ResourceData, meta interface{ return nil } if len(parts) != 3 { - return fmt.Errorf("Kindly check the id") + return flex.FmtErrorf("Kindly check the id") } appconfigClient, err := getAppConfigClient(meta, parts[0]) if err != nil { - return fmt.Errorf("getAppConfigClient failed %s", err) + return flex.FmtErrorf("getAppConfigClient failed %s", err) } options := &appconfigurationv1.GetPropertyOptions{} @@ -226,7 +226,7 @@ func resourceIbmIbmAppConfigPropertyRead(d *schema.ResourceData, meta interface{ if response != nil && response.StatusCode == 404 { d.SetId("") } - return fmt.Errorf("[DEBUG] GetProperty failed %s\n%s", err, response) + return flex.FmtErrorf("[ERROR] GetProperty failed %s\n%s", err, response) } d.Set("guid", parts[0]) @@ -234,17 +234,17 @@ func resourceIbmIbmAppConfigPropertyRead(d *schema.ResourceData, meta interface{ if result.Name != nil { if err = d.Set("name", result.Name); err != nil { - return fmt.Errorf("error setting name: %s", err) + return flex.FmtErrorf("error setting name: %s", err) } } if result.PropertyID != nil { if err = d.Set("property_id", result.PropertyID); err != nil { - return fmt.Errorf("error setting property_id: %s", err) + return flex.FmtErrorf("error setting property_id: %s", err) } } if result.Type != nil { if err = d.Set("type", result.Type); err != nil { - return fmt.Errorf("error setting type: %s", err) + return flex.FmtErrorf("error setting type: %s", err) } } if result.Value != nil { @@ -260,32 +260,32 @@ func resourceIbmIbmAppConfigPropertyRead(d *schema.ResourceData, meta interface{ } if result.Description != nil { if err = d.Set("description", result.Description); err != nil { - return fmt.Errorf("error setting description: %s", err) + return flex.FmtErrorf("error setting description: %s", err) } } if result.Tags != nil { if err = d.Set("tags", result.Tags); err != nil { - return fmt.Errorf("error setting tags: %s", err) + return flex.FmtErrorf("error setting tags: %s", err) } } if result.SegmentExists != nil { if err = d.Set("segment_exists", result.SegmentExists); err != nil { - return fmt.Errorf("error setting segment_exists: %s", err) + return flex.FmtErrorf("error setting segment_exists: %s", err) } } if result.CreatedTime != nil { if err = d.Set("created_time", result.CreatedTime.String()); err != nil { - return fmt.Errorf("error setting created_time: %s", err) + return flex.FmtErrorf("error setting created_time: %s", err) } } if result.UpdatedTime != nil { if err = d.Set("updated_time", result.UpdatedTime.String()); err != nil { - return fmt.Errorf("error setting updated_time: %s", err) + return flex.FmtErrorf("error setting updated_time: %s", err) } } if result.Href != nil { if err = d.Set("href", result.Href); err != nil { - return fmt.Errorf("error setting href: %s", err) + return flex.FmtErrorf("error setting href: %s", err) } } @@ -296,7 +296,7 @@ func resourceIbmIbmAppConfigPropertyRead(d *schema.ResourceData, meta interface{ segmentRules = append(segmentRules, segmentRulesItemMap) } if err = d.Set("segment_rules", segmentRules); err != nil { - return fmt.Errorf("[ERROR] Error setting segment_rules: %s", err) + return flex.FmtErrorf("[ERROR] Error setting segment_rules: %s", err) } } if result.Collections != nil { @@ -306,7 +306,7 @@ func resourceIbmIbmAppConfigPropertyRead(d *schema.ResourceData, meta interface{ collections = append(collections, collectionsItemMap) } if err = d.Set("collections", collections); err != nil { - return fmt.Errorf("[ERROR] Error setting collections: %s", err) + return flex.FmtErrorf("[ERROR] Error setting collections: %s", err) } } return nil @@ -320,7 +320,7 @@ func resourceIbmIbmAppConfigPropertyUpdate(d *schema.ResourceData, meta interfac } appconfigClient, err := getAppConfigClient(meta, parts[0]) if err != nil { - return fmt.Errorf("getAppConfigClient failed %s", err) + return flex.FmtErrorf("getAppConfigClient failed %s", err) } options := &appconfigurationv1.UpdatePropertyOptions{} @@ -359,7 +359,7 @@ func resourceIbmIbmAppConfigPropertyUpdate(d *schema.ResourceData, meta interfac } _, response, err := appconfigClient.UpdateProperty(options) if err != nil { - return fmt.Errorf("UpdateProperty failed %s\n%s", err, response) + return flex.FmtErrorf("UpdateProperty failed %s\n%s", err, response) } return resourceIbmIbmAppConfigPropertyRead(d, meta) @@ -374,7 +374,7 @@ func resourceIbmIbmAppConfigPropertyDelete(d *schema.ResourceData, meta interfac } appconfigClient, err := getAppConfigClient(meta, parts[0]) if err != nil { - return fmt.Errorf("getAppConfigClient failed %s", err) + return flex.FmtErrorf("getAppConfigClient failed %s", err) } options := &appconfigurationv1.DeletePropertyOptions{} @@ -388,7 +388,7 @@ func resourceIbmIbmAppConfigPropertyDelete(d *schema.ResourceData, meta interfac d.SetId("") return nil } - log.Printf("[DEBUG] DeleteProperty failed %s\n%s", err, response) + log.Printf("[ERROR] DeleteProperty failed %s\n%s", err, response) return err } @@ -421,7 +421,7 @@ func resourceIbmAppConfigPropertyMapToSegmentRule(d *schema.ResourceData, segmen case "NUMERIC": v, err := strconv.ParseFloat(ruleValue, 64) if err != nil { - return segmentRule, fmt.Errorf("'value' parameter in 'segment_rules' has wrong value: %s", err) + return segmentRule, flex.FmtErrorf("'value' parameter in 'segment_rules' has wrong value: %s", err) } segmentRule.Value = v case "BOOLEAN": @@ -430,7 +430,7 @@ func resourceIbmAppConfigPropertyMapToSegmentRule(d *schema.ResourceData, segmen } else if ruleValue == "true" { segmentRule.Value = true } else { - return segmentRule, fmt.Errorf("'value' parameter in 'segment_rules' has wrong value") + return segmentRule, flex.FmtErrorf("'value' parameter in 'segment_rules' has wrong value") } } diff --git a/ibm/service/appconfiguration/resource_ibm_app_config_segment.go b/ibm/service/appconfiguration/resource_ibm_app_config_segment.go index d0ddb44b027..eabdd7d657b 100644 --- a/ibm/service/appconfiguration/resource_ibm_app_config_segment.go +++ b/ibm/service/appconfiguration/resource_ibm_app_config_segment.go @@ -123,7 +123,7 @@ func resourceIbmIbmAppConfigSegmentCreate(d *schema.ResourceData, meta interface if err != nil { log.Printf("CreateSegment failed %s\n%s", err, response) - return fmt.Errorf("CreateSegment failed %s\n%s", err, response) + return flex.FmtErrorf("CreateSegment failed %s\n%s", err, response) } d.SetId(fmt.Sprintf("%s/%s", guid, *segment.SegmentID)) return resourceIbmIbmAppConfigSegmentRead(d, meta) @@ -148,7 +148,7 @@ func resourceIbmIbmAppConfigSegmentRead(d *schema.ResourceData, meta interface{} return nil } if len(parts) != 2 { - return fmt.Errorf("Kindly check the id") + return flex.FmtErrorf("Kindly check the id") } appconfigClient, err := getAppConfigClient(meta, parts[0]) @@ -164,44 +164,44 @@ func resourceIbmIbmAppConfigSegmentRead(d *schema.ResourceData, meta interface{} if response != nil && response.StatusCode == 404 { d.SetId("") } - return fmt.Errorf("[DEBUG] GetSegment failed %s\n%s", err, response) + return flex.FmtErrorf("[ERROR] GetSegment failed %s\n%s", err, response) } d.Set("guid", parts[0]) if result.Name != nil { if err = d.Set("name", result.Name); err != nil { - return fmt.Errorf("[ERROR] Error setting name: %s", err) + return flex.FmtErrorf("[ERROR] Error setting name: %s", err) } } if result.SegmentID != nil { if err = d.Set("segment_id", result.SegmentID); err != nil { - return fmt.Errorf("[ERROR] Error setting segment_id: %s", err) + return flex.FmtErrorf("[ERROR] Error setting segment_id: %s", err) } } if result.Description != nil { if err = d.Set("description", result.Description); err != nil { - return fmt.Errorf("[ERROR] Error setting description: %s", err) + return flex.FmtErrorf("[ERROR] Error setting description: %s", err) } } if result.Tags != nil { if err = d.Set("tags", result.Tags); err != nil { - return fmt.Errorf("[ERROR] Error setting tags: %s", err) + return flex.FmtErrorf("[ERROR] Error setting tags: %s", err) } } if result.CreatedTime != nil { if err = d.Set("created_time", result.CreatedTime.String()); err != nil { - return fmt.Errorf("[ERROR] Error setting createdTime: %s", err) + return flex.FmtErrorf("[ERROR] Error setting createdTime: %s", err) } } if result.UpdatedTime != nil { if err = d.Set("updated_time", result.UpdatedTime.String()); err != nil { - return fmt.Errorf("[ERROR] Error setting updatedTime: %s", err) + return flex.FmtErrorf("[ERROR] Error setting updatedTime: %s", err) } } if result.Href != nil { if err = d.Set("href", result.Href); err != nil { - return fmt.Errorf("[ERROR] Error setting href: %s", err) + return flex.FmtErrorf("[ERROR] Error setting href: %s", err) } } if result.Rules != nil { @@ -211,19 +211,19 @@ func resourceIbmIbmAppConfigSegmentRead(d *schema.ResourceData, meta interface{} segmentRules = append(segmentRules, segmentRulesItemMap) } if err = d.Set("rules", segmentRules); err != nil { - return fmt.Errorf("[ERROR] Error setting segment_rules: %s", err) + return flex.FmtErrorf("[ERROR] Error setting segment_rules: %s", err) } } if result.Features != nil { err = d.Set("features", resourceIbmAppConfigSegmentFeatureToMap(result.Features)) if err != nil { - return fmt.Errorf("[ERROR] Error setting features %s", err) + return flex.FmtErrorf("[ERROR] Error setting features %s", err) } } if result.Properties != nil { err = d.Set("properties", resourceIbmAppConfigSegmentPropertiesToMap(result.Properties)) if err != nil { - return fmt.Errorf("[ERROR] Error setting properties %s", err) + return flex.FmtErrorf("[ERROR] Error setting properties %s", err) } } return nil @@ -268,7 +268,7 @@ func resourceIbmIbmAppConfigSegmentUpdate(d *schema.ResourceData, meta interface _, response, err := appconfigClient.UpdateSegment(options) if err != nil { - log.Printf("[DEBUG] UpdateSegment %s\n%s", err, response) + log.Printf("[ERROR] UpdateSegment %s\n%s", err, response) return err } return resourceIbmIbmAppConfigSegmentRead(d, meta) @@ -295,7 +295,7 @@ func resourceIbmIbmAppConfigSegmentDelete(d *schema.ResourceData, meta interface d.SetId("") return nil } - return fmt.Errorf("[DEBUG] DeleteSegment failed %s\n%s", err, response) + return flex.FmtErrorf("[ERROR] DeleteSegment failed %s\n%s", err, response) } d.SetId("") diff --git a/ibm/service/appconfiguration/resource_ibm_app_config_snapshot.go b/ibm/service/appconfiguration/resource_ibm_app_config_snapshot.go index 13bb876a3b2..d8b83f6ee78 100644 --- a/ibm/service/appconfiguration/resource_ibm_app_config_snapshot.go +++ b/ibm/service/appconfiguration/resource_ibm_app_config_snapshot.go @@ -155,7 +155,7 @@ func resourceIbmIbmAppConfigSnapshotCreate(d *schema.ResourceData, meta interfac snapshot, response, err := appconfigClient.CreateGitconfig(options) if err != nil { - return fmt.Errorf("CreateGitconfig failed %s\n%s", err, response) + return flex.FmtErrorf("CreateGitconfig failed %s\n%s", err, response) } d.SetId(fmt.Sprintf("%s/%s", guid, *snapshot.GitConfigID)) return resourceIbmIbmAppConfigSnapshotRead(d, meta) @@ -176,7 +176,7 @@ func resourceIbmIbmAppConfigSnapshotUpdate(d *schema.ResourceData, meta interfac option.SetGitConfigID(parts[1]) _, response, err := appconfigClient.PromoteGitconfig(option) if err != nil { - log.Printf("[DEBUG] PromoteGitconfig %s\n%s", err, response) + log.Printf("[ERROR] PromoteGitconfig %s\n%s", err, response) return err } return resourceIbmIbmAppConfigSnapshotRead(d, meta) @@ -207,7 +207,7 @@ func resourceIbmIbmAppConfigSnapshotUpdate(d *schema.ResourceData, meta interfac } _, response, err := appconfigClient.UpdateGitconfig(options) if err != nil { - log.Printf("[DEBUG] UpdateGitconfig %s\n%s", err, response) + log.Printf("[ERROR] UpdateGitconfig %s\n%s", err, response) return err } return resourceIbmIbmAppConfigSnapshotRead(d, meta) @@ -226,7 +226,7 @@ func resourceIbmIbmAppConfigSnapshotRead(d *schema.ResourceData, meta interface{ return err } if len(parts) != 2 { - return fmt.Errorf("Kindly check the id") + return flex.FmtErrorf("Kindly check the id") } options := &appconfigurationv1.GetGitconfigOptions{} @@ -234,49 +234,49 @@ func resourceIbmIbmAppConfigSnapshotRead(d *schema.ResourceData, meta interface{ result, response, err := appconfigClient.GetGitconfig(options) if err != nil { - return fmt.Errorf("[DEBUG] GetGitconfigs failed %s\n%s", err, response) + return flex.FmtErrorf("[ERROR] GetGitconfigs failed %s\n%s", err, response) } d.Set("guid", parts[0]) d.Set("git_config_id", parts[1]) if result.GitConfigName != nil { if err = d.Set("git_config_name", result.GitConfigName); err != nil { - return fmt.Errorf("[ERROR] Error setting git_config_name: %s", err) + return flex.FmtErrorf("[ERROR] Error setting git_config_name: %s", err) } } if result.GitConfigID != nil { if err = d.Set("git_config_id", result.GitConfigID); err != nil { - return fmt.Errorf("[ERROR] Error setting git_config_id: %s", err) + return flex.FmtErrorf("[ERROR] Error setting git_config_id: %s", err) } } if result.GitURL != nil { if err = d.Set("git_url", result.GitURL); err != nil { - return fmt.Errorf("[ERROR] Error setting git_url: %s", err) + return flex.FmtErrorf("[ERROR] Error setting git_url: %s", err) } } if result.GitBranch != nil { if err = d.Set("git_branch", result.GitBranch); err != nil { - return fmt.Errorf("[ERROR] Error setting git_branch: %s", err) + return flex.FmtErrorf("[ERROR] Error setting git_branch: %s", err) } } if result.GitFilePath != nil { if err = d.Set("git_file_path", result.GitFilePath); err != nil { - return fmt.Errorf("[ERROR] Error setting git_file_path: %s", err) + return flex.FmtErrorf("[ERROR] Error setting git_file_path: %s", err) } } if result.CreatedTime != nil { if err = d.Set("created_time", result.CreatedTime.String()); err != nil { - return fmt.Errorf("[ERROR] Error setting created_time: %s", err) + return flex.FmtErrorf("[ERROR] Error setting created_time: %s", err) } } if result.UpdatedTime != nil { if err = d.Set("updated_time", result.UpdatedTime.String()); err != nil { - return fmt.Errorf("[ERROR] Error setting updated_time: %s", err) + return flex.FmtErrorf("[ERROR] Error setting updated_time: %s", err) } } if result.Href != nil { if err = d.Set("href", result.Href); err != nil { - return fmt.Errorf("[ERROR] Error setting href: %s", err) + return flex.FmtErrorf("[ERROR] Error setting href: %s", err) } } return nil @@ -301,7 +301,7 @@ func resourceIbmIbmAppConfigSnapshotDelete(d *schema.ResourceData, meta interfac d.SetId("") return nil } - return fmt.Errorf("[DEBUG] DeleteGitconfig failed %s\n%s", err, response) + return flex.FmtErrorf("[ERROR] DeleteGitconfig failed %s\n%s", err, response) } d.SetId("") From d480e4765488d80fe61205f09cb25133914bdee6 Mon Sep 17 00:00:00 2001 From: Prajwal Jarali Date: Tue, 3 Dec 2024 15:36:24 +0530 Subject: [PATCH 2/8] coverted error logs to flex errors --- .../data_source_ibm_app_config_environment.go | 6 ++--- ...data_source_ibm_app_config_environments.go | 7 +++-- .../data_source_ibm_app_config_feature.go | 6 ++--- .../data_source_ibm_app_config_features.go | 6 ++--- .../data_source_ibm_app_config_segment.go | 6 ++--- .../data_source_ibm_app_config_segments.go | 4 +-- .../data_source_ibm_app_config_snapshot.go | 27 ++++++++++--------- ...resource_ibm_app_config_collection_test.go | 16 +++++------ .../resource_ibm_app_config_environment.go | 12 ++++----- ...esource_ibm_app_config_environment_test.go | 20 +++++++------- .../resource_ibm_app_config_feature.go | 19 ++++++------- .../resource_ibm_app_config_feature_test.go | 16 +++++------ .../resource_ibm_app_config_property.go | 8 +++--- .../resource_ibm_app_config_property_test.go | 16 +++++------ .../resource_ibm_app_config_segment.go | 17 +++++------- .../resource_ibm_app_config_segment_test.go | 16 +++++------ .../resource_ibm_app_config_snapshot.go | 16 +++++------ 17 files changed, 98 insertions(+), 120 deletions(-) diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_environment.go b/ibm/service/appconfiguration/data_source_ibm_app_config_environment.go index 9d198cfcef6..390cdbc1fba 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_environment.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_environment.go @@ -5,7 +5,6 @@ package appconfiguration import ( "fmt" - "log" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -78,7 +77,7 @@ func dataSourceIbmAppConfigEnvironmentRead(d *schema.ResourceData, meta interfac appconfigClient, err := getAppConfigClient(meta, guid) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.GetEnvironmentOptions{} @@ -89,8 +88,7 @@ func dataSourceIbmAppConfigEnvironmentRead(d *schema.ResourceData, meta interfac } result, response, err := appconfigClient.GetEnvironment(options) if err != nil { - log.Printf("GetEnvironment failed %s\n%s", err, response) - return err + return flex.FmtErrorf("GetEnvironment failed %s\n%s", err, response, err) } d.SetId(fmt.Sprintf("%s/%s", guid, *result.EnvironmentID)) diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_environments.go b/ibm/service/appconfiguration/data_source_ibm_app_config_environments.go index d4595a231bc..e68a684a510 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_environments.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_environments.go @@ -4,7 +4,7 @@ package appconfiguration import ( - "log" + "fmt" "net/url" "reflect" "strconv" @@ -165,7 +165,7 @@ func dataSourceIbmAppConfigEnvironmentsRead(d *schema.ResourceData, meta interfa appconfigClient, err := getAppConfigClient(meta, guid) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.ListEnvironmentsOptions{} @@ -198,8 +198,7 @@ func dataSourceIbmAppConfigEnvironmentsRead(d *schema.ResourceData, meta interfa result, response, err := appconfigClient.ListEnvironments(options) environmentList = result if err != nil { - log.Printf("[ERROR] Listing Environments failed %s\n%s", err, response) - return err + return flex.FmtErrorf("[ERROR] Listing Environments failed %s\n%s", err, response) } if isLimit { offset = 0 diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_feature.go b/ibm/service/appconfiguration/data_source_ibm_app_config_feature.go index 69fb10a44e2..7b0a2c4cce4 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_feature.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_feature.go @@ -5,7 +5,6 @@ package appconfiguration import ( "fmt" - "log" "strconv" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" @@ -173,7 +172,7 @@ func dataSourceIbmAppConfigFeatureRead(d *schema.ResourceData, meta interface{}) appconfigClient, err := getAppConfigClient(meta, guid) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.GetFeatureOptions{} @@ -187,8 +186,7 @@ func dataSourceIbmAppConfigFeatureRead(d *schema.ResourceData, meta interface{}) result, response, err := appconfigClient.GetFeature(options) if err != nil { - log.Printf("[ERROR] GetFeature failed %s\n%s", err, response) - return err + return flex.FmtErrorf("[ERROR] GetFeature failed %s\n%s", err, response) } d.SetId(fmt.Sprintf("%s/%s/%s", guid, *options.EnvironmentID, *result.FeatureID)) diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_features.go b/ibm/service/appconfiguration/data_source_ibm_app_config_features.go index b74ad5ba7d4..34b5711223b 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_features.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_features.go @@ -5,7 +5,6 @@ package appconfiguration import ( "fmt" - "log" "net/url" "reflect" "strconv" @@ -283,7 +282,7 @@ func dataSourceIbmAppConfigFeaturesRead(d *schema.ResourceData, meta interface{} appconfigClient, err := getAppConfigClient(meta, guid) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.ListFeaturesOptions{} @@ -335,8 +334,7 @@ func dataSourceIbmAppConfigFeaturesRead(d *schema.ResourceData, meta interface{} result, response, err := appconfigClient.ListFeatures(options) featuresList = result if err != nil { - log.Printf("[ERROR] Listing Features failed %s\n%s", err, response) - return err + return flex.FmtErrorf("[ERROR] Listing Features failed %s\n%s", err, response) } if isLimit { offset = 0 diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_segment.go b/ibm/service/appconfiguration/data_source_ibm_app_config_segment.go index 463a79ed479..cd83978e16d 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_segment.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_segment.go @@ -2,7 +2,6 @@ package appconfiguration import ( "fmt" - "log" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" "github.com/IBM/appconfiguration-go-admin-sdk/appconfigurationv1" @@ -134,7 +133,7 @@ func dataSourceIbmAppConfigSegmentRead(d *schema.ResourceData, meta interface{}) appconfigClient, err := getAppConfigClient(meta, guid) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.GetSegmentOptions{} @@ -150,8 +149,7 @@ func dataSourceIbmAppConfigSegmentRead(d *schema.ResourceData, meta interface{}) result, response, err := appconfigClient.GetSegment(options) if err != nil { - log.Printf("[ERROR] GetSegment failed %s\n%s", err, response) - return err + return flex.FmtErrorf("[ERROR] GetSegment failed %s\n%s", err, response) } d.SetId(fmt.Sprintf("%s/%s", guid, *result.SegmentID)) diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_segments.go b/ibm/service/appconfiguration/data_source_ibm_app_config_segments.go index 35756185fa8..084b5d1fd13 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_segments.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_segments.go @@ -2,7 +2,6 @@ package appconfiguration import ( "fmt" - "log" "net/url" "reflect" "strconv" @@ -215,8 +214,7 @@ func dataSourceIbmAppConfigSegmentsRead(d *schema.ResourceData, meta interface{} result, response, err := appconfigClient.ListSegments(options) segmentsList = result if err != nil { - log.Printf("[ERROR] ListSegments failed %s\n%s", err, response) - return flex.FmtErrorf("ListSegments failed %s\n%s", err, response) + return flex.FmtErrorf("[ERROR] ListSegments failed %s\n%s", err, response) } if isLimit { offset = 0 diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_snapshot.go b/ibm/service/appconfiguration/data_source_ibm_app_config_snapshot.go index 29af793b40f..cecc97b339f 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_snapshot.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_snapshot.go @@ -3,6 +3,7 @@ package appconfiguration import ( "fmt" + "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" "github.com/IBM/appconfiguration-go-admin-sdk/appconfigurationv1" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) @@ -114,7 +115,7 @@ func dataSourceIbmAppConfigSnapshotRead(d *schema.ResourceData, meta interface{} appconfigClient, err := getAppConfigClient(meta, guid) if err != nil { - return fmt.Errorf("getAppConfigClient failed %s", err) + return flex.FmtErrorf("getAppConfigClient failed %s", err) } options := &appconfigurationv1.GetGitconfigOptions{} @@ -123,66 +124,66 @@ func dataSourceIbmAppConfigSnapshotRead(d *schema.ResourceData, meta interface{} result, response, err := appconfigClient.GetGitconfig(options) if err != nil { - return fmt.Errorf("GetGitconfig failed %s\n%s", err, response) + return flex.FmtErrorf("GetGitconfig failed %s\n%s", err, response) } d.SetId(fmt.Sprintf("%s/%s", guid, *result.GitConfigID)) if result.GitConfigName != nil { if err = d.Set("git_config_name", result.GitConfigName); err != nil { - return fmt.Errorf("[ERROR] Error setting git_config_name: %s", err) + return flex.FmtErrorf("[ERROR] Error setting git_config_name: %s", err) } } if result.GitConfigID != nil { if err = d.Set("git_config_id", result.GitConfigID); err != nil { - return fmt.Errorf("[ERROR] Error setting git_config_id: %s", err) + return flex.FmtErrorf("[ERROR] Error setting git_config_id: %s", err) } } if result.GitURL != nil { if err = d.Set("git_url", result.GitURL); err != nil { - return fmt.Errorf("[ERROR] Error setting git_url: %s", err) + return flex.FmtErrorf("[ERROR] Error setting git_url: %s", err) } } if result.GitBranch != nil { if err = d.Set("git_branch", result.GitBranch); err != nil { - return fmt.Errorf("[ERROR] Error setting git_branch: %s", err) + return flex.FmtErrorf("[ERROR] Error setting git_branch: %s", err) } } if result.GitFilePath != nil { if err = d.Set("git_file_path", result.GitFilePath); err != nil { - return fmt.Errorf("[ERROR] Error setting git_file_path: %s", err) + return flex.FmtErrorf("[ERROR] Error setting git_file_path: %s", err) } } if result.CreatedTime != nil { if err = d.Set("created_time", result.CreatedTime.String()); err != nil { - return fmt.Errorf("[ERROR] Error setting created_time: %s", err) + return flex.FmtErrorf("[ERROR] Error setting created_time: %s", err) } } if result.UpdatedTime != nil { if err = d.Set("updated_time", result.UpdatedTime.String()); err != nil { - return fmt.Errorf("[ERROR] Error setting updated_time: %s", err) + return flex.FmtErrorf("[ERROR] Error setting updated_time: %s", err) } } if result.LastSyncTime != nil { if err = d.Set("last_sync_time", result.LastSyncTime.String()); err != nil { - return fmt.Errorf("[ERROR] Error setting last_sync_time: %s", err) + return flex.FmtErrorf("[ERROR] Error setting last_sync_time: %s", err) } } if result.Href != nil { if err = d.Set("href", result.Href); err != nil { - return fmt.Errorf("[ERROR] Error setting href: %s", err) + return flex.FmtErrorf("[ERROR] Error setting href: %s", err) } } if result.Collection != nil { collectionItemMap := resourceIbmAppConfigSnapshotCollectionRefToMap(result.Collection) if err = d.Set("collection", collectionItemMap); err != nil { - return fmt.Errorf("[ERROR] Error setting collection: %s", err) + return flex.FmtErrorf("[ERROR] Error setting collection: %s", err) } } if result.Environment != nil { environmentItemMap := resourceIbmAppConfigSnapshotEnvironmentRefToMap(result.Environment) if err = d.Set("environment", environmentItemMap); err != nil { - return fmt.Errorf("[ERROR] Error setting environment: %s", err) + return flex.FmtErrorf("[ERROR] Error setting environment: %s", err) } } return nil diff --git a/ibm/service/appconfiguration/resource_ibm_app_config_collection_test.go b/ibm/service/appconfiguration/resource_ibm_app_config_collection_test.go index bdc125f8328..77a46aecd06 100644 --- a/ibm/service/appconfiguration/resource_ibm_app_config_collection_test.go +++ b/ibm/service/appconfiguration/resource_ibm_app_config_collection_test.go @@ -76,15 +76,15 @@ func testAccCheckIbmAppConfigCollectionExists(n string, obj appconfigurationv1.C return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { - return fmt.Errorf("Not found: %s", n) + return flex.FmtErrorf("Not found: %s", n) } parts, err := flex.IdParts(rs.Primary.ID) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } appconfigClient, err := getAppConfigClient(acc.TestAccProvider.Meta(), parts[0]) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.GetCollectionOptions{} @@ -93,7 +93,7 @@ func testAccCheckIbmAppConfigCollectionExists(n string, obj appconfigurationv1.C result, _, err := appconfigClient.GetCollection(options) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } obj = *result @@ -109,11 +109,11 @@ func testAccCheckIbmAppConfigCollectionDestroy(s *terraform.State) error { } parts, err := flex.IdParts(rs.Primary.ID) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } appconfigClient, err := getAppConfigClient(acc.TestAccProvider.Meta(), parts[0]) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.GetCollectionOptions{} @@ -123,9 +123,9 @@ func testAccCheckIbmAppConfigCollectionDestroy(s *terraform.State) error { _, response, err := appconfigClient.GetCollection(options) if err == nil { - return fmt.Errorf("Collection still exists: %s", rs.Primary.ID) + return flex.FmtErrorf("Collection still exists: %s", rs.Primary.ID) } else if response.StatusCode != 404 { - return fmt.Errorf("[ERROR] Error checking for Collection (%s) has been destroyed: %s", rs.Primary.ID, err) + return flex.FmtErrorf("[ERROR] Error checking for Collection (%s) has been destroyed: %s", rs.Primary.ID, err) } } diff --git a/ibm/service/appconfiguration/resource_ibm_app_config_environment.go b/ibm/service/appconfiguration/resource_ibm_app_config_environment.go index 98e9d4e619d..1a52c7a882f 100644 --- a/ibm/service/appconfiguration/resource_ibm_app_config_environment.go +++ b/ibm/service/appconfiguration/resource_ibm_app_config_environment.go @@ -74,11 +74,11 @@ func ResourceIBMAppConfigEnvironment() *schema.Resource { func getAppConfigClient(meta interface{}, guid string) (*appconfigurationv1.AppConfigurationV1, error) { appconfigClient, err := meta.(conns.ClientSession).AppConfigurationV1() if err != nil { - return nil, err + return nil, flex.FmtErrorf(fmt.Sprintf("%s", err)) } bluemixSession, err := meta.(conns.ClientSession).BluemixSession() if err != nil { - return nil, err + return nil, flex.FmtErrorf(fmt.Sprintf("%s", err)) } appConfigURL := fmt.Sprintf("https://%s.apprapp.cloud.ibm.com/apprapp/feature/v1/instances/%s", bluemixSession.Config.Region, guid) url := conns.EnvFallBack([]string{"IBMCLOUD_APP_CONFIG_API_ENDPOINT"}, appConfigURL) @@ -90,7 +90,7 @@ func resourceEnvironmentCreate(d *schema.ResourceData, meta interface{}) error { guid := d.Get("guid").(string) appconfigClient, err := getAppConfigClient(meta, guid) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.CreateEnvironmentOptions{} @@ -123,7 +123,7 @@ func resourceEnvironmentUpdate(d *schema.ResourceData, meta interface{}) error { } appconfigClient, err := getAppConfigClient(meta, parts[0]) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.UpdateEnvironmentOptions{} @@ -156,7 +156,7 @@ func resourceEnvironmentRead(d *schema.ResourceData, meta interface{}) error { } appconfigClient, err := getAppConfigClient(meta, parts[0]) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.GetEnvironmentOptions{} @@ -221,7 +221,7 @@ func resourceEnvironmentDelete(d *schema.ResourceData, meta interface{}) error { appconfigClient, err := getAppConfigClient(meta, parts[0]) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.DeleteEnvironmentOptions{} diff --git a/ibm/service/appconfiguration/resource_ibm_app_config_environment_test.go b/ibm/service/appconfiguration/resource_ibm_app_config_environment_test.go index b06eb51c55e..cdccd0b416e 100644 --- a/ibm/service/appconfiguration/resource_ibm_app_config_environment_test.go +++ b/ibm/service/appconfiguration/resource_ibm_app_config_environment_test.go @@ -81,11 +81,11 @@ func testAccCheckIbmAppConfigEnvironmentConfigBasic(name, envName, environmentID func getAppConfigClient(meta interface{}, guid string) (*appconfigurationv1.AppConfigurationV1, error) { appconfigClient, err := meta.(conns.ClientSession).AppConfigurationV1() if err != nil { - return nil, err + return nil, flex.FmtErrorf(fmt.Sprintf("%s", err)) } bluemixSession, err := meta.(conns.ClientSession).BluemixSession() if err != nil { - return nil, err + return nil, flex.FmtErrorf(fmt.Sprintf("%s", err)) } appConfigURL := fmt.Sprintf("https://%s.apprapp.cloud.ibm.com/apprapp/feature/v1/instances/%s", bluemixSession.Config.Region, guid) url := conns.EnvFallBack([]string{"IBMCLOUD_APP_CONFIG_API_ENDPOINT"}, appConfigURL) @@ -98,17 +98,17 @@ func testAccCheckIbmAppConfigEnvironmentExists(n string, obj appconfigurationv1. return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { - return fmt.Errorf("Not found: %s", n) + return flex.FmtErrorf("Not found: %s", n) } parts, err := flex.IdParts(rs.Primary.ID) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } appconfigClient, err := getAppConfigClient(acc.TestAccProvider.Meta(), parts[0]) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.GetEnvironmentOptions{} @@ -116,7 +116,7 @@ func testAccCheckIbmAppConfigEnvironmentExists(n string, obj appconfigurationv1. result, _, err := appconfigClient.GetEnvironment(options) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } obj = *result @@ -132,12 +132,12 @@ func testAccCheckIbmAppConfigEnvironmentDestroy(s *terraform.State) error { parts, err := flex.IdParts(rs.Primary.ID) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } appconfigClient, err := getAppConfigClient(acc.TestAccProvider.Meta(), parts[0]) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.GetEnvironmentOptions{} options.SetEnvironmentID(parts[1]) @@ -146,9 +146,9 @@ func testAccCheckIbmAppConfigEnvironmentDestroy(s *terraform.State) error { _, response, err := appconfigClient.GetEnvironment(options) if err == nil { - return fmt.Errorf("Environment still exists: %s", rs.Primary.ID) + return flex.FmtErrorf("Environment still exists: %s", rs.Primary.ID) } else if response.StatusCode != 404 { - return fmt.Errorf("[ERROR] Error checking for environment (%s) has been destroyed: %s", rs.Primary.ID, err) + return flex.FmtErrorf("[ERROR] Error checking for environment (%s) has been destroyed: %s", rs.Primary.ID, err) } } diff --git a/ibm/service/appconfiguration/resource_ibm_app_config_feature.go b/ibm/service/appconfiguration/resource_ibm_app_config_feature.go index f4edc90c948..22a667209d5 100644 --- a/ibm/service/appconfiguration/resource_ibm_app_config_feature.go +++ b/ibm/service/appconfiguration/resource_ibm_app_config_feature.go @@ -5,7 +5,6 @@ package appconfiguration import ( "fmt" - "log" "strconv" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" @@ -167,7 +166,7 @@ func resourceIbmIbmAppConfigFeatureCreate(d *schema.ResourceData, meta interface guid := d.Get("guid").(string) appconfigClient, err := getAppConfigClient(meta, guid) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.CreateFeatureOptions{} options.SetType(d.Get("type").(string)) @@ -195,7 +194,7 @@ func resourceIbmIbmAppConfigFeatureCreate(d *schema.ResourceData, meta interface value := e.(map[string]interface{}) segmentRulesItem, err := resourceIbmAppConfigFeatureMapToSegmentRule(d, value) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } segmentRules = append(segmentRules, segmentRulesItem) } @@ -214,8 +213,7 @@ func resourceIbmIbmAppConfigFeatureCreate(d *schema.ResourceData, meta interface feature, response, err := appconfigClient.CreateFeature(options) if err != nil { - log.Printf("CreateFeature failed %s\n%s", err, response) - return err + return flex.FmtErrorf("CreateFeature failed %s\n%s", err, response) } d.SetId(fmt.Sprintf("%s/%s/%s", guid, *options.EnvironmentID, *feature.FeatureID)) return resourceIbmIbmAppConfigFeatureRead(d, meta) @@ -228,7 +226,7 @@ func resourceIbmIbmAppConfigFeatureUpdate(d *schema.ResourceData, meta interface } appconfigClient, err := getAppConfigClient(meta, parts[0]) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.UpdateFeatureOptions{} @@ -255,7 +253,7 @@ func resourceIbmIbmAppConfigFeatureUpdate(d *schema.ResourceData, meta interface value := e.(map[string]interface{}) segmentRulesItem, err := resourceIbmAppConfigFeatureMapToSegmentRule(d, value) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } segmentRules = append(segmentRules, segmentRulesItem) } @@ -273,8 +271,7 @@ func resourceIbmIbmAppConfigFeatureUpdate(d *schema.ResourceData, meta interface _, response, err := appconfigClient.UpdateFeature(options) if err != nil { - log.Printf("[ERROR] UpdateFeature %s\n%s", err, response) - return err + return flex.FmtErrorf("[ERROR] UpdateFeature %s\n%s", err, response) } return resourceIbmIbmAppConfigFeatureRead(d, meta) } @@ -288,7 +285,7 @@ func resourceIbmIbmAppConfigFeatureRead(d *schema.ResourceData, meta interface{} } appconfigClient, err := getAppConfigClient(meta, parts[0]) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.GetFeatureOptions{} @@ -420,7 +417,7 @@ func resourceIbmIbmAppConfigFeatureDelete(d *schema.ResourceData, meta interface } appconfigClient, err := getAppConfigClient(meta, parts[0]) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.DeleteFeatureOptions{} diff --git a/ibm/service/appconfiguration/resource_ibm_app_config_feature_test.go b/ibm/service/appconfiguration/resource_ibm_app_config_feature_test.go index 9b8eadd90d5..cc180faa620 100644 --- a/ibm/service/appconfiguration/resource_ibm_app_config_feature_test.go +++ b/ibm/service/appconfiguration/resource_ibm_app_config_feature_test.go @@ -88,15 +88,15 @@ func testAccCheckIbmAppConfigFeatureExists(n string, obj appconfigurationv1.Feat return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { - return fmt.Errorf("Not found: %s", n) + return flex.FmtErrorf("Not found: %s", n) } parts, err := flex.IdParts(rs.Primary.ID) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } appconfigClient, err := getAppConfigClient(acc.TestAccProvider.Meta(), parts[0]) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.GetFeatureOptions{} @@ -106,7 +106,7 @@ func testAccCheckIbmAppConfigFeatureExists(n string, obj appconfigurationv1.Feat result, _, err := appconfigClient.GetFeature(options) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } obj = *result @@ -122,11 +122,11 @@ func testAccCheckIbmAppConfigFeatureDestroy(s *terraform.State) error { } parts, err := flex.IdParts(rs.Primary.ID) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } appconfigClient, err := getAppConfigClient(acc.TestAccProvider.Meta(), parts[0]) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.GetFeatureOptions{} @@ -137,9 +137,9 @@ func testAccCheckIbmAppConfigFeatureDestroy(s *terraform.State) error { _, response, err := appconfigClient.GetFeature(options) if err == nil { - return fmt.Errorf("Feature still exists: %s", rs.Primary.ID) + return flex.FmtErrorf("Feature still exists: %s", rs.Primary.ID) } else if response.StatusCode != 404 { - return fmt.Errorf("[ERROR] Error checking for Feature (%s) has been destroyed: %s", rs.Primary.ID, err) + return flex.FmtErrorf("[ERROR] Error checking for Feature (%s) has been destroyed: %s", rs.Primary.ID, err) } } diff --git a/ibm/service/appconfiguration/resource_ibm_app_config_property.go b/ibm/service/appconfiguration/resource_ibm_app_config_property.go index 5d6c5c11823..3cac255ee00 100644 --- a/ibm/service/appconfiguration/resource_ibm_app_config_property.go +++ b/ibm/service/appconfiguration/resource_ibm_app_config_property.go @@ -5,7 +5,6 @@ package appconfiguration import ( "fmt" - "log" "strconv" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" @@ -185,7 +184,7 @@ func resourceIbmIbmAppConfigPropertyCreate(d *schema.ResourceData, meta interfac value := e.(map[string]interface{}) segmentRulesItem, err := resourceIbmAppConfigPropertyMapToSegmentRule(d, value) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } segmentRules = append(segmentRules, segmentRulesItem) } @@ -351,7 +350,7 @@ func resourceIbmIbmAppConfigPropertyUpdate(d *schema.ResourceData, meta interfac value := e.(map[string]interface{}) segmentRulesItem, err := resourceIbmAppConfigPropertyMapToSegmentRule(d, value) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } segmentRules = append(segmentRules, segmentRulesItem) } @@ -388,8 +387,7 @@ func resourceIbmIbmAppConfigPropertyDelete(d *schema.ResourceData, meta interfac d.SetId("") return nil } - log.Printf("[ERROR] DeleteProperty failed %s\n%s", err, response) - return err + return flex.FmtErrorf("[ERROR] DeleteProperty failed %s\n%s", err, response) } d.SetId("") diff --git a/ibm/service/appconfiguration/resource_ibm_app_config_property_test.go b/ibm/service/appconfiguration/resource_ibm_app_config_property_test.go index 417be1bd9ce..6f7b7175837 100644 --- a/ibm/service/appconfiguration/resource_ibm_app_config_property_test.go +++ b/ibm/service/appconfiguration/resource_ibm_app_config_property_test.go @@ -85,17 +85,17 @@ func testAccCheckIbmAppConfigPropertyExists(n string, obj appconfigurationv1.Pro return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { - return fmt.Errorf("Not found: %s", n) + return flex.FmtErrorf("Not found: %s", n) } parts, err := flex.IdParts(rs.Primary.ID) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } appconfigClient, err := getAppConfigClient(acc.TestAccProvider.Meta(), parts[0]) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.GetPropertyOptions{} @@ -104,7 +104,7 @@ func testAccCheckIbmAppConfigPropertyExists(n string, obj appconfigurationv1.Pro property, _, err := appconfigClient.GetProperty(options) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } obj = *property @@ -119,12 +119,12 @@ func testAccCheckIbmAppConfigPropertyDestroy(s *terraform.State) error { } parts, err := flex.IdParts(rs.Primary.ID) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } appconfigClient, err := getAppConfigClient(acc.TestAccProvider.Meta(), parts[0]) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.GetPropertyOptions{} @@ -135,9 +135,9 @@ func testAccCheckIbmAppConfigPropertyDestroy(s *terraform.State) error { _, response, err := appconfigClient.GetProperty(options) if err == nil { - return fmt.Errorf("app_config_property still exists: %s", rs.Primary.ID) + return flex.FmtErrorf("app_config_property still exists: %s", rs.Primary.ID) } else if response.StatusCode != 404 { - return fmt.Errorf("Error checking for app_config_property (%s) has been destroyed: %s", rs.Primary.ID, err) + return flex.FmtErrorf("Error checking for app_config_property (%s) has been destroyed: %s", rs.Primary.ID, err) } } diff --git a/ibm/service/appconfiguration/resource_ibm_app_config_segment.go b/ibm/service/appconfiguration/resource_ibm_app_config_segment.go index eabdd7d657b..f0bd11eedbb 100644 --- a/ibm/service/appconfiguration/resource_ibm_app_config_segment.go +++ b/ibm/service/appconfiguration/resource_ibm_app_config_segment.go @@ -2,7 +2,6 @@ package appconfiguration import ( "fmt" - "log" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" "github.com/IBM/appconfiguration-go-admin-sdk/appconfigurationv1" @@ -93,7 +92,7 @@ func resourceIbmIbmAppConfigSegmentCreate(d *schema.ResourceData, meta interface guid := d.Get("guid").(string) appconfigClient, err := getAppConfigClient(meta, guid) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.CreateSegmentOptions{} options.SetName(d.Get("name").(string)) @@ -112,7 +111,7 @@ func resourceIbmIbmAppConfigSegmentCreate(d *schema.ResourceData, meta interface value := e.(map[string]interface{}) segmentRulesItem, err := resourceIbmAppConfigMapToSegmentRule(value) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } segmentRules = append(segmentRules, segmentRulesItem) } @@ -122,7 +121,6 @@ func resourceIbmIbmAppConfigSegmentCreate(d *schema.ResourceData, meta interface segment, response, err := appconfigClient.CreateSegment(options) if err != nil { - log.Printf("CreateSegment failed %s\n%s", err, response) return flex.FmtErrorf("CreateSegment failed %s\n%s", err, response) } d.SetId(fmt.Sprintf("%s/%s", guid, *segment.SegmentID)) @@ -153,7 +151,7 @@ func resourceIbmIbmAppConfigSegmentRead(d *schema.ResourceData, meta interface{} appconfigClient, err := getAppConfigClient(meta, parts[0]) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.GetSegmentOptions{} @@ -236,7 +234,7 @@ func resourceIbmIbmAppConfigSegmentUpdate(d *schema.ResourceData, meta interface } appconfigClient, err := getAppConfigClient(meta, parts[0]) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.UpdateSegmentOptions{} @@ -259,7 +257,7 @@ func resourceIbmIbmAppConfigSegmentUpdate(d *schema.ResourceData, meta interface value := e.(map[string]interface{}) segmentRulesItem, err := resourceIbmAppConfigMapToSegmentRule(value) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } segmentRules = append(segmentRules, segmentRulesItem) } @@ -268,8 +266,7 @@ func resourceIbmIbmAppConfigSegmentUpdate(d *schema.ResourceData, meta interface _, response, err := appconfigClient.UpdateSegment(options) if err != nil { - log.Printf("[ERROR] UpdateSegment %s\n%s", err, response) - return err + return flex.FmtErrorf("[ERROR] UpdateSegment %s\n%s", err, response) } return resourceIbmIbmAppConfigSegmentRead(d, meta) } @@ -283,7 +280,7 @@ func resourceIbmIbmAppConfigSegmentDelete(d *schema.ResourceData, meta interface } appconfigClient, err := getAppConfigClient(meta, parts[0]) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.DeleteSegmentOptions{} diff --git a/ibm/service/appconfiguration/resource_ibm_app_config_segment_test.go b/ibm/service/appconfiguration/resource_ibm_app_config_segment_test.go index 62f18a14675..5eab0c3fb21 100644 --- a/ibm/service/appconfiguration/resource_ibm_app_config_segment_test.go +++ b/ibm/service/appconfiguration/resource_ibm_app_config_segment_test.go @@ -75,15 +75,15 @@ func testAccCheckIbmAppConfigSegmentExists(n string, obj appconfigurationv1.Segm return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { - return fmt.Errorf("Not found: %s", n) + return flex.FmtErrorf("Not found: %s", n) } parts, err := flex.IdParts(rs.Primary.ID) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } appconfigClient, err := getAppConfigClient(acc.TestAccProvider.Meta(), parts[0]) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.GetSegmentOptions{} @@ -92,7 +92,7 @@ func testAccCheckIbmAppConfigSegmentExists(n string, obj appconfigurationv1.Segm result, _, err := appconfigClient.GetSegment(options) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } obj = *result @@ -108,11 +108,11 @@ func testAccCheckIbmAppConfigSegmentDestroy(s *terraform.State) error { } parts, err := flex.IdParts(rs.Primary.ID) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } appconfigClient, err := getAppConfigClient(acc.TestAccProvider.Meta(), parts[0]) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.GetSegmentOptions{} @@ -122,9 +122,9 @@ func testAccCheckIbmAppConfigSegmentDestroy(s *terraform.State) error { _, response, err := appconfigClient.GetSegment(options) if err == nil { - return fmt.Errorf("Segment still exists: %s", rs.Primary.ID) + return flex.FmtErrorf("Segment still exists: %s", rs.Primary.ID) } else if response.StatusCode != 404 { - return fmt.Errorf("[ERROR] Error checking for Segment (%s) has been destroyed: %s", rs.Primary.ID, err) + return flex.FmtErrorf("[ERROR] Error checking for Segment (%s) has been destroyed: %s", rs.Primary.ID, err) } } diff --git a/ibm/service/appconfiguration/resource_ibm_app_config_snapshot.go b/ibm/service/appconfiguration/resource_ibm_app_config_snapshot.go index d8b83f6ee78..c196f08d69d 100644 --- a/ibm/service/appconfiguration/resource_ibm_app_config_snapshot.go +++ b/ibm/service/appconfiguration/resource_ibm_app_config_snapshot.go @@ -6,8 +6,6 @@ import ( "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" "github.com/IBM/appconfiguration-go-admin-sdk/appconfigurationv1" - "log" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) @@ -138,7 +136,7 @@ func resourceIbmIbmAppConfigSnapshotCreate(d *schema.ResourceData, meta interfac guid := d.Get("guid").(string) appconfigClient, err := getAppConfigClient(meta, guid) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.CreateGitconfigOptions{} @@ -168,7 +166,7 @@ func resourceIbmIbmAppConfigSnapshotUpdate(d *schema.ResourceData, meta interfac } appconfigClient, err := getAppConfigClient(meta, parts[0]) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } if ok := d.HasChanges("action"); ok { @@ -176,8 +174,7 @@ func resourceIbmIbmAppConfigSnapshotUpdate(d *schema.ResourceData, meta interfac option.SetGitConfigID(parts[1]) _, response, err := appconfigClient.PromoteGitconfig(option) if err != nil { - log.Printf("[ERROR] PromoteGitconfig %s\n%s", err, response) - return err + return flex.FmtErrorf("[ERROR] PromoteGitconfig %s\n%s", err, response) } return resourceIbmIbmAppConfigSnapshotRead(d, meta) } else { @@ -207,8 +204,7 @@ func resourceIbmIbmAppConfigSnapshotUpdate(d *schema.ResourceData, meta interfac } _, response, err := appconfigClient.UpdateGitconfig(options) if err != nil { - log.Printf("[ERROR] UpdateGitconfig %s\n%s", err, response) - return err + return flex.FmtErrorf("[ERROR] UpdateGitconfig %s\n%s", err, response) } return resourceIbmIbmAppConfigSnapshotRead(d, meta) } @@ -223,7 +219,7 @@ func resourceIbmIbmAppConfigSnapshotRead(d *schema.ResourceData, meta interface{ } appconfigClient, err := getAppConfigClient(meta, parts[0]) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } if len(parts) != 2 { return flex.FmtErrorf("Kindly check the id") @@ -289,7 +285,7 @@ func resourceIbmIbmAppConfigSnapshotDelete(d *schema.ResourceData, meta interfac } appconfigClient, err := getAppConfigClient(meta, parts[0]) if err != nil { - return err + return flex.FmtErrorf(fmt.Sprintf("%s", err)) } options := &appconfigurationv1.DeleteGitconfigOptions{} From f3cf042adaa990cb1507757c6a7d946966421b32 Mon Sep 17 00:00:00 2001 From: Prajwal Jarali Date: Wed, 4 Dec 2024 11:12:48 +0530 Subject: [PATCH 3/8] reverted flex error to plain error for get client function --- .../appconfiguration/resource_ibm_app_config_environment.go | 4 ++-- .../resource_ibm_app_config_environment_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ibm/service/appconfiguration/resource_ibm_app_config_environment.go b/ibm/service/appconfiguration/resource_ibm_app_config_environment.go index 1a52c7a882f..65328fff30e 100644 --- a/ibm/service/appconfiguration/resource_ibm_app_config_environment.go +++ b/ibm/service/appconfiguration/resource_ibm_app_config_environment.go @@ -74,11 +74,11 @@ func ResourceIBMAppConfigEnvironment() *schema.Resource { func getAppConfigClient(meta interface{}, guid string) (*appconfigurationv1.AppConfigurationV1, error) { appconfigClient, err := meta.(conns.ClientSession).AppConfigurationV1() if err != nil { - return nil, flex.FmtErrorf(fmt.Sprintf("%s", err)) + return nil, err } bluemixSession, err := meta.(conns.ClientSession).BluemixSession() if err != nil { - return nil, flex.FmtErrorf(fmt.Sprintf("%s", err)) + return nil, err } appConfigURL := fmt.Sprintf("https://%s.apprapp.cloud.ibm.com/apprapp/feature/v1/instances/%s", bluemixSession.Config.Region, guid) url := conns.EnvFallBack([]string{"IBMCLOUD_APP_CONFIG_API_ENDPOINT"}, appConfigURL) diff --git a/ibm/service/appconfiguration/resource_ibm_app_config_environment_test.go b/ibm/service/appconfiguration/resource_ibm_app_config_environment_test.go index cdccd0b416e..264cb48a549 100644 --- a/ibm/service/appconfiguration/resource_ibm_app_config_environment_test.go +++ b/ibm/service/appconfiguration/resource_ibm_app_config_environment_test.go @@ -81,11 +81,11 @@ func testAccCheckIbmAppConfigEnvironmentConfigBasic(name, envName, environmentID func getAppConfigClient(meta interface{}, guid string) (*appconfigurationv1.AppConfigurationV1, error) { appconfigClient, err := meta.(conns.ClientSession).AppConfigurationV1() if err != nil { - return nil, flex.FmtErrorf(fmt.Sprintf("%s", err)) + return nil, err } bluemixSession, err := meta.(conns.ClientSession).BluemixSession() if err != nil { - return nil, flex.FmtErrorf(fmt.Sprintf("%s", err)) + return nil, err } appConfigURL := fmt.Sprintf("https://%s.apprapp.cloud.ibm.com/apprapp/feature/v1/instances/%s", bluemixSession.Config.Region, guid) url := conns.EnvFallBack([]string{"IBMCLOUD_APP_CONFIG_API_ENDPOINT"}, appConfigURL) From 5d19411828d1122664c0ac7c3c6fbc02aa6e8974 Mon Sep 17 00:00:00 2001 From: Prajwal Jarali Date: Thu, 5 Dec 2024 12:34:47 +0530 Subject: [PATCH 4/8] resolved struct name changes from go-admin-sdk 0.3.0 to 0.4.4 upgrade --- .../data_source_ibm_app_config_collections.go | 4 ++-- .../data_source_ibm_app_config_environments.go | 9 +++++---- .../data_source_ibm_app_config_feature.go | 2 +- .../data_source_ibm_app_config_features.go | 7 ++++--- .../data_source_ibm_app_config_property.go | 2 +- .../data_source_ibm_app_config_snapshots.go | 16 ++++++++-------- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_collections.go b/ibm/service/appconfiguration/data_source_ibm_app_config_collections.go index cc9d606591d..7142033b0d1 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_collections.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_collections.go @@ -353,7 +353,7 @@ func dataSourceCollectionsListGetNext(next interface{}) int64 { return convertedVal } -func dataSourceCollectionListFlattenPagination(result appconfigurationv1.PageHrefResponse) (finalList []map[string]interface{}) { +func dataSourceCollectionListFlattenPagination(result appconfigurationv1.PaginatedListFirst) (finalList []map[string]interface{}) { finalList = []map[string]interface{}{} finalMap := dataSourceCollectionsListURLToMap(result) finalList = append(finalList, finalMap) @@ -361,7 +361,7 @@ func dataSourceCollectionListFlattenPagination(result appconfigurationv1.PageHre return finalList } -func dataSourceCollectionsListURLToMap(urlItem appconfigurationv1.PageHrefResponse) (urlMap map[string]interface{}) { +func dataSourceCollectionsListURLToMap(urlItem appconfigurationv1.PaginatedListFirst) (urlMap map[string]interface{}) { urlMap = map[string]interface{}{} if urlItem.Href != nil { diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_environments.go b/ibm/service/appconfiguration/data_source_ibm_app_config_environments.go index e68a684a510..b146dec7b9c 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_environments.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_environments.go @@ -331,7 +331,7 @@ func dataSourceEnvironmentListGetNext(next interface{}) int64 { return convertedVal } -func dataSourceEnvironmentListFlattenPagination(result appconfigurationv1.PageHrefResponse) (finalList []map[string]interface{}) { +func dataSourceEnvironmentListFlattenPagination(result interface{}) (finalList []map[string]interface{}) { finalList = []map[string]interface{}{} finalMap := dataSourceEnvironmentListURLToMap(result) finalList = append(finalList, finalMap) @@ -339,11 +339,12 @@ func dataSourceEnvironmentListFlattenPagination(result appconfigurationv1.PageHr return finalList } -func dataSourceEnvironmentListURLToMap(urlItem appconfigurationv1.PageHrefResponse) (urlMap map[string]interface{}) { +func dataSourceEnvironmentListURLToMap(urlItem interface{}) (urlMap map[string]interface{}) { urlMap = map[string]interface{}{} - if urlItem.Href != nil { - urlMap["href"] = urlItem.Href + hrefUrl := urlItem.(appconfigurationv1.PaginatedListFirst).Href + if hrefUrl!= nil { + urlMap["href"] = hrefUrl } return urlMap diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_feature.go b/ibm/service/appconfiguration/data_source_ibm_app_config_feature.go index 7b0a2c4cce4..b7b28aba5a5 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_feature.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_feature.go @@ -181,7 +181,7 @@ func dataSourceIbmAppConfigFeatureRead(d *schema.ResourceData, meta interface{}) options.SetFeatureID(d.Get("feature_id").(string)) if _, ok := d.GetOk("includes"); ok { - options.SetInclude(d.Get("includes").(string)) + options.SetInclude(d.Get("includes").([]string)) } result, response, err := appconfigClient.GetFeature(options) diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_features.go b/ibm/service/appconfiguration/data_source_ibm_app_config_features.go index 34b5711223b..aaa0c5c6331 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_features.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_features.go @@ -569,15 +569,16 @@ func dataSourceListFeaturesSegmentRulesRulesToMap(rule appconfigurationv1.Target return ruleMap } -func dataSourceFeatureListFlattenPagination(result appconfigurationv1.PageHrefResponse) (finalList []map[string]interface{}) { +func dataSourceFeatureListFlattenPagination(result interface{}) (finalList []map[string]interface{}) { + pageResult := result.(appconfigurationv1.PaginatedListFirst) finalList = []map[string]interface{}{} - finalMap := dataSourceFeatureListURLToMap(result) + finalMap := dataSourceFeatureListURLToMap(pageResult) finalList = append(finalList, finalMap) return finalList } -func dataSourceFeatureListURLToMap(urlItem appconfigurationv1.PageHrefResponse) (urlMap map[string]interface{}) { +func dataSourceFeatureListURLToMap(urlItem appconfigurationv1.PaginatedListFirst) (urlMap map[string]interface{}) { urlMap = map[string]interface{}{} if urlItem.Href != nil { diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_property.go b/ibm/service/appconfiguration/data_source_ibm_app_config_property.go index 5ee2bc82152..ae5366a7243 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_property.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_property.go @@ -158,7 +158,7 @@ func dataSourceIbmAppConfigPropertyRead(d *schema.ResourceData, meta interface{} options.SetPropertyID(d.Get("property_id").(string)) if _, ok := d.GetOk("include"); ok { - options.SetInclude(d.Get("include").(string)) + options.SetInclude(d.Get("include").([]string)) } property, response, err := appconfigClient.GetProperty(options) diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_snapshots.go b/ibm/service/appconfiguration/data_source_ibm_app_config_snapshots.go index 3e402058c3c..9d0cd9d417b 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_snapshots.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_snapshots.go @@ -171,12 +171,12 @@ func dataSourceIbmAppConfigSnapshotsRead(d *schema.ResourceData, meta interface{ options.SetSort(d.Get("sort").(string)) } - var shapshotsList *appconfigurationv1.SnapshotsList + var shapshotsList *appconfigurationv1.GitConfigList var offset int64 var limit int64 = 10 var isLimit bool - finalList := []appconfigurationv1.SnapshotResponseGetApi{} + finalList := []appconfigurationv1.GitConfig{} if _, ok := d.GetOk("limit"); ok { isLimit = true @@ -199,18 +199,18 @@ func dataSourceIbmAppConfigSnapshotsRead(d *schema.ResourceData, meta interface{ } else { offset = dataSourceSnapshotsListGetNext(result.Next) } - finalList = append(finalList, result.Snapshot...) + finalList = append(finalList, result.GitConfig...) if offset == 0 { break } } - shapshotsList.Snapshot = finalList + shapshotsList.GitConfig = finalList d.SetId(fmt.Sprintf("%s", guid)) - if shapshotsList.Snapshot != nil { - err = d.Set("git_config", dataSourceFeaturesListFlattenSnapshots(shapshotsList.Snapshot)) + if shapshotsList.GitConfig != nil { + err = d.Set("git_config", dataSourceFeaturesListFlattenSnapshots(shapshotsList.GitConfig)) if err != nil { return flex.FmtErrorf("[ERROR] Error setting git_config %s", err) } @@ -260,14 +260,14 @@ func dataSourceSnapshotsListGetNext(next interface{}) int64 { return convertedVal } -func dataSourceFeaturesListFlattenSnapshots(result []appconfigurationv1.SnapshotResponseGetApi) (snapshots []map[string]interface{}) { +func dataSourceFeaturesListFlattenSnapshots(result []appconfigurationv1.GitConfig) (snapshots []map[string]interface{}) { for _, snapshotsItem := range result { snapshots = append(snapshots, dataSourceSnapshotsListSnapshotsToMap(snapshotsItem)) } return snapshots } -func dataSourceSnapshotsListSnapshotsToMap(snapshotsItem appconfigurationv1.SnapshotResponseGetApi) (snapshotsMap map[string]interface{}) { +func dataSourceSnapshotsListSnapshotsToMap(snapshotsItem appconfigurationv1.GitConfig) (snapshotsMap map[string]interface{}) { snapshotsMap = map[string]interface{}{} if snapshotsItem.GitConfigName != nil { From fd59b9dc1f067bca1dbf08696b922e7d5259ae42 Mon Sep 17 00:00:00 2001 From: Prajwal Jarali Date: Thu, 5 Dec 2024 12:47:30 +0530 Subject: [PATCH 5/8] made code compliant with go fmt requirements --- .../appconfiguration/data_source_ibm_app_config_environment.go | 2 +- .../appconfiguration/data_source_ibm_app_config_environments.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_environment.go b/ibm/service/appconfiguration/data_source_ibm_app_config_environment.go index 390cdbc1fba..81f8e6eab68 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_environment.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_environment.go @@ -88,7 +88,7 @@ func dataSourceIbmAppConfigEnvironmentRead(d *schema.ResourceData, meta interfac } result, response, err := appconfigClient.GetEnvironment(options) if err != nil { - return flex.FmtErrorf("GetEnvironment failed %s\n%s", err, response, err) + return flex.FmtErrorf("GetEnvironment failed %s\n%s", err, response) } d.SetId(fmt.Sprintf("%s/%s", guid, *result.EnvironmentID)) diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_environments.go b/ibm/service/appconfiguration/data_source_ibm_app_config_environments.go index b146dec7b9c..eea156cda09 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_environments.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_environments.go @@ -343,7 +343,7 @@ func dataSourceEnvironmentListURLToMap(urlItem interface{}) (urlMap map[string]i urlMap = map[string]interface{}{} hrefUrl := urlItem.(appconfigurationv1.PaginatedListFirst).Href - if hrefUrl!= nil { + if hrefUrl != nil { urlMap["href"] = hrefUrl } From b53d5c9e033540b30ecb7e2082abf07f77ba6324 Mon Sep 17 00:00:00 2001 From: Prajwal Jarali Date: Fri, 13 Dec 2024 20:25:45 +0530 Subject: [PATCH 6/8] solving errors in struct type matching and string array conversion --- .../data_source_ibm_app_config_collections.go | 15 +++++++++++---- ...ta_source_ibm_app_config_environment_test.go | 2 +- .../data_source_ibm_app_config_environments.go | 8 +++++++- .../data_source_ibm_app_config_features.go | 17 ++++++++++++----- .../data_source_ibm_app_config_property.go | 4 +++- .../data_source_ibm_app_config_segment_test.go | 13 +++++-------- 6 files changed, 39 insertions(+), 20 deletions(-) diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_collections.go b/ibm/service/appconfiguration/data_source_ibm_app_config_collections.go index 7142033b0d1..fcbeb45bc97 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_collections.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_collections.go @@ -353,7 +353,7 @@ func dataSourceCollectionsListGetNext(next interface{}) int64 { return convertedVal } -func dataSourceCollectionListFlattenPagination(result appconfigurationv1.PaginatedListFirst) (finalList []map[string]interface{}) { +func dataSourceCollectionListFlattenPagination(result interface{}) (finalList []map[string]interface{}) { finalList = []map[string]interface{}{} finalMap := dataSourceCollectionsListURLToMap(result) finalList = append(finalList, finalMap) @@ -361,11 +361,18 @@ func dataSourceCollectionListFlattenPagination(result appconfigurationv1.Paginat return finalList } -func dataSourceCollectionsListURLToMap(urlItem appconfigurationv1.PaginatedListFirst) (urlMap map[string]interface{}) { +func dataSourceCollectionsListURLToMap(urlItem interface{}) (urlMap map[string]interface{}) { urlMap = map[string]interface{}{} - if urlItem.Href != nil { - urlMap["href"] = urlItem.Href + var hrefUrl *string + switch urlItem := urlItem.(type) { + case appconfigurationv1.PaginatedListFirst: + hrefUrl = urlItem.Href + case *appconfigurationv1.PaginatedListLast: + hrefUrl = urlItem.Href + } + if hrefUrl != nil { + urlMap["href"] = hrefUrl } return urlMap diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_environment_test.go b/ibm/service/appconfiguration/data_source_ibm_app_config_environment_test.go index 554e205a2a6..7d02fd936f2 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_environment_test.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_environment_test.go @@ -48,7 +48,7 @@ func testAccCheckIbmAppConfigEnvironmentDataSourceConfigBasic(name, envName, env name = "%s" location = "us-south" service = "apprapp" - plan = "standard" + plan = "lite" } resource "ibm_app_config_environment" "app_config_environment_resource1" { name = "%s" diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_environments.go b/ibm/service/appconfiguration/data_source_ibm_app_config_environments.go index eea156cda09..94662ee102c 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_environments.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_environments.go @@ -342,7 +342,13 @@ func dataSourceEnvironmentListFlattenPagination(result interface{}) (finalList [ func dataSourceEnvironmentListURLToMap(urlItem interface{}) (urlMap map[string]interface{}) { urlMap = map[string]interface{}{} - hrefUrl := urlItem.(appconfigurationv1.PaginatedListFirst).Href + var hrefUrl *string + switch urlItem := urlItem.(type) { + case appconfigurationv1.PaginatedListFirst: + hrefUrl = urlItem.Href + case *appconfigurationv1.PaginatedListLast: + hrefUrl = urlItem.Href + } if hrefUrl != nil { urlMap["href"] = hrefUrl } diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_features.go b/ibm/service/appconfiguration/data_source_ibm_app_config_features.go index aaa0c5c6331..1d7a44d067a 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_features.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_features.go @@ -570,19 +570,26 @@ func dataSourceListFeaturesSegmentRulesRulesToMap(rule appconfigurationv1.Target } func dataSourceFeatureListFlattenPagination(result interface{}) (finalList []map[string]interface{}) { - pageResult := result.(appconfigurationv1.PaginatedListFirst) finalList = []map[string]interface{}{} - finalMap := dataSourceFeatureListURLToMap(pageResult) + finalMap := dataSourceFeatureListURLToMap(result) finalList = append(finalList, finalMap) return finalList } -func dataSourceFeatureListURLToMap(urlItem appconfigurationv1.PaginatedListFirst) (urlMap map[string]interface{}) { +func dataSourceFeatureListURLToMap(urlItem interface{}) (urlMap map[string]interface{}) { urlMap = map[string]interface{}{} - if urlItem.Href != nil { - urlMap["href"] = urlItem.Href + var hrefUrl *string + switch urlItem := urlItem.(type) { + case appconfigurationv1.PaginatedListFirst: + hrefUrl = urlItem.Href + case *appconfigurationv1.PaginatedListLast: + hrefUrl = urlItem.Href + } + + if hrefUrl != nil { + urlMap["href"] = hrefUrl } return urlMap diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_property.go b/ibm/service/appconfiguration/data_source_ibm_app_config_property.go index ae5366a7243..c39048cff98 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_property.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_property.go @@ -3,6 +3,7 @@ package appconfiguration import ( "fmt" "strconv" + "strings" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -158,7 +159,8 @@ func dataSourceIbmAppConfigPropertyRead(d *schema.ResourceData, meta interface{} options.SetPropertyID(d.Get("property_id").(string)) if _, ok := d.GetOk("include"); ok { - options.SetInclude(d.Get("include").([]string)) + dataString := d.Get("include").(string) + options.SetInclude(strings.Split(dataString, ",")) } property, response, err := appconfigClient.GetProperty(options) diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_segment_test.go b/ibm/service/appconfiguration/data_source_ibm_app_config_segment_test.go index 4d7ba04e056..b205d4c22fe 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_segment_test.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_segment_test.go @@ -5,9 +5,10 @@ package appconfiguration_test import ( "fmt" + "testing" + acc "github.com/IBM-Cloud/terraform-provider-ibm/ibm/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "testing" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" ) @@ -17,17 +18,15 @@ func TestAccIbmAppConfigSegmentDataSource(t *testing.T) { name := fmt.Sprintf("tf_name_%d", acctest.RandIntRange(10, 100)) segmentID := fmt.Sprintf("tf_segment_id_%d", acctest.RandIntRange(10, 100)) description := fmt.Sprintf("tf_description_%d", acctest.RandIntRange(10, 100)) - tags := "development segment" resource.Test(t, resource.TestCase{ PreCheck: func() { acc.TestAccPreCheck(t) }, Providers: acc.TestAccProviders, Steps: []resource.TestStep{ { - Config: testAccCheckIbmAppConfigSegmentDataSourceConfigBasic(instanceName, name, segmentID, description, tags), + Config: testAccCheckIbmAppConfigSegmentDataSourceConfigBasic(instanceName, name, segmentID, description), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("data.ibm_app_config_segment.ibm_app_config_segment_data1", "name"), - resource.TestCheckResourceAttrSet("data.ibm_app_config_segment.ibm_app_config_segment_data1", "tags"), resource.TestCheckResourceAttrSet("data.ibm_app_config_segment.ibm_app_config_segment_data1", "segment_id"), resource.TestCheckResourceAttrSet("data.ibm_app_config_segment.ibm_app_config_segment_data1", "description"), resource.TestCheckResourceAttrSet("data.ibm_app_config_segment.ibm_app_config_segment_data1", "created_time"), @@ -39,7 +38,7 @@ func TestAccIbmAppConfigSegmentDataSource(t *testing.T) { }) } -func testAccCheckIbmAppConfigSegmentDataSourceConfigBasic(instanceName, name, segmentID, description, tags string) string { +func testAccCheckIbmAppConfigSegmentDataSourceConfigBasic(instanceName, name, segmentID, description string) string { return fmt.Sprintf(` resource "ibm_resource_instance" "app_config_terraform_test456" { name = "%s" @@ -57,13 +56,11 @@ func testAccCheckIbmAppConfigSegmentDataSourceConfigBasic(instanceName, name, se values = ["india", "UK"] } description = "%s" - tags = "%s" } data "ibm_app_config_segment" "ibm_app_config_segment_data1" { guid = ibm_app_config_segment.app_config_segment_resource1.guid segment_id = ibm_app_config_segment.app_config_segment_resource1.segment_id - tags = ibm_app_config_segment.app_config_segment_resource1.tags } - `, instanceName, name, segmentID, description, tags) + `, instanceName, name, segmentID, description) } From 7ac60b804f4d6b12309744b1d0c95f955707ccfb Mon Sep 17 00:00:00 2001 From: Prajwal Jarali Date: Wed, 18 Dec 2024 19:38:58 +0530 Subject: [PATCH 7/8] test file changes --- .../data_source_ibm_app_config_segments_test.go | 5 +---- .../resource_ibm_app_config_environment_test.go | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_segments_test.go b/ibm/service/appconfiguration/data_source_ibm_app_config_segments_test.go index 9f6da322396..9e6473d624c 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_segments_test.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_segments_test.go @@ -29,8 +29,6 @@ func TestAccIbmAppConfigSegmentsDataSourceBasic(t *testing.T) { Config: testAccCheckIbmAppConfigSegmentsDataSourceConfigBasic(instanceName, name, segmentID, description, tags), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("data.ibm_app_config_segments.app_config_segments_data2", "id"), - resource.TestCheckResourceAttrSet("data.ibm_app_config_segments.app_config_segments_data2", "first.#"), - resource.TestCheckResourceAttrSet("data.ibm_app_config_segments.app_config_segments_data2", "last.#"), resource.TestCheckResourceAttrSet("data.ibm_app_config_segments.app_config_segments_data2", "total_count"), resource.TestCheckResourceAttrSet("data.ibm_app_config_segments.app_config_segments_data2", "segments.#"), resource.TestCheckResourceAttrSet("data.ibm_app_config_segments.app_config_segments_data2", "segments.0.segment_id"), @@ -61,11 +59,10 @@ func testAccCheckIbmAppConfigSegmentsDataSourceConfigBasic(instanceName, name, s values = ["india", "UK"] } description = "%s" - tags = "%s" } data "ibm_app_config_segments" "app_config_segments_data2" { guid = ibm_app_config_segment.app_config_segment_resource2.guid } - `, instanceName, name, segmentID, description, tags) + `, instanceName, name, segmentID, description) } diff --git a/ibm/service/appconfiguration/resource_ibm_app_config_environment_test.go b/ibm/service/appconfiguration/resource_ibm_app_config_environment_test.go index 264cb48a549..12a4706ee7d 100644 --- a/ibm/service/appconfiguration/resource_ibm_app_config_environment_test.go +++ b/ibm/service/appconfiguration/resource_ibm_app_config_environment_test.go @@ -67,7 +67,7 @@ func testAccCheckIbmAppConfigEnvironmentConfigBasic(name, envName, environmentID name = "%s" location = "us-south" service = "apprapp" - plan = "standard" + plan = "lite" } resource "ibm_app_config_environment" "app_config_environment_resource1" { name = "%s" From e984a600e669a18892e1bf5ddd93b988c527b04a Mon Sep 17 00:00:00 2001 From: Prajwal Jarali Date: Wed, 18 Dec 2024 20:09:15 +0530 Subject: [PATCH 8/8] added switch cases for hrefUrl --- .../data_source_ibm_app_config_collections.go | 6 +++++- .../data_source_ibm_app_config_environments.go | 6 +++++- .../data_source_ibm_app_config_features.go | 7 +++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_collections.go b/ibm/service/appconfiguration/data_source_ibm_app_config_collections.go index fcbeb45bc97..89d5b1fa7cf 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_collections.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_collections.go @@ -368,7 +368,11 @@ func dataSourceCollectionsListURLToMap(urlItem interface{}) (urlMap map[string]i switch urlItem := urlItem.(type) { case appconfigurationv1.PaginatedListFirst: hrefUrl = urlItem.Href - case *appconfigurationv1.PaginatedListLast: + case appconfigurationv1.PaginatedListLast: + hrefUrl = urlItem.Href + case appconfigurationv1.PaginatedListNext: + hrefUrl = urlItem.Href + case appconfigurationv1.PaginatedListPrevious: hrefUrl = urlItem.Href } if hrefUrl != nil { diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_environments.go b/ibm/service/appconfiguration/data_source_ibm_app_config_environments.go index 94662ee102c..02b60f0c339 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_environments.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_environments.go @@ -346,7 +346,11 @@ func dataSourceEnvironmentListURLToMap(urlItem interface{}) (urlMap map[string]i switch urlItem := urlItem.(type) { case appconfigurationv1.PaginatedListFirst: hrefUrl = urlItem.Href - case *appconfigurationv1.PaginatedListLast: + case appconfigurationv1.PaginatedListLast: + hrefUrl = urlItem.Href + case appconfigurationv1.PaginatedListNext: + hrefUrl = urlItem.Href + case appconfigurationv1.PaginatedListPrevious: hrefUrl = urlItem.Href } if hrefUrl != nil { diff --git a/ibm/service/appconfiguration/data_source_ibm_app_config_features.go b/ibm/service/appconfiguration/data_source_ibm_app_config_features.go index 1d7a44d067a..81b2dfed40d 100644 --- a/ibm/service/appconfiguration/data_source_ibm_app_config_features.go +++ b/ibm/service/appconfiguration/data_source_ibm_app_config_features.go @@ -584,10 +584,13 @@ func dataSourceFeatureListURLToMap(urlItem interface{}) (urlMap map[string]inter switch urlItem := urlItem.(type) { case appconfigurationv1.PaginatedListFirst: hrefUrl = urlItem.Href - case *appconfigurationv1.PaginatedListLast: + case appconfigurationv1.PaginatedListLast: + hrefUrl = urlItem.Href + case appconfigurationv1.PaginatedListNext: + hrefUrl = urlItem.Href + case appconfigurationv1.PaginatedListPrevious: hrefUrl = urlItem.Href } - if hrefUrl != nil { urlMap["href"] = hrefUrl }