Skip to content

Eliminate hardcoded project names for integration tests #2285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
apilaskowski merged 2 commits into from
Sep 8, 2026
Merged

Eliminate hardcoded project names for integration tests #2285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92eea37
Replace hardcoded references to the default dataform-open-source proj…
Ford544 Sep 7, 2026
ccf63f5
Renamed GCP project constants. Added logging. Modified test_credentia…
Ford544 Sep 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cli/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ ts_library(
name = "index_test_base",
srcs = ["index_test_base.ts"],
deps = [
"//cli",
"//core",
"//protos:ts",
"//testing",
Expand Down
44 changes: 22 additions & 22 deletions cli/index_compile_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import * as fs from "fs-extra";
import { dump as dumpYaml, load as loadYaml } from "js-yaml";
import * as path from "path";

import { cliEntryPointPath, DEFAULT_DATABASE, DEFAULT_LOCATION } from "df/cli/index_test_base";
import { cliEntryPointPath, INTEGRATION_TEST_LOCATION, INTEGRATION_TEST_PROJECT } from "df/cli/index_test_base";
import { version } from "df/core/version";
import { dataform } from "df/protos/ts";
import { corePackageTarPath, getProcessResult, nodePath, npmPath, suite, test } from "df/testing";
Expand Down Expand Up @@ -49,7 +49,7 @@ suite("compile command", ({ afterEach }) => {
"defaultDatabase": "tada-analytics",
"defaultSchema": "df_integration_test",
"assertionSchema": "df_integration_test_assertions",
"defaultLocation": "${DEFAULT_LOCATION}"
"defaultLocation": "${INTEGRATION_TEST_LOCATION}"
}
`
);
Expand Down Expand Up @@ -105,8 +105,8 @@ suite("compile command", ({ afterEach }) => {
fs.writeFileSync(
path.join(projectDir, "workflow_settings.yaml"),
dumpYaml({
defaultProject: DEFAULT_DATABASE,
defaultLocation: DEFAULT_LOCATION,
defaultProject: INTEGRATION_TEST_PROJECT,
defaultLocation: INTEGRATION_TEST_LOCATION,
defaultDataset: "dataform",
dataformCoreVersion: "3.0.50"
})
Expand Down Expand Up @@ -166,7 +166,7 @@ suite("disable-assertions flag (compilation)", ({ afterEach, beforeEach }) => {
const packageJsonPath = path.join(projectDir, "package.json");

await getProcessResult(
execFile(nodePath, [cliEntryPointPath, "init", projectDir, DEFAULT_DATABASE, DEFAULT_LOCATION])
execFile(nodePath, [cliEntryPointPath, "init", projectDir, INTEGRATION_TEST_PROJECT, INTEGRATION_TEST_LOCATION])
);

const workflowSettingsPath = path.join(projectDir, "workflow_settings.yaml");
Expand Down Expand Up @@ -239,44 +239,44 @@ SELECT 1 as id
assertions: [
{
canonicalTarget: {
database: DEFAULT_DATABASE,
database: INTEGRATION_TEST_PROJECT,
name: "dataform_example_table_assertions_uniqueKey_0",
schema: "dataform_assertions"
},
dependencyTargets: [
{
database: DEFAULT_DATABASE,
database: INTEGRATION_TEST_PROJECT,
name: "example_table",
schema: "dataform"
}
],
disabled: true,
fileName: "definitions/example_table.sqlx",
parentAction: {
database: DEFAULT_DATABASE,
database: INTEGRATION_TEST_PROJECT,
name: "example_table",
schema: "dataform"
},
query:
// tslint:disable-next-line:tsr-detect-sql-literal-injection
`\nSELECT\n *\nFROM (\n SELECT\n id,\n COUNT(1) AS index_row_count\n FROM \`${DEFAULT_DATABASE}.dataform.example_table\`\n GROUP BY id\n ) AS data\nWHERE index_row_count > 1\n`,
`\nSELECT\n *\nFROM (\n SELECT\n id,\n COUNT(1) AS index_row_count\n FROM \`${INTEGRATION_TEST_PROJECT}.dataform.example_table\`\n GROUP BY id\n ) AS data\nWHERE index_row_count > 1\n`,
target: {
database: DEFAULT_DATABASE,
database: INTEGRATION_TEST_PROJECT,
name: "dataform_example_table_assertions_uniqueKey_0",
schema: "dataform_assertions"
}
},
{
canonicalTarget: {
database: DEFAULT_DATABASE,
database: INTEGRATION_TEST_PROJECT,
name: "test_assertion",
schema: "dataform_assertions"
},
disabled: true,
fileName: "definitions/test_assertion.sqlx",
query: "\n\nSELECT 1 WHERE FALSE\n",
target: {
database: DEFAULT_DATABASE,
database: INTEGRATION_TEST_PROJECT,
name: "test_assertion",
schema: "dataform_assertions"
}
Expand All @@ -287,16 +287,16 @@ SELECT 1 as id
jitData: {},
projectConfig: {
assertionSchema: "dataform_assertions",
defaultDatabase: DEFAULT_DATABASE,
defaultLocation: DEFAULT_LOCATION,
defaultDatabase: INTEGRATION_TEST_PROJECT,
defaultLocation: INTEGRATION_TEST_LOCATION,
defaultSchema: "dataform",
disableAssertions: true,
warehouse: "bigquery"
},
tables: [
{
canonicalTarget: {
database: DEFAULT_DATABASE,
database: INTEGRATION_TEST_PROJECT,
name: "example_table",
schema: "dataform"
},
Expand All @@ -306,7 +306,7 @@ SELECT 1 as id
hermeticity: "NON_HERMETIC",
query: "\n\nSELECT 1 as id\n",
target: {
database: DEFAULT_DATABASE,
database: INTEGRATION_TEST_PROJECT,
name: "example_table",
schema: "dataform"
},
Expand All @@ -315,17 +315,17 @@ SELECT 1 as id
],
targets: [
{
database: DEFAULT_DATABASE,
database: INTEGRATION_TEST_PROJECT,
name: "dataform_example_table_assertions_uniqueKey_0",
schema: "dataform_assertions"
},
{
database: DEFAULT_DATABASE,
database: INTEGRATION_TEST_PROJECT,
name: "example_table",
schema: "dataform"
},
{
database: DEFAULT_DATABASE,
database: INTEGRATION_TEST_PROJECT,
name: "test_assertion",
schema: "dataform_assertions"
}
Expand Down Expand Up @@ -370,7 +370,7 @@ suite("compile node selection", ({ afterEach }) => {
const npmCacheDir = tmpDirFixture.createNewTmpDir();

await getProcessResult(
execFile(nodePath, [cliEntryPointPath, "init", projectDir, DEFAULT_DATABASE, DEFAULT_LOCATION])
execFile(nodePath, [cliEntryPointPath, "init", projectDir, INTEGRATION_TEST_PROJECT, INTEGRATION_TEST_LOCATION])
);

const workflowSettingsPath = path.join(projectDir, "workflow_settings.yaml");
Expand Down Expand Up @@ -508,8 +508,8 @@ suite("extension config", ({ afterEach }) => {
fs.writeFileSync(
path.join(projectDir, "workflow_settings.yaml"),
dumpYaml({
defaultProject: DEFAULT_DATABASE,
defaultLocation: DEFAULT_LOCATION,
defaultProject: INTEGRATION_TEST_PROJECT,
defaultLocation: INTEGRATION_TEST_LOCATION,
defaultDataset: "dataform",
defaultAssertionDataset: "dataform_assertions",
extension: {
Expand Down
6 changes: 3 additions & 3 deletions cli/index_project_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import * as fs from "fs-extra";
import { dump as dumpYaml, load as loadYaml } from "js-yaml";
import * as path from "path";

import { cliEntryPointPath, DEFAULT_DATABASE, DEFAULT_LOCATION } from "df/cli/index_test_base";
import { cliEntryPointPath, INTEGRATION_TEST_LOCATION, INTEGRATION_TEST_PROJECT } from "df/cli/index_test_base";
import { version } from "df/core/version";
import { dataform } from "df/protos/ts";
import { corePackageTarPath, getProcessResult, nodePath, npmPath, suite, test } from "df/testing";
Expand Down Expand Up @@ -46,7 +46,7 @@ suite("project ops", ({ afterEach }) => {

// Initialize a project using the CLI, don't install packages.
await getProcessResult(
execFile(nodePath, [cliEntryPointPath, "init", projectDir, DEFAULT_DATABASE, DEFAULT_LOCATION])
execFile(nodePath, [cliEntryPointPath, "init", projectDir, INTEGRATION_TEST_PROJECT, INTEGRATION_TEST_LOCATION])
);

// Install packages manually to get around bazel read-only sandbox issues.
Expand Down Expand Up @@ -134,7 +134,7 @@ SELECT 1 as test

// Initialize a project using the CLI, don't install packages.
await getProcessResult(
execFile(nodePath, [cliEntryPointPath, "init", projectDir, DEFAULT_DATABASE, DEFAULT_LOCATION])
execFile(nodePath, [cliEntryPointPath, "init", projectDir, INTEGRATION_TEST_PROJECT, INTEGRATION_TEST_LOCATION])
);

// Install packages manually to get around bazel read-only sandbox issues.
Expand Down
Loading
Loading