Fix BCP Exporter Dependencies and Add Deterministic Output (#2187)

* Fix BCP exporter so that the name output is correct, and flows export dependencies correctly

* Sort BCP exporter output for deterministic and reproducable output

* Fix a few bugs in the dependent_consumers package and ensure output is sorted

* Fix tests

* Break out make sideload-only as a separate command for better build handling with BCP

* PR feedback

Author: bbbco

GNUmakefile

@@ -71,9 +71,11 @@ build:
 GOOS = $(shell go env GOOS)
 GOARCH = $(shell go env GOARCH)
 
-sideload: build
+sideload-only:
 	mkdir -p ${PLUGINS_DIR}/${PLUGIN_PATH}/${DEV_VERSION}/$(GOOS)_$(GOARCH)
 	cp ${BIN_PATH} ${PLUGINS_DIR}/${PLUGIN_PATH}/${DEV_VERSION}/$(GOOS)_$(GOARCH)/${BIN_NAME}
 
+sideload: build sideload-only
+
 generate-dependencyTree:
-	go run ./tools/dependency_tree "public/data/" $(version)
+	go run ./tools/dependency_tree "public/data/" $(version)

genesyscloud/bcp_tf_exporter/genesyscloud_bcp_tf_exporter_init_test.go

@@ -0,0 +1,51 @@
+package bcp_tf_exporter
+
+import (
+	"sync"
+	"testing"
+
+	"github.com/mypurecloud/terraform-provider-genesyscloud/genesyscloud/architect_flow"
+	"github.com/mypurecloud/terraform-provider-genesyscloud/genesyscloud/group"
+	"github.com/mypurecloud/terraform-provider-genesyscloud/genesyscloud/user"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+/*
+   The genesyscloud_bcp_tf_exporter_init_test.go file is used to initialize the resources
+   used in testing the bcp_tf_exporter resource.
+*/
+
+type registerTestInstance struct {
+	resourceMapMutex sync.RWMutex
+}
+
+// registerTestResources registers all resources used in the tests
+func (r *registerTestInstance) registerTestResources() {
+	r.resourceMapMutex.Lock()
+	defer r.resourceMapMutex.Unlock()
+
+	providerResources[ResourceType] = ResourceBcpTfExporter()
+	providerResources[user.ResourceType] = user.ResourceUser()
+	providerResources[group.ResourceType] = group.ResourceGroup()
+	providerResources[architect_flow.ResourceType] = architect_flow.ResourceArchitectFlow()
+}
+
+// initTestResources initializes all test resources and data sources.
+func initTestResources() {
+	providerResources = make(map[string]*schema.Resource)
+
+	regInstance := &registerTestInstance{}
+
+	regInstance.registerTestResources()
+
+}
+
+// TestMain is a "setup" function called by the testing framework when run the test
+func TestMain(m *testing.M) {
+	// Run setup function before starting the test suite for the auth_role package
+	initTestResources()
+
+	// Run the test suite for the auth_role package
+	m.Run()
+}

genesyscloud/bcp_tf_exporter/genesyscloud_bcp_tf_exporter_proxy.go

@@ -0,0 +1,75 @@
+package bcp_tf_exporter
+
+import (
+	"context"
+
+	dependentconsumers "github.com/mypurecloud/terraform-provider-genesyscloud/genesyscloud/dependent_consumers"
+	"github.com/mypurecloud/terraform-provider-genesyscloud/genesyscloud/provider"
+	resourceExporter "github.com/mypurecloud/terraform-provider-genesyscloud/genesyscloud/resource_exporter"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/mypurecloud/platform-client-sdk-go/v179/platformclientv2"
+)
+
+type BcpExporterProxy struct {
+	ClientConfig               *platformclientv2.Configuration
+	GetFlowDependenciesAttr    getFlowDependenciesFunc
+	GetAllWithPooledClientAttr getPooledClientFunc
+}
+
+type getFlowDependenciesFunc func(ctx context.Context, p *BcpExporterProxy, resourceInfo resourceExporter.ResourceInfo) (resourceExporter.ResourceIDMetaMap, *resourceExporter.DependencyResource, error)
+type getPooledClientFunc func(ctx context.Context, method provider.GetCustomConfigFunc) (resourceExporter.ResourceIDMetaMap, *resourceExporter.DependencyResource, []string, diag.Diagnostics)
+
+var InternalProxy *BcpExporterProxy
+
+func GetBcpExporterProxy(ClientConfig *platformclientv2.Configuration) *BcpExporterProxy {
+	return newBcpExporterProxy(ClientConfig)
+}
+
+func newBcpExporterProxy(ClientConfig *platformclientv2.Configuration) *BcpExporterProxy {
+	if InternalProxy == nil {
+		InternalProxy = &BcpExporterProxy{
+			GetAllWithPooledClientAttr: getPooledClientFn,
+		}
+	}
+
+	if ClientConfig != nil {
+		InternalProxy.ClientConfig = ClientConfig
+		InternalProxy.GetFlowDependenciesAttr = getFlowDependenciesFn
+	}
+	return InternalProxy
+}
+
+func (p *BcpExporterProxy) GetFlowDependencies(ctx context.Context, resourceInfo resourceExporter.ResourceInfo) (resourceExporter.ResourceIDMetaMap, *resourceExporter.DependencyResource, error) {
+	return p.GetFlowDependenciesAttr(ctx, p, resourceInfo)
+}
+
+func (p *BcpExporterProxy) GetAllWithPooledClient(ctx context.Context, method provider.GetCustomConfigFunc) (resourceExporter.ResourceIDMetaMap, *resourceExporter.DependencyResource, []string, diag.Diagnostics) {
+	return p.GetAllWithPooledClientAttr(ctx, method)
+}
+
+func getPooledClientFn(ctx context.Context, method provider.GetCustomConfigFunc) (resourceExporter.ResourceIDMetaMap, *resourceExporter.DependencyResource, []string, diag.Diagnostics) {
+	resourceFunc := provider.GetAllWithPooledClientCustom(method)
+	// Pass the context through - don't replace it
+	resources, dependsMap, totalFlowResources, err := resourceFunc(ctx)
+	if err != nil {
+		return nil, nil, totalFlowResources, err
+	}
+	return resources, dependsMap, totalFlowResources, err
+}
+
+func getFlowDependenciesFn(ctx context.Context, p *BcpExporterProxy, resourceInfo resourceExporter.ResourceInfo) (resourceExporter.ResourceIDMetaMap, *resourceExporter.DependencyResource, error) {
+	// Create fresh config to avoid pooled client's canceled context issue
+	// Only copy essential auth settings for efficiency
+	freshConfig := platformclientv2.NewConfiguration()
+	freshConfig.BasePath = p.ClientConfig.BasePath
+	freshConfig.AccessToken = p.ClientConfig.AccessToken
+	freshConfig.DefaultHeader = p.ClientConfig.DefaultHeader // Direct assignment is safe for read-only use
+	
+	depConsumerProxy := dependentconsumers.GetDependentConsumerProxy(freshConfig)
+	resources, dependsMap, _, err := depConsumerProxy.GetDependentConsumers(ctx, resourceInfo, []string{})
+	if err != nil {
+		return nil, nil, err
+	}
+	return resources, dependsMap, nil
+}