Use the correct Permit API Instead of CloudPDP API

pkg/api/api.go

@@ -175,9 +175,8 @@ func NewFactsClientConfig(config *config.PermitConfig) *openapi.Configuration {
 
 func NewPermitApiClient(config *config.PermitConfig) *PermitApiClient {
 	baseClientConfig := NewClientConfig(config)
-	factsClientConfig := NewFactsClientConfig(config)
 	client := openapi.NewAPIClient(baseClientConfig)
-	factsClient := openapi.NewAPIClient(factsClientConfig)
+
 	return &PermitApiClient{
 		config:               config,
 		logger:               config.Logger,
@@ -188,18 +187,18 @@ func NewPermitApiClient(config *config.PermitConfig) *PermitApiClient {
 		ImplicitGrants:       NewImplicitGrantsApi(client, config),
 		Projects:             NewProjectsApi(client, config),
 		ProxyConfigs:         NewProxyConfigsApi(client, config),
-		RelationshipTuples:   NewRelationshipTuplesApi(factsClient, config),
+		RelationshipTuples:   NewRelationshipTuplesApi(client, config),
 		ResourceActionGroups: NewResourceActionGroupsApi(client, config),
 		ResourceActions:      NewResourceActionsApi(client, config),
 		ResourceAttributes:   NewResourceAttributesApi(client, config),
-		ResourceInstances:    NewResourceInstancesApi(factsClient, config),
+		ResourceInstances:    NewResourceInstancesApi(client, config),
 		ResourceRelations:    NewResourceRelationsApi(client, config),
 		ResourceRoles:        NewResourceRolesApi(client, config),
 		Resources:            NewResourcesApi(client, config),
-		RoleAssignments:      NewRoleAssignmentsApi(factsClient, config),
+		RoleAssignments:      NewRoleAssignmentsApi(client, config),
 		Roles:                NewRolesApi(client, config),
-		Tenants:              NewTenantsApi(factsClient, config),
-		Users:                NewUsersApi(factsClient, config),
+		Tenants:              NewTenantsApi(client, config),
+		Users:                NewUsersApi(client, config),
 	}
 }
 

pkg/config/config.go

@@ -39,6 +39,7 @@ type IPermitConfig interface {
 	GetDebug() bool
 	GetContext() *PermitContext
 	GetLogger() *zap.Logger
+	// Deprecated: GetProxyFactsViaPDP will be removed in future versions.
 	GetProxyFactsViaPDP() bool
 	GetFactsSyncTimeout() *time.Duration
 	GetFactsSyncTimeoutPolicy() FactsSyncTimeoutPolicy

pkg/tests/integration_test.go

@@ -135,8 +135,7 @@ func factsApi(ctx context.Context, t *testing.T, permitContext *config.PermitCon
 		WithApiUrl(os.Getenv("API_URL")).
 		WithContext(permitContext).
 		WithLogger(logger).
-		WithProxyFactsViaPDP(true).
-		WithFactsSyncTimeout(10 * time.Second).
+		WithProxyFactsViaPDP(false).
 		Build())
 
 	resourceKey := randKey(runId, "resource")
@@ -163,7 +162,8 @@ func factsApi(ctx context.Context, t *testing.T, permitContext *config.PermitCon
 
 	_, err = permitClient.Api.Users.AssignRole(ctx, userKey, roleKey, "default")
 	assert.NoError(t, err)
-	// check if user has permission immediately
+	// Wait for facts to sync to PDP before checking permission
+	time.Sleep(15 * time.Second)
 	allowed, err := permitClient.Check(enforcement.UserBuilder(userKey).Build(), "read", enforcement.ResourceBuilder(resourceKey).Build())
 	assert.NoError(t, err)
 	assert.True(t, allowed)