Skip to content

Commit 44255ae

Browse files
committed
update validation logic
1 parent f5367b5 commit 44255ae

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

packages/cubejs-snowflake-driver/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"lint:fix": "eslint --fix src/* --ext .ts"
2626
},
2727
"dependencies": {
28+
"@aws-sdk/client-s3": "^3.726.0",
2829
"@cubejs-backend/base-driver": "1.3.75",
2930
"@cubejs-backend/shared": "1.3.75",
3031
"date-fns-timezone": "^0.1.4",

packages/cubejs-snowflake-driver/src/SnowflakeDriver.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import {
2323
import { formatToTimeZone } from 'date-fns-timezone';
2424
import fs from 'fs/promises';
2525
import crypto from 'crypto';
26-
import { HydrationMap, HydrationStream } from './HydrationStream';
2726
import { S3ClientConfig } from '@aws-sdk/client-s3';
27+
import { HydrationMap, HydrationStream } from './HydrationStream';
2828

2929
const SUPPORTED_BUCKET_TYPES = ['s3', 'gcs', 'azure'];
3030

@@ -397,10 +397,7 @@ export class SnowflakeDriver extends BaseDriver implements DriverInterface {
397397
): string[] {
398398
if (exportBucket.bucketType === 's3') {
399399
const s3Config = exportBucket as SnowflakeDriverExportAWS;
400-
const hasCredentials = s3Config.keyId && s3Config.secretKey;
401-
const hasIntegration = s3Config.integrationName;
402-
403-
if (!hasCredentials && !hasIntegration) {
400+
if (s3Config.integrationName) {
404401
return emptyKeys.filter(key => key !== 'keyId' && key !== 'secretKey');
405402
}
406403
}

packages/cubejs-testing-drivers/fixtures/snowflake.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
"environment": {
2828
"CUBEJS_DB_EXPORT_BUCKET_TYPE": "s3",
2929
"CUBEJS_DB_EXPORT_BUCKET": "snowflake-drivers-tests-preaggs",
30-
"CUBEJS_DB_EXPORT_BUCKET_AWS_REGION": "us-west-1"
30+
"CUBEJS_DB_EXPORT_BUCKET_AWS_REGION": "us-west-1",
31+
"CUBEJS_DB_EXPORT_INTEGRATION": "aws_int"
3132
}
3233
}
3334
},

0 commit comments

Comments
 (0)