steve/databricks-cli
steve
/
databricks-cli
mirror of https://github.com/databricks/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: use RequiresUnityCatalog boolean field instead of RequiresStageFeature()

This commit is contained in:
Anton Nekipelov 2025-03-07 15:02:18 +01:00
parent faf387753d
commit 0f16296168
3 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
acceptance/acceptance_test.go
View File

@ -223,10 +223,8 @@ func runTest(t *testing.T, dir, coverDir string, repls testdiff.ReplacementsCont
if !isTruePtr(config.Cloud) && cloudEnv != "" { if !isTruePtr(config.Cloud) && cloudEnv != "" {
t.Skipf("Disabled via Cloud setting in %s (CLOUD_ENV=%s)", configPath, cloudEnv) t.Skipf("Disabled via Cloud setting in %s (CLOUD_ENV=%s)", configPath, cloudEnv)
} } else {
if isTruePtr(config.RequiresUnityCatalog) && os.Getenv("TEST_METASTORE_ID") == "" {
if config.RequiresStageFeature(UnityCatalogEnabledWorkspace) {
if os.Getenv("TEST_METASTORE_ID") == "" {
t.Skipf("Skipping on non-UC workspaces") t.Skipf("Skipping on non-UC workspaces")
} }
} }

2
acceptance/bundle/deployment/bind/schema/test.toml
View File

@ -1,3 +1,3 @@
Local = false Local = false
Cloud = true Cloud = true
RequiredStageFeatures=["unity-catalog"] RequiresUnityCatalog = true

14
acceptance/config_test.go
View File

@ -37,9 +37,8 @@ type TestConfig struct {
// If true, run this test when running with cloud env configured // If true, run this test when running with cloud env configured
Cloud *bool Cloud *bool
// Which stage features this test requires. Each string is a feature name that must be present // If true and Cloud=true, run this test only if unity catalog is available in the cloud environment
// in the current stage for the test to run. If absent, no specific features are required. RequiresUnityCatalog *bool
RequiredStageFeatures []StageFeature
// List of additional replacements to apply on this test. // List of additional replacements to apply on this test.
// Old is a regexp, New is a replacement expression. // Old is a regexp, New is a replacement expression.
@ -69,15 +68,6 @@ type TestConfig struct {
CompiledIgnoreObject *ignore.GitIgnore CompiledIgnoreObject *ignore.GitIgnore
} }
func (tc *TestConfig) RequiresStageFeature(feature StageFeature) bool {
for _, f := range tc.RequiredStageFeatures {
if f == feature {
return true
}
}
return false
}
type ServerStub struct { type ServerStub struct {
// The HTTP method and path to match. Examples: // The HTTP method and path to match. Examples:
// 1. /api/2.0/clusters/list (matches all methods) // 1. /api/2.0/clusters/list (matches all methods)