@deepnote/database-integrations 1.3.1 → 1.3.3

package/dist/index.js

@@ -17,6 +17,10 @@ const BigQueryAuthMethods = {
 	ServiceAccount: "service-account",
 	GoogleOauth: "google-oauth"
 };
+const TrinoAuthMethods = {
+	Password: "password",
+	Oauth: "oauth"
+};
 const DatabaseAuthMethods = {
 	UsernameAndPassword: "username-and-password",
 	IndividualCredentials: "individual-credentials"
@@ -27,7 +31,8 @@ const federatedAuthMethods = [
 	SnowflakeAuthMethods.AzureAd,
 	SnowflakeAuthMethods.KeyPair,
 	BigQueryAuthMethods.GoogleOauth,
-	DatabaseAuthMethods.IndividualCredentials
+	DatabaseAuthMethods.IndividualCredentials,
+	TrinoAuthMethods.Oauth
 ];
 function isFederatedAuthMethod(authMethod) {
 	return federatedAuthMethods.includes(authMethod);
@@ -121,9 +126,15 @@ const commonRedshiftMetadataSchema = z.object({
 	caCertificateName: z.string().optional(),
 	caCertificateText: z.string().optional()
 });
-const redshiftMetadataSchema = z.discriminatedUnion("authMethod", [
+const redshiftMetadataSchema = z.preprocess((data) => {
+	if (typeof data === "object" && data !== null && (!("authMethod" in data) || !data.authMethod)) return {
+		...data,
+		authMethod: DatabaseAuthMethods.UsernameAndPassword
+	};
+	return data;
+}, z.union([
 	commonRedshiftMetadataSchema.extend({
-		authMethod: z.literal(DatabaseAuthMethods.UsernameAndPassword),
+		authMethod: z.literal(DatabaseAuthMethods.UsernameAndPassword).optional(),
 		user: z.string(),
 		password: z.string()
 	}),
@@ -134,7 +145,7 @@ const redshiftMetadataSchema = z.discriminatedUnion("authMethod", [
 		roleNonce: z.string()
 	}),
 	commonRedshiftMetadataSchema.extend({ authMethod: z.literal(DatabaseAuthMethods.IndividualCredentials) })
-]);
+]));
 const commonSnowflakeMetadataSchema = z.object({
 	accountName: z.string(),
 	warehouse: z.string().optional(),
@@ -181,12 +192,10 @@ const spannerMetadataSchema = z.object({
 	instance: z.string(),
 	database: z.string()
 });
-const trinoMetadataSchema = z.object({
+const trinoBaseMetadataSchema = z.object({
 	host: z.string(),
-	user: z.string(),
-	password: z.string(),
+	port: z.string().optional(),
 	database: z.string(),
-	port: z.string(),
 	sshEnabled: z.boolean().optional(),
 	sshHost: z.string().optional(),
 	sshPort: z.string().optional(),
@@ -195,6 +204,22 @@ const trinoMetadataSchema = z.object({
 	caCertificateName: z.string().optional(),
 	caCertificateText: z.string().optional()
 });
+const trinoUsernamePasswordMetadataSchema = trinoBaseMetadataSchema.extend({
+	user: z.string(),
+	password: z.string()
+});
+const trinoOAuthMetadataSchema = trinoBaseMetadataSchema.extend({
+	authMethod: z.literal(TrinoAuthMethods.Oauth),
+	clientId: z.string(),
+	clientSecret: z.string(),
+	authUrl: z.string().url(),
+	tokenUrl: z.string().url()
+});
+const trinoMetadataSchema = z.discriminatedUnion("authMethod", [
+	trinoUsernamePasswordMetadataSchema.extend({ authMethod: z.literal(null) }),
+	trinoUsernamePasswordMetadataSchema.extend({ authMethod: z.literal(TrinoAuthMethods.Password) }),
+	trinoOAuthMetadataSchema
+]);
 const commonDatabaseSchema = z.object({
 	host: z.string(),
 	user: z.string(),
@@ -604,6 +629,7 @@ const getPostgresSqlAlchemyInput = (integrationId, projectRootDirectory, { user,
 	};
 };
 const getRedshiftSqlAlchemyInput = (integrationId, projectRootDirectory, metadata) => {
+	if (!metadata.authMethod) metadata.authMethod = DatabaseAuthMethods.UsernameAndPassword;
 	if (isFederatedAuthMethod(metadata.authMethod)) return null;
 	const portSuffix = metadata.port ? `:${metadata.port}` : "";
 	const mode = getPostgresStyleMode(metadata.caCertificateName, metadata.sslEnabled);
@@ -664,6 +690,7 @@ const getMaterializePostgresSqlAlchemyInput = (integrationId, projectRootDirecto
 	};
 };
 const getTrinoEnvVars = (integrationId, metadata, projectRootDirectory) => {
+	if (metadata.authMethod === TrinoAuthMethods.Oauth) return null;
 	return {
 		url: `trino://${encodeURIComponent(metadata.user)}:${encodeURIComponent(metadata.password)}@${metadata.host}:${metadata.port}/${encodeURIComponent(metadata.database)}`,
 		params: { connect_args: {
@@ -840,4 +867,4 @@ function isDatabaseIntegrationTypeWithSslSupport(type) {
 }
 
 //#endregion
-export { AwsAuthMethods, BigQueryAuthMethods, BigQueryServiceAccountParseError, DatabaseAuthMethods, SnowflakeAuthMethods, SpannerServiceAccountParseError, databaseIntegrationConfigSchema, databaseIntegrationTypes, databaseIntegrationTypesWithSslSupport, databaseMetadataSchemasByType, federatedAuthMethods, getEnvironmentVariablesForIntegrations, getSnowflakeFederatedAuthSqlAlchemyInput, getSqlAlchemyInput, isDatabaseIntegrationType, isDatabaseIntegrationTypeWithSslSupport, isFederatedAuthMetadata, isFederatedAuthMethod, isSqlIntegrationType, sqlIntegrationTypes };
+export { AwsAuthMethods, BigQueryAuthMethods, BigQueryServiceAccountParseError, DatabaseAuthMethods, SnowflakeAuthMethods, SpannerServiceAccountParseError, TrinoAuthMethods, databaseIntegrationConfigSchema, databaseIntegrationTypes, databaseIntegrationTypesWithSslSupport, databaseMetadataSchemasByType, federatedAuthMethods, getEnvironmentVariablesForIntegrations, getSnowflakeFederatedAuthSqlAlchemyInput, getSqlAlchemyInput, isDatabaseIntegrationType, isDatabaseIntegrationTypeWithSslSupport, isFederatedAuthMetadata, isFederatedAuthMethod, isSqlIntegrationType, sqlIntegrationTypes };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deepnote/database-integrations",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "Deepnote database integration definitions",
   "keywords": [],
   "repository": {