Skip to content

Commit d633f4a

Browse files
committed
bundle: revert non-genie direct-only error message tweak
Commit e5af0e6 bundled an unrelated change to ValidateDirectOnlyResources alongside the genie_space dual-source warning. The error-message tweak doesn't belong in this PR; reverting those three files (incl. the catalog acceptance output that reflected the old text) so the PR stays scoped to genie work. The tweak can land in a separate PR if still desired. Co-authored-by: Isaac
1 parent b64a950 commit d633f4a

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

acceptance/bundle/validate/catalog_requires_direct_mode/output.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Error: Catalog resources are only supported with direct deployment mode
22
in databricks.yml:6:5
33

4-
Catalog resources require direct deployment mode. Set 'bundle.engine: direct' in your databricks.yml or set the DATABRICKS_BUNDLE_ENGINE environment variable to 'direct' to use catalog resources.
4+
Catalog resources require direct deployment mode. Please set the DATABRICKS_BUNDLE_ENGINE environment variable to 'direct' to use catalog resources.
55
Learn more at https://docs.databricks.com/dev-tools/bundles/direct
66

77

bundle/config/mutator/validate_direct_only_resources.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func (m *validateDirectOnlyResources) Apply(ctx context.Context, b *bundle.Bundl
5151
Severity: diag.Error,
5252
Summary: group.Description.SingularTitle + " resources are only supported with direct deployment mode",
5353
Detail: fmt.Sprintf("%s resources require direct deployment mode. "+
54-
"Set 'bundle.engine: direct' in your databricks.yml or set the DATABRICKS_BUNDLE_ENGINE environment variable to 'direct' to use %s resources.\n"+
54+
"Please set the DATABRICKS_BUNDLE_ENGINE environment variable to 'direct' to use %s resources.\n"+
5555
"Learn more at https://docs.databricks.com/dev-tools/bundles/direct",
5656
group.Description.SingularTitle, group.Description.SingularName),
5757
Locations: b.Config.GetLocations("resources." + group.Description.PluralName),

bundle/config/mutator/validate_direct_only_resources_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func TestValidateDirectOnlyResourcesTerraformEngineDirectOnlyEmitsError(t *testi
6161
},
6262
expectedSummary: "Catalog resources are only supported with direct deployment mode",
6363
expectedDetail: "Catalog resources require direct deployment mode. " +
64-
"Set 'bundle.engine: direct' in your databricks.yml or set the DATABRICKS_BUNDLE_ENGINE environment variable to 'direct' to use catalog resources.\n" +
64+
"Please set the DATABRICKS_BUNDLE_ENGINE environment variable to 'direct' to use catalog resources.\n" +
6565
"Learn more at https://docs.databricks.com/dev-tools/bundles/direct",
6666
},
6767
{
@@ -77,7 +77,7 @@ func TestValidateDirectOnlyResourcesTerraformEngineDirectOnlyEmitsError(t *testi
7777
},
7878
expectedSummary: "External Location resources are only supported with direct deployment mode",
7979
expectedDetail: "External Location resources require direct deployment mode. " +
80-
"Set 'bundle.engine: direct' in your databricks.yml or set the DATABRICKS_BUNDLE_ENGINE environment variable to 'direct' to use external_location resources.\n" +
80+
"Please set the DATABRICKS_BUNDLE_ENGINE environment variable to 'direct' to use external_location resources.\n" +
8181
"Learn more at https://docs.databricks.com/dev-tools/bundles/direct",
8282
},
8383
{
@@ -93,7 +93,7 @@ func TestValidateDirectOnlyResourcesTerraformEngineDirectOnlyEmitsError(t *testi
9393
},
9494
expectedSummary: "Vector Search Endpoint resources are only supported with direct deployment mode",
9595
expectedDetail: "Vector Search Endpoint resources require direct deployment mode. " +
96-
"Set 'bundle.engine: direct' in your databricks.yml or set the DATABRICKS_BUNDLE_ENGINE environment variable to 'direct' to use vector_search_endpoint resources.\n" +
96+
"Please set the DATABRICKS_BUNDLE_ENGINE environment variable to 'direct' to use vector_search_endpoint resources.\n" +
9797
"Learn more at https://docs.databricks.com/dev-tools/bundles/direct",
9898
},
9999
}

0 commit comments

Comments
 (0)