From ab23e28768bd702ead00b102e12c306027931193 Mon Sep 17 00:00:00 2001 From: Bojan Serafimov Date: Fri, 9 Jun 2023 09:50:05 -0400 Subject: [PATCH] revert test changes --- Makefile | 3 --- control_plane/src/endpoint.rs | 28 +++------------------------- 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/Makefile b/Makefile index 694982c625..ae979b8b4c 100644 --- a/Makefile +++ b/Makefile @@ -108,8 +108,6 @@ postgres-%: postgres-configure-% \ $(MAKE) -C $(POSTGRES_INSTALL_DIR)/build/$*/contrib/pg_buffercache install +@echo "Compiling pageinspect $*" $(MAKE) -C $(POSTGRES_INSTALL_DIR)/build/$*/contrib/pageinspect install - +@echo "Compiling pg_stat_statements $*" - $(MAKE) -C $(POSTGRES_INSTALL_DIR)/build/$*/contrib/pg_stat_statements install .PHONY: postgres-clean-% postgres-clean-%: @@ -117,7 +115,6 @@ postgres-clean-%: $(MAKE) -C $(POSTGRES_INSTALL_DIR)/build/$*/contrib/pg_buffercache clean $(MAKE) -C $(POSTGRES_INSTALL_DIR)/build/$*/contrib/pageinspect clean $(MAKE) -C $(POSTGRES_INSTALL_DIR)/build/$*/src/interfaces/libpq clean - $(MAKE) -C $(POSTGRES_INSTALL_DIR)/build/$*/contrib/pg_stat_statements clean .PHONY: neon-pg-ext-% neon-pg-ext-%: postgres-% diff --git a/control_plane/src/endpoint.rs b/control_plane/src/endpoint.rs index 8127a86582..b28315a35d 100644 --- a/control_plane/src/endpoint.rs +++ b/control_plane/src/endpoint.rs @@ -43,9 +43,6 @@ use std::sync::Arc; use std::time::Duration; use anyhow::{anyhow, bail, Context, Result}; -use compute_api::spec::Database; -use compute_api::spec::GenericOption; -use compute_api::spec::Role; use serde::{Deserialize, Serialize}; use serde_with::{serde_as, DisplayFromStr}; use utils::id::{NodeId, TenantId, TimelineId}; @@ -459,28 +456,9 @@ impl Endpoint { cluster_id: None, // project ID: not used name: None, // project name: not used state: None, - // TODO pass this info from the test - roles: (0..100).map(|i| Role { - name: format!("test_role_{i}").into(), - encrypted_password: None, - options: None, - }).collect(), - databases: (0..100).map(|i| Database { - name: format!("test_database_{i}").into(), - owner: "test_role_0".into(), - options: None, - }).collect(), - settings: Some(vec![ - GenericOption { - name: "shared_preload_libraries".into(), - value: Some("neon,pg_stat_statements".into()), - // TODO test with this larger list of extensions. But first they - // need to be built (see compute dockerfile). - // - // value: Some("neon,pg_stat_statements,timescaledb,pg_cron".into()), - vartype: "string".into(), - }, - ]), + roles: vec![], + databases: vec![], + settings: None, postgresql_conf: Some(postgresql_conf), }, delta_operations: None,