Skip to content

Commit 79214cd

Browse files
TenStMichaelMraka
TenSt
authored and
MichaelMraka
committed
RHINENG-21445: sql test data cleanup
1 parent 2f5f373 commit 79214cd

4 files changed

Lines changed: 1 addition & 83 deletions

File tree

‎dev/test_data.sql‎

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ DELETE FROM advisory_metadata;
1414
DELETE FROM template;
1515
DELETE FROM rh_account;
1616
DELETE FROM strings;
17-
DELETE FROM inventory.hosts_v1_0;
1817

1918
INSERT INTO rh_account (id, name, org_id) VALUES
2019
(1, 'acc-1', 'org_1'), (2, 'acc-2', 'org_2'), (3, 'acc-3', 'org_3'), (4, 'acc-4', 'org_4');
@@ -203,63 +202,6 @@ INSERT INTO system_package2 (rh_account_id, system_id, name_id, package_id, inst
203202
INSERT INTO timestamp_kv (name, value) VALUES
204203
('last_eval_repo_based', '2018-04-05T01:23:45+02:00');
205204

206-
INSERT INTO inventory.hosts_v1_0 (id, insights_id, account, display_name, tags, updated, created, stale_timestamp, system_profile, reporter, per_reporter_staleness, org_id, groups) VALUES
207-
('00000000000000000000000000000001', '00000000-0000-0000-0001-000000000001', '1', '00000000-0000-0000-0000-000000000001', '[{"key": "k1", "value": "val1", "namespace": "ns1"},{"key": "k2", "value": "val2", "namespace": "ns1"}]',
208-
'2018-09-22 12:00:00-04', '2018-08-26 12:00:00-04', '2018-08-26 12:00:00-04', '{"workloads": {"sap": {"sap_system": true, "sids": ["ABC", "DEF", "GHI"]}}, "operating_system": {"name": "RHEL", "major": 8, "minor": 10}, "rhsm": {"version": "8.10"}}',
209-
'puptoo', '{}', 'org_1', '[{"id": "inventory-group-1", "name": "group1"}]'),
210-
('00000000000000000000000000000002', '00000000-0000-0000-0002-000000000001', '1', '00000000-0000-0000-0000-000000000002', '[{"key": "k1", "value": "val1", "namespace": "ns1"},{"key": "k2", "value": "val2", "namespace": "ns1"},{"key": "k3", "value": "val3", "namespace": "ns1"}]',
211-
'2018-09-22 12:00:00-04', '2018-08-26 12:00:00-04', '2018-08-26 12:00:00-04', '{"workloads": {"sap": {"sap_system": true, "sids": ["ABC"]}}, "operating_system": {"name": "RHEL", "major": 8, "minor": 1}, "rhsm": {"version": "8.1"}}',
212-
'puptoo', '{}', 'org_1', '[{"id": "inventory-group-1", "name": "group1"}]'),
213-
('00000000000000000000000000000003', '00000000-0000-0000-0003-000000000001', '1', '00000000-0000-0000-0000-000000000003', '[{"key": "k1", "value": "val1", "namespace": "ns1"}, {"key": "k3", "value": "val4", "namespace": "ns1"}]',
214-
'2018-09-22 12:00:00-04', '2018-08-26 12:00:00-04', '2018-08-26 12:00:00-04', '{"workloads": {"sap": {"sap_system": true}}, "operating_system": {"name": "RHEL", "major": 8, "minor": 1}, "rhsm": {"version": "8.0"}}',
215-
'puptoo', '{}', 'org_1', '[{"id": "inventory-group-1", "name": "group1"}]'),
216-
('00000000000000000000000000000004', '00000000-0000-0000-0004-000000000001', '1', '00000000-0000-0000-0000-000000000004', '[{"key": "k3", "value": "val4", "namespace": "ns1"}]',
217-
'2018-09-22 12:00:00-04', '2018-08-26 12:00:00-04', '2018-08-26 12:00:00-04', '{"workloads": {"sap": {"sap_system": true}}, "operating_system": {"name": "RHEL", "major": 8, "minor": 2}, "rhsm": {"version": "8.3"}, "owner_id": "cccccccc-0000-0000-0001-000000000004"}',
218-
'puptoo', '{}', 'org_1', '[{"id": "inventory-group-1", "name": "group1"}]'),
219-
('00000000000000000000000000000005', '00000000-0000-0000-0005-000000000001', '1', '00000000-0000-0000-0000-000000000005', '[{"key": "k1", "value": "val1", "namespace": "ns1"}]',
220-
'2018-09-22 12:00:00-04', '2018-08-26 12:00:00-04', '2018-08-26 12:00:00-04', '{"workloads": {"sap": {"sap_system": true}}, "operating_system": {"name": "RHEL", "major": 8, "minor": 3}, "rhsm": {"version": "8.3"}, "owner_id": "cccccccc-0000-0000-0001-000000000005"}',
221-
'puptoo', '{}', 'org_1', '[{"id": "inventory-group-1", "name": "group1"}]'),
222-
('00000000000000000000000000000006', '00000000-0000-0000-0006-000000000001', '1', '00000000-0000-0000-0000-000000000006', '[{"key": "k1", "value": "val1", "namespace": "ns1"}]',
223-
'2018-09-22 12:00:00-04', '2018-08-26 12:00:00-04', '2018-08-26 12:00:00-04', '{"workloads": {"sap": {"sap_system": true}, "mssql": { "version": "15.3.0"}}, "operating_system": {"name": "RHEL", "major": 7, "minor": 3}, "rhsm": {"version": "7.3"}}',
224-
'puptoo', '{}', 'org_1', '[{"id": "inventory-group-1", "name": "group1"}]'),
225-
('00000000000000000000000000000007', '00000000-0000-0000-0007-000000000001', '1', '00000000-0000-0000-0000-000000000007','[{"key": "k1", "value": "val1", "namespace": "ns1"}]',
226-
'2018-09-22 12:00:00-04', '2018-08-26 12:00:00-04', '2018-08-26 12:00:00-04', '{"workloads": {"sap": {"sap_system": true}, "ansible": {"controller_version": "1.0"}}, "operating_system": {"name": "RHEL", "major": 8, "minor": "x"}, "rhsm": {"version": "8.x"}, "owner_id": "cccccccc-0000-0000-0001-000000000007"}',
227-
'puptoo', '{}', 'org_1', '[{"id": "inventory-group-2", "name": "group2"}]'),
228-
('00000000000000000000000000000008', '00000000-0000-0000-0008-000000000001', '1', '00000000-0000-0000-0000-000000000008', '[{"key": "k1", "value": "val1", "namespace": "ns1"}]',
229-
'2018-09-22 12:00:00-04', '2018-08-26 12:00:00-04', '2018-08-26 12:00:00-04', '{"workloads": {"sap": {"sap_system": true}}, "operating_system": {"name": "RHEL", "major": 8, "minor": 3}, "rhsm": {"version": "8.3"}, "owner_id": "cccccccc-0000-0000-0001-000000000008"}',
230-
'puptoo', '{}', 'org_1', '[{"id": "inventory-group-2", "name": "group2"}]'),
231-
('00000000000000000000000000000009', '00000000-0000-0000-0009-000000000001', '2', '00000000-0000-0000-0000-000000000009', '[{"key": "k1", "value": "val1", "namespace": "ns1"}]',
232-
'2018-09-22 12:00:00-04', '2018-08-26 12:00:00-04', '2018-08-26 12:00:00-04', '{"workloads": {"sap": {"sap_system": true}}, "operating_system": {"name": "RHEL", "major": 8, "minor": 1}, "rhsm": {"version": "8.1"}}',
233-
'puptoo', '{}', 'org_2', NULL),
234-
('00000000000000000000000000000010', '00000000-0000-0000-0010-000000000001', '2', '00000000-0000-0000-0000-000000000010', '[{"key": "k1", "value": "val1", "namespace": "ns1"}]',
235-
'2018-09-22 12:00:00-04', '2018-08-26 12:00:00-04', '2018-08-26 12:00:00-04', '{"workloads": {"sap": {"sap_system": true}}, "operating_system": {"name": "RHEL", "major": 8, "minor": 2}, "rhsm": {"version": "8.2"}}',
236-
'puptoo', '{}', 'org_2', NULL),
237-
('00000000000000000000000000000011', '00000000-0000-0000-0011-000000000001', '2', '00000000-0000-0000-0000-000000000011', '[{"key": "k1", "value": "val1", "namespace": "ns1"}]',
238-
'2018-09-22 12:00:00-04', '2018-08-26 12:00:00-04', '2018-08-26 12:00:00-04', '{"workloads": {"sap": {"sap_system": true}}, "operating_system": {"name": "RHEL", "major": 8, "minor": 3}, "rhsm": {"version": "8.3"}}',
239-
'puptoo', '{}', 'org_2', '[]'),
240-
('00000000000000000000000000000012', '00000000-0000-0000-0012-000000000001', '3', '00000000-0000-0000-0000-000000000012', '[{"key": "k1", "value": "val1", "namespace": "ns1"}]',
241-
'2018-09-22 12:00:00-04', '2018-08-26 12:00:00-04', '2018-08-26 12:00:00-04', '{"workloads": {"sap": {"sap_system": true}}, "operating_system": {"name": "RHEL", "major": 8, "minor": 1}, "rhsm": {"version": "8.1"}}',
242-
'puptoo', '{}', 'org_3', '[]'),
243-
('00000000000000000000000000000013', '00000000-0000-0000-0013-000000000001', '3', '00000000-0000-0000-0000-000000000013', '[{"key": "k1", "value": "val1", "namespace": "ns1"}]',
244-
'2018-09-22 12:00:00-04', '2018-08-26 12:00:00-04', '2018-08-26 12:00:00-04', '{"workloads": {"sap": {"sap_system": true}}, "operating_system": {"name": "RHEL", "major": 8, "minor": 2}, "rhsm": {"version": "8.2"}}',
245-
'puptoo', '{}', 'org_3', '[]'),
246-
('00000000000000000000000000000014', '00000000-0000-0000-0014-000000000001', '3', '00000000-0000-0000-0000-000000000014', '[{"key": "k1", "value": "val1", "namespace": "ns1"}]',
247-
'2018-09-22 12:00:00-04', '2018-08-26 12:00:00-04', '2018-08-26 12:00:00-04', '{"workloads": {"sap": {"sap_system": true}}, "operating_system": {"name": "RHEL", "major": 8, "minor": 3}}',
248-
'puptoo', '{}', 'org_3', '[]'),
249-
('00000000000000000000000000000015', '00000000-0000-0000-0015-000000000001', '3', '00000000-0000-0000-0000-000000000015', '[{"key": "k3", "value": "val4", "namespace": "ns1"}]',
250-
'2018-09-22 12:00:00-04', '2018-08-26 12:00:00-04', '2018-08-26 12:00:00-04', '{"workloads": {"sap": {"sap_system": false}}, "operating_system": {"name": "RHEL", "major": 8, "minor": 1}, "rhsm": {"version": "8.1"}}',
251-
'puptoo', '{}', 'org_3', '[]'),
252-
('00000000000000000000000000000016', '00000000-0000-0000-0016-000000000001', '3', '00000000-0000-0000-0000-000000000016', '[]',
253-
'2018-09-22 12:00:00-04', '2018-08-26 12:00:00-04', '2018-08-26 12:00:00-04', '{"workloads": {"sap": {"sap_system": false}}, "operating_system": {"name": "RHEL", "major": 8, "minor": 2}, "rhsm": {"version": "8.2"}}',
254-
'puptoo', '{}', 'org_3', '[]'),
255-
('00000000000000000000000000000017', '00000000-0000-0000-0017-000000000001', '3', '00000000-0000-0000-0000-000000000017', '[]',
256-
'2018-09-22 12:00:00-04', '2018-08-26 12:00:00-04', '2018-08-26 12:00:00-04',
257-
'{"rhsm": {"version": "8.1"}, "operating_system": {"name": "RHEL", "major": 8, "minor": 1}, "workloads": {"ansible": {"controller_version": "1.0", "hub_version": "3.4.1", "catalog_worker_version": "100.387.9846.12", "sso_version": "1.28.3.52641.10000513168495123"}, "mssql": { "version": "15.3.0"}}}',
258-
'puptoo', '{}', 'org_3', '[]'),
259-
('00000000000000000000000000000018', '00000000-0000-0000-0018-000000000001', '1', '00000000-0000-0000-0000-000000000018', '[{"key": "k3", "value": "val4", "namespace": "ns1"}]',
260-
'2018-09-22 12:00:00-04', '2018-08-26 12:00:00-04', '2018-08-26 12:00:00-04', '{"workloads": {"sap": {"sap_system": true}}, "operating_system": {"name": "RHEL", "major": 8, "minor": 2}, "rhsm": {"version": "8.3"}, "owner_id": "99999999-9999-9999-9999-999999999404"}',
261-
'puptoo', '{}', 'org_1', '[{"id": "inventory-group-1", "name": "group1"}]');
262-
263205
SELECT refresh_all_cached_counts();
264206

265207
ALTER TABLE advisory_metadata ALTER COLUMN id RESTART WITH 100;

‎dev/test_generate_data.sql‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,6 @@ do $$
124124
$$
125125
;
126126

127-
-- fill inventory.hosts from system platform
128-
truncate table inventory.hosts;
129-
insert into inventory.hosts (id, account, display_name, tags, updated, created, stale_timestamp,
130-
system_profile, reporter, per_reporter_staleness, org_id, groups )
131-
select sp.inventory_id, substr(ac.name, 0, 10), sp.display_name, '{}', sp.last_updated, sp.last_updated, coalesce(sp.stale_timestamp, now()),
132-
'{}', 'puptoo', '{}', ac.org_id, '[]'
133-
from system_platform sp
134-
join rh_account ac on sp.rh_account_id = ac.id ;
135-
136-
137127
-- generate advisory_metadata
138128
-- duration: 3s / 60k advisories (on RDS)
139129
alter sequence advisory_metadata_id_seq restart with 1;

‎dev/version_data.sql‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎scripts/feed_db.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func main() {
1717
return
1818
}
1919
}
20-
// create inventory.hosts and feed db
20+
// create inventory.hosts (for migration to pass on new envs) and feed db
2121
createInventoryHosts()
2222
feed()
2323
}

0 commit comments

Comments
 (0)