Merge branch 'main' into BED-4126

cmd/api/src/config/config.go

@@ -125,11 +125,6 @@ type SAMLConfiguration struct {
 	ServiceProviderCertificateCAChain string `json:"sp_ca_chain"`
 }
 
-type SpecterAuthConfiguration struct {
-	InstanceUUID string `json:"instance_uuid"`
-	Token        string `json:"token"`
-}
-
 type DefaultAdminConfiguration struct {
 	PrincipalName string `json:"principal_name"`
 	Password      string `json:"password"`
@@ -156,7 +151,6 @@ type Configuration struct {
 	Neo4J                        DatabaseConfiguration     `json:"neo4j"`
 	Crypto                       CryptoConfiguration       `json:"crypto"`
 	SAML                         SAMLConfiguration         `json:"saml"`
-	SpecterAuth                  SpecterAuthConfiguration  `json:"specter_auth"`
 	DefaultAdmin                 DefaultAdminConfiguration `json:"default_admin"`
 	CollectorsBasePath           string                    `json:"collectors_base_path"`
 	DatapipeInterval             int                       `json:"datapipe_interval"`

cmd/api/src/database/migration/migrations/v5.14.0.sql

@@ -0,0 +1,18 @@
+-- Copyright 2024 Specter Ops, Inc.
+--
+-- Licensed under the Apache License, Version 2.0
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- SPDX-License-Identifier: Apache-2.0
+
+-- Add PG dual ingest FF
+INSERT INTO feature_flags (created_at, updated_at, key, name, description, enabled, user_updatable) VALUES (current_timestamp, current_timestamp, 'pg_migration_dual_ingest', 'PostgreSQL Migration Dual Ingest', 'Enables dual ingest pathing for both Neo4j and PostgreSQL.', false, false) ON CONFLICT DO NOTHING;