Merge branch 'master' into remote-relationships-permissions

server/src-lib/Hasura/RQL/DDL/Metadata.hs

@@ -76,88 +76,8 @@ runClearMetadata _ = do
   buildSchemaCacheStrict
   return successMsg
 
-applyQP1
-  :: (QErrM m)
-  => ReplaceMetadata -> m ()
-applyQP1 (ReplaceMetadata _ tables functionsMeta remoteSchemas
-          collections
-          allowlist  _ actions
-          cronTriggers) = do
-  withPathK "tables" $ do
-
-    checkMultipleDecls "tables" $ map _tmTable tables
-
-    -- process each table
-    void $ indexedForM tables $ \table -> withTableName (table ^. tmTable) $ do
-      let allRels  = map Relationship.rdName (table ^. tmObjectRelationships) <>
-                     map Relationship.rdName (table ^. tmArrayRelationships)
-
-          insPerms = map Permission.pdRole $ table ^. tmInsertPermissions
-          selPerms = map Permission.pdRole $ table ^. tmSelectPermissions
-          updPerms = map Permission.pdRole $ table ^. tmUpdatePermissions
-          delPerms = map Permission.pdRole $ table ^. tmDeletePermissions
-          eventTriggers = map etcName $ table ^. tmEventTriggers
-          computedFields = map _cfmName $ table ^. tmComputedFields
-          remoteRelationships = map _rrmName $ table ^. tmRemoteRelationships
-
-      checkMultipleDecls "relationships" allRels
-      checkMultipleDecls "insert permissions" insPerms
-      checkMultipleDecls "select permissions" selPerms
-      checkMultipleDecls "update permissions" updPerms
-      checkMultipleDecls "delete permissions" delPerms
-      checkMultipleDecls "event triggers" eventTriggers
-      checkMultipleDecls "computed fields" computedFields
-      checkMultipleDecls "remote relationships" remoteRelationships
-
-  withPathK "functions" $
-    case functionsMeta of
-      FMVersion1 qualifiedFunctions ->
-        checkMultipleDecls "functions" qualifiedFunctions
-      FMVersion2 functionsV2 ->
-        checkMultipleDecls "functions" $ map Schema._tfv2Function functionsV2
-
-  withPathK "remote_schemas" $ do
-
-    checkMultipleDecls "remote schemas" $ map _rsmName remoteSchemas
-
-    void $ indexedForM remoteSchemas $ \(RemoteSchemaMeta _ _ _ perms) ->
-      onJust perms $ (checkMultipleDecls "remote schema permissions" . map _rspmRole)
-
-  withPathK "query_collections" $
-    checkMultipleDecls "query collections" $ map Collection._ccName collections
-
-  withPathK "allowlist" $
-    checkMultipleDecls "allow list" $ map Collection._crCollection allowlist
-
-  withPathK "actions" $
-    checkMultipleDecls "actions" $ map _amName actions
-
-  withPathK "cron_triggers" $
-    checkMultipleDecls "cron triggers" $ map ctName cronTriggers
-
-  where
-    withTableName qt = withPathK (qualifiedObjectToText qt)
-
-    checkMultipleDecls t l = do
-      let dups = getDups l
-      unless (null dups) $
-        throw400 AlreadyExists $ "multiple declarations exist for the following " <> t <> " : "
-        <> T.pack (show dups)
-
-    getDups l =
-      l L.\\ HS.toList (HS.fromList l)
-
-applyQP2
-  :: (CacheRWM m, MonadTx m, HasSystemDefined m, HasEnableRemoteSchemaPermsCtx m)
-  => ReplaceMetadata -> m EncJSON
-applyQP2 replaceMetadata = do
-  clearUserMetadata
-  saveMetadata replaceMetadata
-  buildSchemaCacheStrict
-  pure successMsg
-
-saveMetadata :: (MonadTx m, HasSystemDefined m, HasEnableRemoteSchemaPermsCtx m) => ReplaceMetadata -> m ()
-saveMetadata (ReplaceMetadata _ tables functionsMeta
+saveMetadata :: (MonadTx m, HasSystemDefined m, HasEnableRemoteSchemaPermsCtx m) => Metadata -> m ()
+saveMetadata (Metadata tables functions
               remoteSchemas collections allowlist customTypes actions cronTriggers) = do
 
   withPathK "tables" $ do
@@ -214,7 +134,7 @@ saveMetadata (ReplaceMetadata _ tables functionsMeta
 
   -- remote schemas
   withPathK "remote_schemas" $
-    indexedForM_ remoteSchemas $ \(RemoteSchemaMeta name defn comment mPermissions) -> do
+    indexedForM_ remoteSchemas $ \(RemoteSchemaMetadata name defn comment mPermissions) -> do
       liftTx $ addRemoteSchemaToCatalog $ AddRemoteSchemaQuery name defn comment
       onJust mPermissions $ \permissions ->
         withPathK (unNonEmptyText $ unRemoteSchemaName name) $ do
@@ -227,7 +147,7 @@ saveMetadata (ReplaceMetadata _ tables functionsMeta
               throw400 ConstraintViolation
                 $ "remote schema permissions can only be added when "
                 <> "remote schema permissions are enabled in the graphql-engine"
-            indexedForM_ permissions $ \(RemoteSchemaPermissionMeta role permDefn permComment) ->
+            indexedForM_ permissions $ \(RemoteSchemaPermissionMetadata role permDefn permComment) ->
               liftTx $ RemoteSchema.addRemoteSchemaPermissionsToCatalog
               $ AddRemoteSchemaPermissions name role permDefn permComment
 
@@ -317,7 +237,7 @@ fetchMetadataFromHdbTables = liftTx do
   functions <- Q.catchE defaultTxErrorHandler fetchFunctions
 
   -- fetch all remote schemas
-  remoteSchemas <- oMapFromL _arsqName <$> fetchRemoteSchemas
+  remoteSchemas <- oMapFromL _rsmName <$> fetchRemoteSchemas
 
   -- fetch all collections
   collections <- oMapFromL _ccName <$> fetchCollections
@@ -400,18 +320,6 @@ fetchMetadataFromHdbTables = liftTx do
         flip map l $ \(sn, fn, Q.AltJ config) ->
                        FunctionMetadata (QualifiedObject sn fn) config
 
-    fetchRemoteSchemas =
-      map fromRow <$> Q.listQE defaultTxErrorHandler
-        [Q.sql|
-         SELECT name, definition, comment
-           FROM hdb_catalog.remote_schemas
-         ORDER BY name ASC
-         |] () True
-      where
-        fromRow (name, Q.AltJ def, comment) =
-          AddRemoteSchemaQuery name def comment
-
-
     fetchCollections =
       map fromRow <$> Q.listQE defaultTxErrorHandler [Q.sql|
                SELECT collection_name, collection_defn::json, comment

server/src-lib/Hasura/RQL/DDL/Metadata/Generator.hs

@@ -390,10 +390,10 @@ instance Arbitrary G.SchemaDocument where
 instance Arbitrary RemoteSchemaPermissionDefinition where
   arbitrary = genericArbitrary
 
-instance Arbitrary RemoteSchemaPermissionMeta where
+instance Arbitrary RemoteSchemaPermissionMetadata where
   arbitrary = genericArbitrary
 
-instance Arbitrary RemoteSchemaMeta where
+instance Arbitrary RemoteSchemaMetadata where
   arbitrary = genericArbitrary
 
 sampleCronSchedules :: [CronSchedule]