Skip to content

Commit 10d184d

Browse files
Rename DATABRICKS_CLI_DEPLOYMENT to DATABRICKS_CLI_BUNDLE_ENGINE (#3616)
## Why Deployment is an overloaded term. Engine helps better disambiguate between the module used to perform the deployment. ## Tests Existing tests.
1 parent d71b4a0 commit 10d184d

File tree

506 files changed

+540
-540
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

506 files changed

+540
-540
lines changed

.github/workflows/push.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,14 @@ jobs:
8282
# populates the cache and cache may include test results.
8383
if: ${{ github.event_name == 'pull_request' || github.event_name == 'schedule' }}
8484
env:
85-
ENVFILTER: DATABRICKS_CLI_DEPLOYMENT=${{ matrix.deployment }}
85+
ENVFILTER: DATABRICKS_BUNDLE_ENGINE=${{ matrix.deployment }}
8686
run: make test
8787

8888
- name: Run tests with coverage
8989
# Still run 'make cover' on push to main and merge checks to make sure it does not get broken.
9090
if: ${{ github.event_name != 'pull_request' && github.event_name != 'schedule' }}
9191
env:
92-
ENVFILTER: DATABRICKS_CLI_DEPLOYMENT=${{ matrix.deployment }}
92+
ENVFILTER: DATABRICKS_BUNDLE_ENGINE=${{ matrix.deployment }}
9393
run: make cover
9494

9595
- name: Analyze slow tests

AGENTS.md

Lines changed: 1 addition & 1 deletion

acceptance/acceptance_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ func getEnvFilters(t *testing.T) []string {
367367
// Clear it just to be sure, since it's going to be part of os.Environ() and we're going to add different value based on settings.
368368
os.Unsetenv(key)
369369

370-
if key == "DATABRICKS_CLI_DEPLOYMENT" && items[1] == "direct" {
370+
if key == "DATABRICKS_BUNDLE_ENGINE" && items[1] == "direct" {
371371
// CLI only recognizes "direct-exp" at the moment, but in the future will recognize "direct" as well.
372372
// On CI we set "direct". To avoid renaming jobs in CI on the future, we correct direct -> direct-exp here
373373
items[1] = "direct-exp"
@@ -1393,7 +1393,7 @@ func loadUserReplacements(t *testing.T, repls *testdiff.ReplacementsContext, tmp
13931393

13941394
type pathFilter struct {
13951395
// contains substrings from the variants other than current.
1396-
// E.g. if EnvVaryOutput is DATABRICKS_CLI_DEPLOYMENT and current test running DATABRICKS_CLI_DEPLOYMENT="terraform" then
1396+
// E.g. if EnvVaryOutput is DATABRICKS_BUNDLE_ENGINE and current test running DATABRICKS_BUNDLE_ENGINE="terraform" then
13971397
// notSelected contains ".direct-exp." meaning if filename contains that (e.g. out.deploy.direct-exp.txt) then we ignore it here.
13981398
notSelected []string
13991399
}

acceptance/auth/bundle_and_profile/out.test.toml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

acceptance/auth/credentials/basic/out.test.toml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

acceptance/auth/credentials/oauth/out.test.toml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

acceptance/auth/credentials/pat/out.test.toml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

acceptance/bin/read_id.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def print_resource_direct(group, name):
4141
print(result.get("__id__"))
4242

4343

44-
if os.environ.get("DATABRICKS_CLI_DEPLOYMENT", "").startswith("direct"):
44+
if os.environ.get("DATABRICKS_BUNDLE_ENGINE", "").startswith("direct"):
4545
print_resource_direct(*sys.argv[1:])
4646
else:
4747
print_resource_terraform(*sys.argv[1:])

acceptance/bin/read_state.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def print_resource_direct(group, name, *attrs):
4848
print(group, name, " ".join(values))
4949

5050

51-
if os.environ.get("DATABRICKS_CLI_DEPLOYMENT", "").startswith("direct"):
51+
if os.environ.get("DATABRICKS_BUNDLE_ENGINE", "").startswith("direct"):
5252
print_resource_direct(*sys.argv[1:])
5353
else:
5454
print_resource_terraform(*sys.argv[1:])

acceptance/bundle/apps/app_yaml/out.test.toml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)