diff --git a/cluster/pulumi/common-sv/src/singleSvConfig.ts b/cluster/pulumi/common-sv/src/singleSvConfig.ts index bdcaec39af..012bf9c653 100644 --- a/cluster/pulumi/common-sv/src/singleSvConfig.ts +++ b/cluster/pulumi/common-sv/src/singleSvConfig.ts @@ -111,6 +111,7 @@ const ScanAppConfigSchema = z .object({ dataset: z.string(), prefix: z.string(), + functionsDataset: z.string().optional(), }) .optional(), bulkStorage: BulkStorageConfigSchema.optional(), diff --git a/cluster/pulumi/common/src/config/configLoader.ts b/cluster/pulumi/common/src/config/configLoader.ts index bd3a7de6a0..27e040360d 100644 --- a/cluster/pulumi/common/src/config/configLoader.ts +++ b/cluster/pulumi/common/src/config/configLoader.ts @@ -154,5 +154,8 @@ export function loadClusterYamlConfig(): unknown { } export function getClusterConfigPath(): string { - return join(spliceEnvConfig.context.clusterPath(), 'config.yaml'); + return ( + spliceEnvConfig.optionalEnv('OVERRIDE_PULUMI_CONFIG_FILE') || + join(spliceEnvConfig.context.clusterPath(), 'config.yaml') + ); } diff --git a/nix/shell.nix b/nix/shell.nix index 32038c1d3b..6714c1342b 100644 --- a/nix/shell.nix +++ b/nix/shell.nix @@ -65,6 +65,8 @@ let python3Packages.dockerfile-parse python3Packages.flask python3Packages.gitpython + python3Packages.google-cloud-bigquery + python3Packages.google-cloud-storage python3Packages.gql python3Packages.humanize python3Packages.json-logging @@ -79,6 +81,7 @@ let python3Packages.regex python3Packages.requests python3Packages.rich + python3Packages.pulumi python3Packages.pypandoc python3Packages.google-cloud-storage python3Packages.requests-toolbelt