Revert "feat(pqlmanifest): implement S3 polling support for PQL manifest (#2726)"

This reverts commit b5cfa92.

Author: StarpTech

router-tests/operations/pql_manifest_test.go

@@ -87,7 +87,7 @@ func TestPQLManifest(t *testing.T) {
 			require.Equal(t, expectedEmployeesBody, res.Body)
 
 			// Verify startup log
-			logEntries := xEnv.Observer().FilterMessageSnippet("Loaded PQL manifest").All()
+			logEntries := xEnv.Observer().FilterMessageSnippet("Loaded initial PQL manifest").All()
 			require.Len(t, logEntries, 1)
 		})
 	})

router/core/init_config_poller.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/wundergraph/cosmo/router/pkg/config"
 	"github.com/wundergraph/cosmo/router/pkg/controlplane/configpoller"
 	"github.com/wundergraph/cosmo/router/pkg/execution_config"
 	"github.com/wundergraph/cosmo/router/pkg/routerconfig"
@@ -12,9 +13,9 @@ import (
 	"go.uber.org/zap"
 )
 
-func getConfigClient(r *Router, registry *ProviderRegistry, providerID string, isFallbackClient bool) (client *routerconfig.Client, err error) {
+func getConfigClient(r *Router, cdnProviders map[string]config.CDNStorageProvider, s3Providers map[string]config.S3StorageProvider, providerID string, isFallbackClient bool) (client *routerconfig.Client, err error) {
 	// CDN Providers
-	if provider, ok := registry.CDN(providerID); ok {
+	if provider, ok := cdnProviders[providerID]; ok {
 		if r.graphApiToken == "" {
 			return nil, errors.New(
 				"graph token is required to fetch execution config from CDN. " +
@@ -49,7 +50,7 @@ func getConfigClient(r *Router, registry *ProviderRegistry, providerID string, i
 	}
 
 	// S3 Providers
-	if provider, ok := registry.S3(providerID); ok {
+	if provider, ok := s3Providers[providerID]; ok {
 		clientOptions := &configs3Provider.ClientOptions{
 			AccessKeyID:     provider.AccessKey,
 			SecretAccessKey: provider.SecretKey,
@@ -120,12 +121,12 @@ func getConfigClient(r *Router, registry *ProviderRegistry, providerID string, i
 }
 
 // InitializeConfigPoller creates a poller to fetch execution config. It is only initialized when a config poller is configured and the router is not started with a static config
-func InitializeConfigPoller(r *Router, registry *ProviderRegistry) (*configpoller.ConfigPoller, error) {
+func InitializeConfigPoller(r *Router, cdnProviders map[string]config.CDNStorageProvider, s3Providers map[string]config.S3StorageProvider) (*configpoller.ConfigPoller, error) {
 	if r.staticExecutionConfig != nil || r.routerConfigPollerConfig == nil || r.configPoller != nil {
 		return nil, nil
 	}
 
-	primaryClient, err := getConfigClient(r, registry, r.routerConfigPollerConfig.Storage.ProviderID, false)
+	primaryClient, err := getConfigClient(r, cdnProviders, s3Providers, r.routerConfigPollerConfig.Storage.ProviderID, false)
 	if err != nil {
 		return nil, err
 	}
@@ -140,7 +141,7 @@ func InitializeConfigPoller(r *Router, registry *ProviderRegistry) (*configpolle
 			return nil, errors.New("cannot use the same storage as both primary and fallback provider for execution config")
 		}
 
-		fallbackClient, err = getConfigClient(r, registry, r.routerConfigPollerConfig.FallbackStorage.ProviderID, true)
+		fallbackClient, err = getConfigClient(r, cdnProviders, s3Providers, r.routerConfigPollerConfig.FallbackStorage.ProviderID, true)
 		if err != nil {
 			return nil, err
 		}