Stage/v5.15.0 (#851)

* BED-4726 move gin index migration to 5.15 release (#833) * BED-4363 fix: schema inserts manually providing ids (#835) * bump hound versions (#834) * BED-4797 chore: add license to file (#837) * Bump hound versions (#842) --------- Co-authored-by: Michael Lipka <[email protected]> Co-authored-by: mistahj67 <[email protected]> Co-authored-by: Stephen Hinck <[email protected]>
SpecterOps · Sep 11, 2024 · 17d9f70 · 17d9f70
1 parent 3527767
commit 17d9f70
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 27 deletions.
diff --git a/cmd/api/src/database/migration/migrations/schema.sql b/cmd/api/src/database/migration/migrations/schema.sql
@@ -660,5 +660,5 @@ INSERT INTO feature_flags (created_at, updated_at, key, name, description, enabl
 
 
 -- Populate parameters table
-INSERT INTO parameters (key, name, description, value, id, created_at, updated_at) VALUES ('auth.password_expiration_window', 'Local Auth Password Expiry Window', 'This configuration parameter sets the local auth password expiry window for users that have valid auth secrets. Values for this configuration must follow the duration specification of ISO-8601.', '{"duration": "P90D"}', 1, current_timestamp, current_timestamp);
-INSERT INTO parameters (key, name, description, value, id, created_at, updated_at) VALUES ('neo4j.configuration', 'Neo4j Configuration Parameters', 'This configuration parameter sets the BatchWriteSize and the BatchFlushSize for Neo4J.', '{"batch_write_size": 20000, "write_flush_size": 100000}', 2, current_timestamp, current_timestamp);
+INSERT INTO parameters (key, name, description, value, created_at, updated_at) VALUES ('auth.password_expiration_window', 'Local Auth Password Expiry Window', 'This configuration parameter sets the local auth password expiry window for users that have valid auth secrets. Values for this configuration must follow the duration specification of ISO-8601.', '{"duration": "P90D"}', current_timestamp, current_timestamp);
+INSERT INTO parameters (key, name, description, value, created_at, updated_at) VALUES ('neo4j.configuration', 'Neo4j Configuration Parameters', 'This configuration parameter sets the BatchWriteSize and the BatchFlushSize for Neo4J.', '{"batch_write_size": 20000, "write_flush_size": 100000}', current_timestamp, current_timestamp);
diff --git a/cmd/api/src/database/migration/migrations/v5.15.0.sql b/cmd/api/src/database/migration/migrations/v5.15.0.sql
@@ -73,3 +73,8 @@ INSERT INTO roles_permissions (role_id, permission_id) VALUES ((SELECT id FROM r
 INSERT INTO roles_permissions (role_id, permission_id) VALUES ((SELECT id FROM roles WHERE roles.name  = 'Power User'), (SELECT id FROM permissions WHERE permissions.authority  = 'saved_queries'  and permissions.name = 'Read')) ON CONFLICT DO NOTHING;
 INSERT INTO roles_permissions (role_id, permission_id) VALUES ((SELECT id FROM roles WHERE roles.name  = 'Power User'), (SELECT id FROM permissions WHERE permissions.authority  = 'saved_queries'  and permissions.name = 'Write')) ON CONFLICT DO NOTHING;
 INSERT INTO roles_permissions (role_id, permission_id) VALUES ((SELECT id FROM roles WHERE roles.name  = 'Power User'), (SELECT id FROM permissions WHERE permissions.authority  = 'graphdb'  AND permissions.name = 'Mutate')) ON CONFLICT DO NOTHING;
+
+CREATE EXTENSION IF NOT EXISTS pg_trgm;
+
+CREATE INDEX IF NOT EXISTS idx_saved_queries_description ON saved_queries using gin(description gin_trgm_ops);
+CREATE INDEX IF NOT EXISTS idx_saved_queries_name ON saved_queries USING gin(name gin_trgm_ops);
diff --git a/cmd/api/src/database/migration/migrations/v5.16.0.sql b/cmd/api/src/database/migration/migrations/v5.16.0.sql
diff --git a/dockerfiles/bloodhound.Dockerfile b/dockerfiles/bloodhound.Dockerfile
@@ -17,8 +17,8 @@
 ########
 # Global build args
 ################
-ARG SHARPHOUND_VERSION=v2.4.1
-ARG AZUREHOUND_VERSION=v2.1.9
+ARG SHARPHOUND_VERSION=v2.5.6
+ARG AZUREHOUND_VERSION=v2.2.1
 
 ########
 # Golang Image

diff --git a/tools/docker-compose/api.Dockerfile b/tools/docker-compose/api.Dockerfile
@@ -17,8 +17,8 @@
 ########
 # Global build args
 ################
-ARG SHARPHOUND_VERSION=v2.4.1
-ARG AZUREHOUND_VERSION=v2.1.9
+ARG SHARPHOUND_VERSION=v2.5.6
+ARG AZUREHOUND_VERSION=v2.2.1
 
 ########
 # Package other assets